Also filter mechanism name queries properly

wildfly-security · Jul 27, 2015 · 09b0706 · 09b0706
1 parent 0776a2f
commit 09b0706
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/...main/java/org/wildfly/security/sasl/util/MechanismProviderFilteringSaslClientFactory.java b/...main/java/org/wildfly/security/sasl/util/MechanismProviderFilteringSaslClientFactory.java
@@ -59,4 +59,15 @@ public SaslClient createSaslClient(final String[] mechanisms, final String autho
         }
         return super.createSaslClient(mechanisms, authorizationId, protocol, serverName, newProps, cbh);
     }
+
+    public String[] getMechanismNames(final Map<String, ?> props) {
+        BiPredicate<String, Provider> existing = SaslFactories.getProviderFilterPredicate(props);
+        final HashMap<String, Object> newProps = new HashMap<String, Object>(props);
+        if (existing != null) {
+            newProps.put(SaslFactories.PROVIDER_FILTER_KEY, predicate.and(existing));
+        } else {
+            newProps.put(SaslFactories.PROVIDER_FILTER_KEY, predicate);
+        }
+        return super.getMechanismNames(newProps);
+    }
 }
diff --git a/...main/java/org/wildfly/security/sasl/util/MechanismProviderFilteringSaslServerFactory.java b/...main/java/org/wildfly/security/sasl/util/MechanismProviderFilteringSaslServerFactory.java
@@ -58,4 +58,15 @@ public SaslServer createSaslServer(final String mechanism, final String protocol
         }
         return super.createSaslServer(mechanism, protocol, serverName, newProps, cbh);
     }
+
+    public String[] getMechanismNames(final Map<String, ?> props) {
+        BiPredicate<String, Provider> existing = SaslFactories.getProviderFilterPredicate(props);
+        final HashMap<String, Object> newProps = new HashMap<String, Object>(props);
+        if (existing != null) {
+            newProps.put(SaslFactories.PROVIDER_FILTER_KEY, predicate.and(existing));
+        } else {
+            newProps.put(SaslFactories.PROVIDER_FILTER_KEY, predicate);
+        }
+        return super.getMechanismNames(newProps);
+    }
 }