Merge pull request #6376 from eclipse/jetty-10.0.x-SslClientCertAuthe…

…nticatorCleanup Cleanups for SslClientCertAuthenticator.
jetty · Jun 17, 2021 · 82e2140 · 82e2140
2 parents f1e3a9e + e77ba1e
commit 82e2140
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultAuthenticatorFactory.java b/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultAuthenticatorFactory.java
@@ -36,7 +36,7 @@
  * <li>{@link org.eclipse.jetty.security.authentication.DigestAuthenticator}</li>
  * <li>{@link org.eclipse.jetty.security.authentication.FormAuthenticator}</li>
  * <li>{@link org.eclipse.jetty.security.authentication.ClientCertAuthenticator}</li>
- * <li>{@link SslClientCertAuthenticator}</li>
+ * <li>{@link org.eclipse.jetty.security.authentication.SslClientCertAuthenticator}</li>
  * </ul>
  * All authenticators derived from {@link org.eclipse.jetty.security.authentication.LoginAuthenticator} are
  * wrapped with a {@link org.eclipse.jetty.security.authentication.DeferredAuthentication}

diff --git a/...rity/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java b/...rity/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java
@@ -35,10 +35,10 @@
 import org.eclipse.jetty.util.security.Constraint;
 import org.eclipse.jetty.util.security.Password;
 
-@Deprecated
 /**
  * @deprecated Prefer using {@link SslClientCertAuthenticator}
  */
+@Deprecated
 public class ClientCertAuthenticator extends LoginAuthenticator
 {
     /**

diff --git a/...y/src/main/java/org/eclipse/jetty/security/authentication/SslClientCertAuthenticator.java b/...y/src/main/java/org/eclipse/jetty/security/authentication/SslClientCertAuthenticator.java
@@ -37,23 +37,14 @@
  * The client certificates available in the request will be verified against the configured {@link SslContextFactory} instance
  * </p>
  */
-public class SslClientCertAuthenticator
-    extends LoginAuthenticator
+public class SslClientCertAuthenticator extends LoginAuthenticator
 {
-
-    /**
-     * Set to true if SSL certificate validation is not required
-     * per default it's true as this is the goal of this implementation
-     */
+    private final SslContextFactory sslContextFactory;
     private boolean validateCerts = true;
 
-    private SslContextFactory sslContextFactory;
-
     public SslClientCertAuthenticator(SslContextFactory sslContextFactory)
     {
-        super();
-        Objects.nonNull(sslContextFactory);
-        this.sslContextFactory = sslContextFactory;
+        this.sslContextFactory = Objects.requireNonNull(sslContextFactory);
     }
 
     @Override
@@ -135,19 +126,18 @@ public boolean secureResponse(ServletRequest req, ServletResponse res, boolean m
     }
 
     /**
-     * @return true if SSL certificate has to be validated
+     * @return true if SSL certificate has to be validated.
      */
     public boolean isValidateCerts()
     {
         return validateCerts;
     }
 
     /**
-     * @param validateCerts true if SSL certificates have to be validated
+     * @param validateCerts true if SSL certificates have to be validated.
      */
     public void setValidateCerts(boolean validateCerts)
     {
-        validateCerts = validateCerts;
+        this.validateCerts = validateCerts;
     }
-
 }