From a4814c8559b3e8c71544940891253913dc571f6e Mon Sep 17 00:00:00 2001
From: Larbi Gharib <larbi.gharib@savoirfairelinux.com>
Date: Fri, 1 Apr 2022 19:36:44 -0400
Subject: [PATCH] fixed user X509fields cn and uid before refresh
Change-Id: Ibb67b74317f06f37d8a70423ba5c34e92c97e7d3
---
.../jami/jams/ca/workers/csr/builders/UserBuilder.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/builders/UserBuilder.java b/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/builders/UserBuilder.java
index 83b6c4c1..c326ef46 100644
--- a/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/builders/UserBuilder.java
+++ b/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/builders/UserBuilder.java
@@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
import net.jami.jams.ca.JamsCA;
import net.jami.jams.ca.workers.csr.utils.CertificateSigner;
import net.jami.jams.ca.workers.csr.utils.ExtensionLibrary;
+import net.jami.jams.common.objects.roots.X509Fields;
import net.jami.jams.common.objects.user.User;
import org.bouncycastle.asn1.x500.X500Name;
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
@@ -83,6 +84,11 @@ public class UserBuilder {
public static User refreshUser(User user, long userLifeTime) {
try {
long now = System.currentTimeMillis();
+
+ user.setX509Fields(new X509Fields());
+ user.getX509Fields().setCommonName(user.getUsername());
+ user.getX509Fields().setUid(user.getJamiId());
+
X509v3CertificateBuilder builder = new X509v3CertificateBuilder(
new JcaX509CertificateHolder(JamsCA.CA.getCertificate()).getSubject(),
new BigInteger(128, new SecureRandom()),
@@ -92,7 +98,7 @@ public class UserBuilder {
new JcaX509CertificateHolder(user.getCertificate()).getSubjectPublicKeyInfo()
);
user.setCertificate(CertificateSigner.signCertificate(JamsCA.CA.getPrivateKey(), builder, ExtensionLibrary.userExtensions));
- log.info("====> Refreshed user certificate: Not valid after: " + user.getCertificate().getNotAfter());
+ log.info("Refreshed user certificate: Not valid after: " + user.getCertificate().getNotAfter());
return user;
} catch (Exception e) {
--
GitLab