Github user jbertram commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/1771#discussion_r162151931
--- Diff:
artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java
---
@@ -105,12 +110,39 @@ public void initialize(Subject subject,
this.subject = subject;
this.handler = callbackHandler;
- config = new LDAPLoginProperty[]{new
LDAPLoginProperty(INITIAL_CONTEXT_FACTORY, (String)
options.get(INITIAL_CONTEXT_FACTORY)), new LDAPLoginProperty(CONNECTION_URL,
(String) options.get(CONNECTION_URL)), new
LDAPLoginProperty(CONNECTION_USERNAME, (String)
options.get(CONNECTION_USERNAME)), new LDAPLoginProperty(CONNECTION_PASSWORD,
(String) options.get(CONNECTION_PASSWORD)), new
LDAPLoginProperty(CONNECTION_PROTOCOL, (String)
options.get(CONNECTION_PROTOCOL)), new LDAPLoginProperty(AUTHENTICATION,
(String) options.get(AUTHENTICATION)), new LDAPLoginProperty(USER_BASE,
(String) options.get(USER_BASE)), new LDAPLoginProperty(USER_SEARCH_MATCHING,
(String) options.get(USER_SEARCH_MATCHING)), new
LDAPLoginProperty(USER_SEARCH_SUBTREE, (String)
options.get(USER_SEARCH_SUBTREE)), new LDAPLoginProperty(ROLE_BASE, (String)
options.get(ROLE_BASE)), new LDAPLoginProperty(ROLE_NAME, (String)
options.get(ROLE_NAME)), new LDAPLoginProperty(ROLE_SEARCH_MATCHING, (String)
options.get(RO
LE_SEARCH_MATCHING)), new LDAPLoginProperty(ROLE_SEARCH_SUBTREE, (String)
options.get(ROLE_SEARCH_SUBTREE)), new LDAPLoginProperty(USER_ROLE_NAME,
(String) options.get(USER_ROLE_NAME)), new LDAPLoginProperty(EXPAND_ROLES,
(String) options.get(EXPAND_ROLES)), new
LDAPLoginProperty(EXPAND_ROLES_MATCHING, (String)
options.get(EXPAND_ROLES_MATCHING)), new LDAPLoginProperty(REFERRAL, (String)
options.get(REFERRAL))};
+ config = new LDAPLoginProperty[]{new
LDAPLoginProperty(INITIAL_CONTEXT_FACTORY, (String)
options.get(INITIAL_CONTEXT_FACTORY)),
+ new
LDAPLoginProperty(CONNECTION_URL, (String) options.get(CONNECTION_URL)),
+ new
LDAPLoginProperty(CONNECTION_USERNAME, (String)
options.get(CONNECTION_USERNAME)),
+ new
LDAPLoginProperty(CONNECTION_PASSWORD, (String)
options.get(CONNECTION_PASSWORD)),
+ new
LDAPLoginProperty(CONNECTION_PROTOCOL, (String)
options.get(CONNECTION_PROTOCOL)),
+ new
LDAPLoginProperty(AUTHENTICATION, (String) options.get(AUTHENTICATION)),
+ new LDAPLoginProperty(USER_BASE,
(String) options.get(USER_BASE)),
+ new
LDAPLoginProperty(USER_SEARCH_MATCHING, (String)
options.get(USER_SEARCH_MATCHING)),
+ new
LDAPLoginProperty(USER_SEARCH_SUBTREE, (String)
options.get(USER_SEARCH_SUBTREE)),
+ new LDAPLoginProperty(ROLE_BASE,
(String) options.get(ROLE_BASE)),
+ new LDAPLoginProperty(ROLE_NAME,
(String) options.get(ROLE_NAME)),
+ new
LDAPLoginProperty(ROLE_SEARCH_MATCHING, (String)
options.get(ROLE_SEARCH_MATCHING)),
+ new
LDAPLoginProperty(ROLE_SEARCH_SUBTREE, (String)
options.get(ROLE_SEARCH_SUBTREE)),
+ new
LDAPLoginProperty(USER_ROLE_NAME, (String) options.get(USER_ROLE_NAME)),
+ new LDAPLoginProperty(EXPAND_ROLES,
(String) options.get(EXPAND_ROLES)),
+ new
LDAPLoginProperty(EXPAND_ROLES_MATCHING, (String)
options.get(EXPAND_ROLES_MATCHING)),
+ new LDAPLoginProperty(REFERRAL,
(String) options.get(REFERRAL))};
+
if (isLoginPropertySet(AUTHENTICATE_USER)) {
authenticateUser =
Boolean.valueOf(getLDAPPropertyValue(AUTHENTICATE_USER));
}
isRoleAttributeSet = isLoginPropertySet(ROLE_NAME);
roleAttributeName = getLDAPPropertyValue(ROLE_NAME);
+ String isMask = (String) options.get(MASK_PASSWORD);
--- End diff --
This isn't used anywhere so it can be removed.
---
