Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-jams
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-jams
Commits
a4814c85
Commit
a4814c85
authored
3 years ago
by
Larbi Gharib
Browse files
Options
Downloads
Patches
Plain Diff
fixed user X509fields cn and uid before refresh
Change-Id: Ibb67b74317f06f37d8a70423ba5c34e92c97e7d3
parent
100540d6
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
jams-ca/src/main/java/net/jami/jams/ca/workers/csr/builders/UserBuilder.java
+7
-1
7 additions, 1 deletion
...va/net/jami/jams/ca/workers/csr/builders/UserBuilder.java
with
7 additions
and
1 deletion
jams-ca/src/main/java/net/jami/jams/ca/workers/csr/builders/UserBuilder.java
+
7
−
1
View file @
a4814c85
...
...
@@ -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
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment