Merge pull request #5271 from Pandrex247/Revert-FISH-387

Revert FISH-387

api/payara-api/pom.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-  Copyright (c) [2016-2021] Payara Foundation and/or its affiliates. All rights reserved.
-
+ 
+  Copyright (c) [2016-2020] Payara Foundation and/or its affiliates. All rights reserved.
+ 
   The contents of this file are subject to the terms of either the GNU
   General Public License Version 2 only ("GPL") or the Common Development
   and Distribution License("CDDL") (collectively, the "License").  You
@@ -12,20 +12,20 @@
   https://github.com/payara/Payara/blob/master/LICENSE.txt
   See the License for the specific
   language governing permissions and limitations under the License.
-
+ 
   When distributing the software, include this License Header Notice in each
   file and include the License file at glassfish/legal/LICENSE.txt.
-
+ 
   GPL Classpath Exception:
   The Payara Foundation designates this particular file as subject to the "Classpath"
   exception as provided by the Payara Foundation in the GPL Version 2 section of the License
   file that accompanied this code.
-
+ 
   Modifications:
   If applicable, add the following below the License Header, with the fields
   enclosed by brackets [] replaced by your own identifying information:
   "Portions Copyright [year] [name of copyright owner]"
-
+ 
   Contributor(s):
   If you wish your version of this file to be governed by only the CDDL or
   only the GPL Version 2, indicate your decision by adding "[Contributor]
@@ -96,8 +96,6 @@
                                     io.opentracing,
                                     javax.inject,
                                     javax.enterprise.util,
-                                    javax.security.auth,
-                                    javax.security.auth.x500,
                                     javax.security.enterprise.credential,
                                     javax.security.enterprise.identitystore,
                                     javax.security.enterprise.authentication.mechanism.http,

appserver/security/webintegration/src/main/java/com/sun/web/security/RealmAdapter.java

@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2016-2021] [Payara Foundation and/or its affiliates]
+// Portions Copyright [2016-2020] [Payara Foundation and/or its affiliates]
 package com.sun.web.security;
 
 import com.sun.enterprise.deployment.Application;
@@ -175,7 +175,6 @@ public class RealmAdapter extends RealmBase implements RealmInitializer, PostCon
     private final static SecurityConstraint[] emptyConstraints = new SecurityConstraint[] {};
 
     private String moduleID;
-    private String componentId;
 
     @Inject
     private ServerContext serverContext;
@@ -258,11 +257,6 @@ public void initializeRealm(Object bundleDescriptor, boolean isSystemApp, String
         cNonceValidator = new CNonceValidator(webDescriptor, appCNonceCacheMapProvider, cNonceCacheFactoryProvider);
     }
 
-    @Override
-    public void initializeRealm(String componentId) {
-        this.componentId = componentId;
-    }
-
     /**
      * Return <tt>true</tt> if JASPIC is available.
      *
@@ -884,7 +878,7 @@ private boolean authenticate(String username, char[] password, X509Certificate[]
         try {
             if (certs != null) {
                 // Certificate credential used to authenticate
-                WebAndEjbToJaasBridge.doX500Login(createSubjectWithCerts(certs), moduleID, componentId);
+                WebAndEjbToJaasBridge.doX500Login(createSubjectWithCerts(certs), moduleID);
             } else if (digestParams != null) {
                 // Digest credential used to authenticate
                 WebAndEjbToJaasBridge.login(new DigestCredentials(realmName, username, digestParams));