[ELY-2583] Make requestURI and Source-Address available from RealmSuc…

…cessfulAuthenticationEvent and RealmFailedAuthenticationEvent
wildfly-security · Sep 11, 2023 · 2ec6427 · 2ec6427
1 parent 3dc896a
commit 2ec6427
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 2 deletions.
diff --git a/auth/server/base/src/main/java/org/wildfly/security/auth/server/MechanismInformation.java b/auth/server/base/src/main/java/org/wildfly/security/auth/server/MechanismInformation.java
@@ -53,6 +53,10 @@ public interface MechanismInformation {
      */
     String getProtocol();
 
+    default String getRequestURI() {
+        return null;
+    }
+
     MechanismInformation DEFAULT = new MechanismInformation() {
 
         @Override

diff --git a/...rver/base/src/main/java/org/wildfly/security/auth/server/ServerAuthenticationContext.java b/...rver/base/src/main/java/org/wildfly/security/auth/server/ServerAuthenticationContext.java
@@ -1108,6 +1108,9 @@ private void handleOne(final Callback[] callbacks, final int idx) throws IOExcep
                                     mi.getMechanismType(), mi.getMechanismName(), mi.getHostName(), mi.getProtocol());
                         }
                         setMechanismInformation(mi);
+                        Attributes runtimeAttributes = new MapAttributes();
+                        runtimeAttributes.addFirst("Request-URI", mi.getRequestURI());
+                        addRuntimeAttributes(runtimeAttributes);
                         handleOne(callbacks, idx + 1);
                     } catch (Exception e) {
                         throw new IOException(e);
@@ -2107,15 +2110,57 @@ void succeed() {
         void fail(final boolean requireInProgress) {
             final SecurityIdentity capturedIdentity = getSourceIdentity();
             final AtomicReference<State> stateRef = getStateRef();
-            if (! stateRef.compareAndSet(this, FAILED)) {
+            if (!stateRef.compareAndSet(this, FAILED)) {
                 stateRef.get().fail(requireInProgress);
                 return;
             }
-            SecurityRealm.safeHandleRealmEvent(getRealmInfo().getSecurityRealm(), new RealmFailedAuthenticationEvent(realmIdentity, null, null));
+            SecurityRealm.safeHandleRealmEvent(getRealmInfo().getSecurityRealm(), new RealmFailedAuthenticationEvent(getRealmIdentityWithRuntimeAttributes(), null, null));
             SecurityDomain.safeHandleSecurityEvent(capturedIdentity.getSecurityDomain(), new SecurityAuthenticationFailedEvent(capturedIdentity, realmIdentity.getRealmIdentityPrincipal()));
             realmIdentity.dispose();
         }
 
+        private RealmIdentity getRealmIdentityWithRuntimeAttributes() {
+            return new RealmIdentity() {
+                @Override
+                public Principal getRealmIdentityPrincipal() {
+                    return realmIdentity.getRealmIdentityPrincipal();
+                }
+
+                @Override
+                public SupportLevel getCredentialAcquireSupport(Class<? extends Credential> credentialType, String algorithmName, AlgorithmParameterSpec parameterSpec) throws RealmUnavailableException {
+                    return realmIdentity.getCredentialAcquireSupport(credentialType, algorithmName, parameterSpec);
+                }
+
+                @Override
+                public <C extends Credential> C getCredential(Class<C> credentialType) throws RealmUnavailableException {
+                    return realmIdentity.getCredential(credentialType);
+                }
+
+                @Override
+                public SupportLevel getEvidenceVerifySupport(Class<? extends Evidence> evidenceType, String algorithmName) throws RealmUnavailableException {
+                    return realmIdentity.getEvidenceVerifySupport(evidenceType, algorithmName);
+                }
+
+                @Override
+                public boolean verifyEvidence(Evidence evidence) throws RealmUnavailableException {
+                    return realmIdentity.verifyEvidence(evidence);
+                }
+
+                @Override
+                public boolean exists() throws RealmUnavailableException {
+                    return realmIdentity.exists();
+                }
+
+                public AuthorizationIdentity getAuthorizationIdentity() throws RealmUnavailableException {
+                    if (realmIdentity.exists()) {
+                        return AuthorizationIdentity.basicIdentity(realmIdentity.getAuthorizationIdentity(), runtimeAttributes);
+                    } else {
+                        return AuthorizationIdentity.basicIdentity(AuthorizationIdentity.EMPTY, runtimeAttributes);
+                    }
+                }
+            };
+        }
+
         @Override
         void setPrincipal(final Principal principal, final boolean exclusive) {
             if (isSamePrincipal(principal)) {

diff --git a/...src/main/java/org/wildfly/security/http/util/SetMechanismInformationMechanismFactory.java b/...src/main/java/org/wildfly/security/http/util/SetMechanismInformationMechanismFactory.java
@@ -20,6 +20,7 @@
 import static org.wildfly.security.http.HttpConstants.HOST;
 import static org.wildfly.security.http.util.ElytronMessages.log;
 
+import java.net.URI;
 import java.util.Map;
 
 import javax.security.auth.callback.Callback;
@@ -73,6 +74,7 @@ public String getMechanismName() {
             public void evaluateRequest(HttpServerRequest request) throws HttpAuthenticationException {
                 String host = request.getFirstRequestHeaderValue(HOST);
                 String resolvedHostName = null;
+                URI requestedUri = request.getRequestURI();
                 if (host != null) {
                   if (host.startsWith("[")) {
                       int close = host.indexOf(']');
@@ -110,6 +112,11 @@ public String getMechanismName() {
                         public String getHostName() {
                             return hostName;
                         }
+                        @Override
+                        public String getRequestURI() {
+                            return requestedUri.toString();
+                        }
+
                     })});
 
                 } catch (Throwable e) {