You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2012/09/16 19:48:09 UTC

svn commit: r1385327 - in /karaf/branches/karaf-2.3.x/jaas/command/src/main: java/org/apache/karaf/jaas/command/completers/ resources/OSGI-INF/blueprint/

Author: iocanel
Date: Sun Sep 16 17:48:09 2012
New Revision: 1385327

URL: http://svn.apache.org/viewvc?rev=1385327&view=rev
Log:
[KARAF-1836] Added jaas realm and login module class name completers.

Added:
    karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/
    karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/LoginModuleNameCompleter.java
    karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java
Modified:
    karaf/branches/karaf-2.3.x/jaas/command/src/main/resources/OSGI-INF/blueprint/jaas-command.xml

Added: karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/LoginModuleNameCompleter.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/LoginModuleNameCompleter.java?rev=1385327&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/LoginModuleNameCompleter.java (added)
+++ karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/LoginModuleNameCompleter.java Sun Sep 16 17:48:09 2012
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.jaas.command.completers;
+
+import java.util.LinkedList;
+import java.util.List;
+import javax.security.auth.login.AppConfigurationEntry;
+import org.apache.karaf.jaas.boot.ProxyLoginModule;
+import org.apache.karaf.jaas.config.JaasRealm;
+import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.console.completer.StringsCompleter;
+
+public class LoginModuleNameCompleter implements Completer {
+
+    private List<JaasRealm> realms;
+
+    public int complete(String buffer, int cursor, List<String> candidates) {
+        StringsCompleter delegate = new StringsCompleter();
+        try {
+            if (realms != null && !realms.isEmpty())
+                for (JaasRealm realm : realms) {
+                    List<String> moduleClassNames = findLoginModuleClassNames(realm);
+                    if (moduleClassNames != null && !moduleClassNames.isEmpty())
+                    delegate.getStrings().addAll(moduleClassNames);
+                }
+        } catch (Exception e) {
+            // Ignore
+        }
+        return delegate.complete(buffer, cursor, candidates);
+    }
+
+    /**
+     * Finds the login module class name in the {@link JaasRealm} entries.
+     * @param realm
+     * @return
+     */
+    private List<String> findLoginModuleClassNames(JaasRealm realm) {
+        List<String> moduleClassNames = new LinkedList<String>();
+        for (AppConfigurationEntry entry : realm.getEntries()) {
+            String moduleClass = (String) entry.getOptions().get(ProxyLoginModule.PROPERTY_MODULE);
+            if (moduleClass != null) {
+                moduleClassNames.add(moduleClass);
+            }
+
+        }
+        return moduleClassNames;
+    }
+
+    public List<JaasRealm> getRealms() {
+        return realms;
+    }
+
+    public void setRealms(List<JaasRealm> realms) {
+        this.realms = realms;
+    }
+
+}

Added: karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java?rev=1385327&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java (added)
+++ karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java Sun Sep 16 17:48:09 2012
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.jaas.command.completers;
+
+import java.util.List;
+import org.apache.karaf.jaas.config.JaasRealm;
+import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.console.completer.StringsCompleter;
+
+public class RealmCompleter implements Completer {
+
+    private List<JaasRealm> realms;
+
+    public int complete(String buffer, int cursor, List<String> candidates) {
+        StringsCompleter delegate = new StringsCompleter();
+        try {
+            if (realms != null && !realms.isEmpty())
+                for (JaasRealm realm : realms) {
+                    delegate.getStrings().add(realm.getName());
+                }
+        } catch (Exception e) {
+            // Ignore
+        }
+        return delegate.complete(buffer, cursor, candidates);
+    }
+
+    public List<JaasRealm> getRealms() {
+        return realms;
+    }
+
+    public void setRealms(List<JaasRealm> realms) {
+        this.realms = realms;
+    }
+
+}

Modified: karaf/branches/karaf-2.3.x/jaas/command/src/main/resources/OSGI-INF/blueprint/jaas-command.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/resources/OSGI-INF/blueprint/jaas-command.xml?rev=1385327&r1=1385326&r2=1385327&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/command/src/main/resources/OSGI-INF/blueprint/jaas-command.xml (original)
+++ karaf/branches/karaf-2.3.x/jaas/command/src/main/resources/OSGI-INF/blueprint/jaas-command.xml Sun Sep 16 17:48:09 2012
@@ -19,11 +19,15 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
+    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command name="jaas/manage">
             <action class="org.apache.karaf.jaas.command.ManageRealmCommand">
                 <property name="realms" ref="realms"/>
             </action>
+            <optional-completers>
+                <entry key="--realm" value-ref="realmCompleter"/>
+                <entry key="--module" value-ref="moduleClassNameCompleter"/>
+            </optional-completers>
         </command>
         <command name="jaas/update">
             <action class="org.apache.karaf.jaas.command.UpdateCommand">
@@ -71,4 +75,14 @@
     <!-- Backing Engine Factories -->
     <reference-list id="engineFactories" interface="org.apache.karaf.jaas.modules.BackingEngineFactory"
                     availability="optional"/>
+
+    <!-- Completers -->
+    <bean id="realmCompleter" class="org.apache.karaf.jaas.command.completers.RealmCompleter">
+        <property name="realms" ref="realms"/>
+    </bean>
+
+    <bean id="moduleClassNameCompleter" class="org.apache.karaf.jaas.command.completers.LoginModuleNameCompleter">
+        <property name="realms" ref="realms"/>
+    </bean>
+
 </blueprint>