diff --git a/ad-connector/src/main/java/net/jami/jams/ad/connector/service/UserProfileService.java b/ad-connector/src/main/java/net/jami/jams/ad/connector/service/UserProfileService.java index a1eadd98f05d89475c7d09c1bf3a5be80762e3b8..81c1b2bbd4fa303a2828819dd3055936f132f360 100644 --- a/ad-connector/src/main/java/net/jami/jams/ad/connector/service/UserProfileService.java +++ b/ad-connector/src/main/java/net/jami/jams/ad/connector/service/UserProfileService.java @@ -27,7 +27,14 @@ import com.imperva.ddc.core.language.PhraseOperator; import com.imperva.ddc.core.language.QueryAssembler; import com.imperva.ddc.core.language.Sentence; import com.imperva.ddc.core.language.SentenceOperator; -import com.imperva.ddc.core.query.*; +import com.imperva.ddc.core.query.DirectoryType; +import com.imperva.ddc.core.query.Endpoint; +import com.imperva.ddc.core.query.EntityResponse; +import com.imperva.ddc.core.query.Field; +import com.imperva.ddc.core.query.FieldType; +import com.imperva.ddc.core.query.ObjectType; +import com.imperva.ddc.core.query.QueryRequest; +import com.imperva.ddc.core.query.QueryResponse; import lombok.extern.slf4j.Slf4j; import net.jami.jams.ad.connector.ADConnector; import net.jami.jams.common.objects.user.UserProfile; diff --git a/authentication-module/src/main/java/net/jami/jams/authmodule/UserAuthenticationModule.java b/authentication-module/src/main/java/net/jami/jams/authmodule/UserAuthenticationModule.java index 0d00f063e919e0f0124aadb5d7df758587a76392..0b096eb5f8af288f1dc4db2c2e6e5244042b80f5 100644 --- a/authentication-module/src/main/java/net/jami/jams/authmodule/UserAuthenticationModule.java +++ b/authentication-module/src/main/java/net/jami/jams/authmodule/UserAuthenticationModule.java @@ -38,7 +38,11 @@ import net.jami.jams.common.objects.user.User; import net.jami.jams.common.utils.LibraryLoader; import net.jami.jams.common.utils.X509Utils; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.io.OutputStream; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.PrivateKey; diff --git a/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/utils/ExtensionLibrary.java b/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/utils/ExtensionLibrary.java index 4b995ce690fa167fe307e2e1c0432e1eb3b66dab..f135f28ec79bd54f1fb0e347550e855ba4780775 100644 --- a/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/utils/ExtensionLibrary.java +++ b/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/utils/ExtensionLibrary.java @@ -23,7 +23,18 @@ package net.jami.jams.ca.workers.csr.utils; import net.jami.jams.ca.JamsCA; -import org.bouncycastle.asn1.x509.*; +import org.bouncycastle.asn1.x509.AccessDescription; +import org.bouncycastle.asn1.x509.AuthorityInformationAccess; +import org.bouncycastle.asn1.x509.BasicConstraints; +import org.bouncycastle.asn1.x509.CRLDistPoint; +import org.bouncycastle.asn1.x509.DistributionPoint; +import org.bouncycastle.asn1.x509.DistributionPointName; +import org.bouncycastle.asn1.x509.ExtendedKeyUsage; +import org.bouncycastle.asn1.x509.Extension; +import org.bouncycastle.asn1.x509.GeneralName; +import org.bouncycastle.asn1.x509.GeneralNames; +import org.bouncycastle.asn1.x509.KeyPurposeId; +import org.bouncycastle.asn1.x509.KeyUsage; public class ExtensionLibrary { diff --git a/jams-ca/src/main/java/net/jami/jams/ca/workers/ocsp/OCSPWorker.java b/jams-ca/src/main/java/net/jami/jams/ca/workers/ocsp/OCSPWorker.java index ce13dde782210d14f7ee4be8ce108bafc53d4d87..d60ae8fe43241ec398d4f7d219922b202a4780f5 100644 --- a/jams-ca/src/main/java/net/jami/jams/ca/workers/ocsp/OCSPWorker.java +++ b/jams-ca/src/main/java/net/jami/jams/ca/workers/ocsp/OCSPWorker.java @@ -35,7 +35,15 @@ import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; import org.bouncycastle.cert.X509CRLEntryHolder; import org.bouncycastle.cert.X509CertificateHolder; import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -import org.bouncycastle.cert.ocsp.*; +import org.bouncycastle.cert.ocsp.BasicOCSPResp; +import org.bouncycastle.cert.ocsp.BasicOCSPRespBuilder; +import org.bouncycastle.cert.ocsp.CertificateID; +import org.bouncycastle.cert.ocsp.OCSPException; +import org.bouncycastle.cert.ocsp.OCSPReq; +import org.bouncycastle.cert.ocsp.OCSPResp; +import org.bouncycastle.cert.ocsp.OCSPRespBuilder; +import org.bouncycastle.cert.ocsp.Req; +import org.bouncycastle.cert.ocsp.RespID; import org.bouncycastle.operator.ContentSigner; import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder; import org.bouncycastle.operator.DigestCalculatorProvider; @@ -51,7 +59,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; -import static net.jami.jams.ca.JamsCA.*; +import static net.jami.jams.ca.JamsCA.CA; +import static net.jami.jams.ca.JamsCA.OCSP; +import static net.jami.jams.ca.JamsCA.crlLifetime; @Slf4j public class OCSPWorker extends X509Worker<String> { diff --git a/jams-common/src/main/java/net/jami/jams/common/authmodule/AuthModuleKey.java b/jams-common/src/main/java/net/jami/jams/common/authmodule/AuthModuleKey.java index d89caa5a1ff169d9a076acf0982d7d26625d3a82..3e042386b010689773daf82e0e99f46009e7ceef 100644 --- a/jams-common/src/main/java/net/jami/jams/common/authmodule/AuthModuleKey.java +++ b/jams-common/src/main/java/net/jami/jams/common/authmodule/AuthModuleKey.java @@ -22,7 +22,11 @@ */ package net.jami.jams.common.authmodule; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import net.jami.jams.common.authentication.AuthenticationSourceType; @Getter diff --git a/jams-common/src/main/java/net/jami/jams/common/updater/FileDescription.java b/jams-common/src/main/java/net/jami/jams/common/updater/FileDescription.java index 1b95f8f35ae1a73ba2b0a07c9cd6b85fa950bfee..116049230ba7388bab56d297b153d29f29d8c7e6 100644 --- a/jams-common/src/main/java/net/jami/jams/common/updater/FileDescription.java +++ b/jams-common/src/main/java/net/jami/jams/common/updater/FileDescription.java @@ -22,7 +22,11 @@ */ package net.jami.jams.common.updater; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import java.math.BigDecimal; diff --git a/jams-common/src/main/java/net/jami/jams/common/utils/X509Utils.java b/jams-common/src/main/java/net/jami/jams/common/utils/X509Utils.java index 2e4801f8e621c7681077a6712d39ab947fd17c1d..c03588b4db1ca7ac352a89a2abf5287d0464b40f 100644 --- a/jams-common/src/main/java/net/jami/jams/common/utils/X509Utils.java +++ b/jams-common/src/main/java/net/jami/jams/common/utils/X509Utils.java @@ -34,7 +34,11 @@ import org.bouncycastle.pkcs.PKCS10CertificationRequest; import javax.naming.ldap.LdapName; import javax.naming.ldap.Rdn; -import java.io.*; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringReader; import java.nio.charset.StandardCharsets; import java.security.KeyFactory; import java.security.PrivateKey; diff --git a/jams-server/src/main/java/net/jami/jams/server/core/workflows/InstallationFinalizer.java b/jams-server/src/main/java/net/jami/jams/server/core/workflows/InstallationFinalizer.java index 8a6c5ab952663a465847bd6fe4074eb7d99dcbbd..67a03d3b3e64b54ee67c746bf35ce00a48bb2d0f 100644 --- a/jams-server/src/main/java/net/jami/jams/server/core/workflows/InstallationFinalizer.java +++ b/jams-server/src/main/java/net/jami/jams/server/core/workflows/InstallationFinalizer.java @@ -40,7 +40,10 @@ import java.io.FileOutputStream; import java.io.OutputStream; import java.security.KeyStore; -import static net.jami.jams.server.Server.*; +import static net.jami.jams.server.Server.certificateAuthority; +import static net.jami.jams.server.Server.dataStore; +import static net.jami.jams.server.Server.nameServer; +import static net.jami.jams.server.Server.userAuthenticationModule; @Slf4j public class InstallationFinalizer { diff --git a/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java b/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java index 8c70a2f05ca25f8e524b72d0a78ace2614a033ae..de520f77c6168a36e8c2ea7ca6ec37b048e08349 100644 --- a/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java +++ b/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java @@ -35,7 +35,10 @@ import net.jami.jams.dht.DeviceReceiptGenerator; import java.security.cert.X509Certificate; -import static net.jami.jams.server.Server.*; +import static net.jami.jams.server.Server.certificateAuthority; +import static net.jami.jams.server.Server.dataStore; +import static net.jami.jams.server.Server.nameServer; +import static net.jami.jams.server.Server.userAuthenticationModule; @Slf4j public class RegisterDeviceFlow { diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/update/UpdateServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/update/UpdateServlet.java index 6ae67af045546fe346564511b673122190fe078b..08785810da8620c18b10afc7416f1a65a2c5ee92 100644 --- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/update/UpdateServlet.java +++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/update/UpdateServlet.java @@ -28,7 +28,6 @@ import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; import net.jami.jams.common.updater.FullSystemStatusResponse; import java.io.IOException; diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/users/UserServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/users/UserServlet.java index 17a7176b37cefa93aaa5a881c0a904afed3dd514..2128e21e56ea1d835a472d7eb9cfe072c0951c05 100644 --- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/users/UserServlet.java +++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/users/UserServlet.java @@ -37,7 +37,9 @@ import net.jami.jams.server.core.workflows.RevokeUserFlow; import java.io.IOException; -import static net.jami.jams.server.Server.*; +import static net.jami.jams.server.Server.dataStore; +import static net.jami.jams.server.Server.nameServer; +import static net.jami.jams.server.Server.userAuthenticationModule; @WebServlet("/api/admin/user") public class UserServlet extends HttpServlet { diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/filters/AdminApiFilter.java b/jams-server/src/main/java/net/jami/jams/server/servlets/filters/AdminApiFilter.java index d0f324accc0534d568589127a7384b4b8b4159be..4b137c2da175f5c3ec00d0e958a90757d1bdc1a6 100644 --- a/jams-server/src/main/java/net/jami/jams/server/servlets/filters/AdminApiFilter.java +++ b/jams-server/src/main/java/net/jami/jams/server/servlets/filters/AdminApiFilter.java @@ -25,7 +25,11 @@ package net.jami.jams.server.servlets.filters; import com.nimbusds.jose.JWSVerifier; import com.nimbusds.jose.crypto.RSASSAVerifier; import com.nimbusds.jwt.SignedJWT; -import jakarta.servlet.*; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import jakarta.servlet.annotation.WebFilter; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/filters/ApiFilter.java b/jams-server/src/main/java/net/jami/jams/server/servlets/filters/ApiFilter.java index 1870c7d8e02b9bdbb83a6f5d0926e6a902d461a4..191481644a9069d641052caa8e1ed231fd87d368 100644 --- a/jams-server/src/main/java/net/jami/jams/server/servlets/filters/ApiFilter.java +++ b/jams-server/src/main/java/net/jami/jams/server/servlets/filters/ApiFilter.java @@ -25,7 +25,11 @@ package net.jami.jams.server.servlets.filters; import com.nimbusds.jose.JWSVerifier; import com.nimbusds.jose.crypto.RSASSAVerifier; import com.nimbusds.jwt.SignedJWT; -import jakarta.servlet.*; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import jakarta.servlet.annotation.WebFilter; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/filters/InstallFilter.java b/jams-server/src/main/java/net/jami/jams/server/servlets/filters/InstallFilter.java index 96c31c332e20090eed7ad87b8ce5c8468a8886e9..97b0ff4cc22c9405549a8f4b8213049260bcc1b1 100644 --- a/jams-server/src/main/java/net/jami/jams/server/servlets/filters/InstallFilter.java +++ b/jams-server/src/main/java/net/jami/jams/server/servlets/filters/InstallFilter.java @@ -25,7 +25,11 @@ package net.jami.jams.server.servlets.filters; import com.nimbusds.jose.JWSVerifier; import com.nimbusds.jose.crypto.RSASSAVerifier; import com.nimbusds.jwt.SignedJWT; -import jakarta.servlet.*; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import jakarta.servlet.annotation.WebFilter; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/AuthenticationService.java b/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/AuthenticationService.java index d098e819497ccd362098800f3a7eefd47d31daeb..493cd047473a33d8b3174dea329ea4d91bcbd399 100644 --- a/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/AuthenticationService.java +++ b/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/AuthenticationService.java @@ -25,7 +25,11 @@ package net.jami.jams.ldap.connector.service; import lombok.extern.slf4j.Slf4j; import org.ldaptive.ConnectionFactory; import org.ldaptive.Credential; -import org.ldaptive.auth.*; +import org.ldaptive.auth.AuthenticationRequest; +import org.ldaptive.auth.AuthenticationResponse; +import org.ldaptive.auth.Authenticator; +import org.ldaptive.auth.FormatDnResolver; +import org.ldaptive.auth.SimpleBindAuthenticationHandler; import static net.jami.jams.ldap.connector.LDAPConnector.settings; diff --git a/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/UserProfileService.java b/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/UserProfileService.java index 0f06b9a0afc625b8bf7e61241943439416b53ea2..5444ecf89269407684d7418af55b9792fbfc8ed0 100644 --- a/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/UserProfileService.java +++ b/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/UserProfileService.java @@ -25,7 +25,12 @@ package net.jami.jams.ldap.connector.service; import lombok.extern.slf4j.Slf4j; import net.jami.jams.common.objects.user.UserProfile; import net.jami.jams.ldap.connector.LDAPConnector; -import org.ldaptive.*; +import org.ldaptive.Connection; +import org.ldaptive.ConnectionFactory; +import org.ldaptive.LdapEntry; +import org.ldaptive.SearchOperation; +import org.ldaptive.SearchRequest; +import org.ldaptive.SearchResponse; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; diff --git a/updater/src/main/java/net/jami/jams/updater/UpdateCheckTask.java b/updater/src/main/java/net/jami/jams/updater/UpdateCheckTask.java index 8471ff26110c348553662d7c05a4a887573880a0..1972c601001b30b115a1ddd77f8451d5811d0550 100644 --- a/updater/src/main/java/net/jami/jams/updater/UpdateCheckTask.java +++ b/updater/src/main/java/net/jami/jams/updater/UpdateCheckTask.java @@ -24,9 +24,9 @@ package net.jami.jams.updater; import com.jsoniter.JsonIterator; import com.jsoniter.any.Any; -import lombok.extern.slf4j.Slf4j; import lombok.Getter; import lombok.Setter; +import lombok.extern.slf4j.Slf4j; import net.jami.jams.common.updater.FileDescription; import net.jami.jams.common.utils.VersioningUtils; import net.jami.jams.common.utils.X509Utils; @@ -34,19 +34,14 @@ import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClients; +import org.apache.http.ssl.SSLContexts; -import javax.net.ssl.HttpsURLConnection; -import java.io.IOException; +import javax.net.ssl.SSLContext; import java.io.InputStream; -import java.net.URL; import java.security.KeyStore; import java.security.cert.X509Certificate; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.TimerTask; -import org.apache.http.ssl.SSLContexts; -import javax.net.ssl.SSLContext; diff --git a/updater/src/main/java/net/jami/jams/updater/UpdateDownloader.java b/updater/src/main/java/net/jami/jams/updater/UpdateDownloader.java index 7b3ca0b62464fc03eacd0635e23214ef2f5d2f07..21ca1f646ec43cc88c004c54c5608315def1acb6 100644 --- a/updater/src/main/java/net/jami/jams/updater/UpdateDownloader.java +++ b/updater/src/main/java/net/jami/jams/updater/UpdateDownloader.java @@ -22,19 +22,15 @@ */ package net.jami.jams.updater; -import com.google.common.hash.HashCode; -import com.google.common.hash.Hashing; import com.jsoniter.JsonIterator; import com.jsoniter.any.Any; import lombok.extern.slf4j.Slf4j; import net.jami.jams.common.updater.FileDescription; -import net.jami.jams.common.utils.VersioningUtils; import net.jami.jams.common.utils.X509Utils; import net.jami.jams.server.licensing.LicenseService; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; -import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.impl.client.HttpClients; import org.apache.http.ssl.SSLContexts; @@ -44,18 +40,14 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.security.KeyStore; -import java.security.KeyStoreException; import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.util.HashMap; -import java.util.concurrent.atomic.AtomicBoolean; @Slf4j public class UpdateDownloader { - private SSLSocketFactory sslSocketFactory; - private Process applicationProcess; private SSLContext sslContext; private static final String KEYSTORE_TYPE = "JKS"; private KeyStore trustStore;