Author: jbonofre
Date: Mon Jun 18 15:46:43 2012
New Revision: 1351393
URL: http://svn.apache.org/viewvc?rev=1351393&view=rev
Log:
[KARAF-1541] Fix jaas:manage command about selection of realm and login module
Modified:
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
Modified:
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java?rev=1351393&r1=1351392&r2=1351393&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java
Mon Jun 18 15:46:43 2012
@@ -15,6 +15,7 @@
*/
package org.apache.karaf.jaas.command;
+import org.apache.karaf.jaas.boot.ProxyLoginModule;
import org.apache.karaf.jaas.config.JaasRealm;
import org.apache.karaf.jaas.modules.BackingEngine;
import org.apache.karaf.jaas.modules.BackingEngineService;
@@ -93,7 +94,8 @@ public abstract class JaasCommandSupport
}
for (AppConfigurationEntry entry : entries) {
- if (moduleName.equals(entry.getLoginModuleName())) {
+ String moduleClass = (String)
entry.getOptions().get(ProxyLoginModule.PROPERTY_MODULE);
+ if (moduleName.equals(entry.getLoginModuleName()) ||
moduleName.equals(moduleClass)) {
return entry;
}
}
Modified:
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java?rev=1351393&r1=1351392&r2=1351393&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
Mon Jun 18 15:46:43 2012
@@ -24,19 +24,19 @@ import javax.security.auth.login.AppConf
import java.util.LinkedList;
import java.util.Queue;
-@Command(scope = "jaas", name = "manage", description = "Manage user and roles
of a Jaas Realm.")
+@Command(scope = "jaas", name = "manage", description = "Manage user and roles
of a JAAS Realm")
public class ManageRealmCommand extends JaasCommandSupport {
- @Option(name = "--realm", description = "Jaas Realm", required = false,
multiValued = false)
+ @Option(name = "--realm", description = "Realm Name", required = false,
multiValued = false)
String realmName;
@Option(name = "--index", description = "Realm Index", required = false,
multiValued = false)
int index;
- @Option(name = "--module", aliases = {}, description = "Realm Module",
required = false, multiValued = false)
+ @Option(name = "--module", aliases = {}, description = "Login Module Class
Name", required = false, multiValued = false)
String moduleName;
- @Option(name = "--force", aliases = {}, description = "Force the
management of this realm, even if another one was under management", required =
false, multiValued = false)
+ @Option(name = "-f", aliases = { "--force" }, description = "Force the
management of this realm, even if another one was under management", required =
false, multiValued = false)
boolean force;
@Override
@@ -67,15 +67,14 @@ public class ManageRealmCommand extends
commands = new LinkedList<JaasCommandSupport>();
}
-
this.session.put(JAAS_REALM, realm);
this.session.put(JAAS_ENTRY, entry);
this.session.put(JAAS_CMDS, commands);
} else {
- System.err.println(String.format("Could not find module:
%s in realm:%s", moduleName, realmName));
+ System.err.println(String.format("Could not find module %s
in realm %s", moduleName, realmName));
}
} else {
- System.err.println(String.format("Could not find realm:%s",
realmName));
+ System.err.println(String.format("Could not find realm %s",
realmName));
}
}
return null;
