Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixe bug were exception was being thrown on start up if a optional command could not load (for example if the jasypt lib was removed).

This commit is contained in:
Hiram Chirino 2014-03-27 13:09:42 -04:00
parent da07a11760
commit bc470202da
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java
View File

@ -54,6 +54,7 @@ public class PropertiesLoginModule implements LoginModule {
private final Set<Principal> principals = new HashSet<Principal>();
private File baseDir;
private boolean loginSucceeded;
private boolean decrypt = true;
@Override
public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) {
@ -79,6 +80,15 @@ public class PropertiesLoginModule implements LoginModule {
LOG.debug("Reloading users from " + uf.getAbsolutePath());
}
users = new PrincipalProperties("user", uf, LOG);
if( decrypt ) {
try {
EncryptionSupport.decrypt(users.getPrincipals());
} catch(NoClassDefFoundError e) {
// this Happens whe jasypt is not on the classpath..
decrypt = false;
LOG.info("jasypt is not on the classpath: password decryption disabled.");
}
}
}
String groupsFile = (String) options.get(GROUP_FILE) + "";