You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2012/09/14 22:54:45 UTC
svn commit: r1384918 - in /karaf/branches/karaf-2.3.x:
assemblies/apache-karaf/src/main/filtered-resources/etc/
jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/
jaas/command/src/main/java/org/apache/karaf/jaas/command/
jaas/modules/src/mai...
Author: anierbeck
Date: Fri Sep 14 20:54:44 2012
New Revision: 1384918
URL: http://svn.apache.org/viewvc?rev=1384918&view=rev
Log:
[KARAF-1305] - Error with Basic HTTP Authentication when using karaf realm
backported from trunk
Added:
karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/
karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java (with props)
karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java (with props)
karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java (with props)
karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java (with props)
Removed:
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java
karaf/branches/karaf-2.3.x/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java
karaf/branches/karaf-2.3.x/shell/console/pom.xml
karaf/branches/karaf-2.3.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasAuthenticator.java
karaf/branches/karaf-2.3.x/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties Fri Sep 14 20:54:44 2012
@@ -70,6 +70,7 @@ org.osgi.framework.system.packages= \
org.osgi.service.startlevel;uses:="org.osgi.framework";version="1.1", \
org.osgi.util.tracker;uses:="org.osgi.framework";version="1.5", \
org.apache.karaf.jaas.boot;version="${karaf.osgi.version}", \
+ org.apache.karaf.jaas.boot.principal;version="${karaf.osgi.version}", \
org.apache.karaf.version;version="${karaf.osgi.version}", \
${jre-${java.specification.version}}
Added: karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java?rev=1384918&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java (added)
+++ karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java Fri Sep 14 20:54:44 2012
@@ -0,0 +1,52 @@
+/*
+ * Licensed 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.
+ * under the License.
+ */
+package org.apache.karaf.jaas.boot.principal;
+
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+public class GroupPrincipal implements Group {
+
+ private String name;
+ private Hashtable<String,Principal> members = new Hashtable<String, Principal>();
+
+ public GroupPrincipal(String name) {
+ this.name = name;
+ }
+
+ public boolean addMember(Principal user) {
+ members.put(user.getName(), user);
+ return true;
+ }
+
+ public boolean removeMember(Principal user) {
+ members.remove(user.getName());
+ return true;
+ }
+
+ public boolean isMember(Principal member) {
+ return members.contains(member.getName());
+ }
+
+ public Enumeration<? extends Principal> members() {
+ return members.elements();
+ }
+
+ public String getName() {
+ return name;
+ }
+}
Propchange: karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/GroupPrincipal.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java?rev=1384918&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java (added)
+++ karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java Fri Sep 14 20:54:44 2012
@@ -0,0 +1,75 @@
+/*
+ * Licensed 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.
+ * under the License.
+ */
+package org.apache.karaf.jaas.boot.principal;
+
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import javax.security.auth.Subject;
+
+public enum RolePolicy {
+
+ PREFIXED_ROLES("prefix") {
+ public void handleRoles(Subject subject,Set<Principal> principals,String discriminator) {
+ for(Principal p:principals) {
+ if(p instanceof RolePrincipal){
+ RolePrincipal rolePrincipal = new RolePrincipal(discriminator+p.getName());
+ subject.getPrincipals().add(rolePrincipal);
+ } else {
+ subject.getPrincipals().add(p);
+ }
+ }
+ }
+ },
+ GROUP_ROLES("group") {
+ public void handleRoles(Subject subject,Set<Principal> principals,String discriminator) {
+ Group group = new GroupPrincipal(discriminator);
+ for(Principal p:principals) {
+ if(p instanceof RolePrincipal) {
+ group.addMember(p);
+ } else {
+ subject.getPrincipals().add(p);
+ }
+ }
+ subject.getPrincipals().add(group);
+ }
+ };
+
+ private String value;
+
+ private static final Map<String, RolePolicy> policies = new HashMap<String, RolePolicy>();
+
+ static {
+ for (RolePolicy s : EnumSet.allOf(RolePolicy.class)) {
+ policies.put(s.getValue(), s);
+ }
+ }
+
+ private RolePolicy(String value) {
+ this.value = value;
+ }
+
+ public String getValue() {
+ return value;
+ }
+ public static RolePolicy getPolicy(String code) {
+ return policies.get(code);
+ }
+
+ public abstract void handleRoles(Subject subject,Set<Principal> principals,String discriminator);
+}
Propchange: karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePolicy.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java?rev=1384918&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java (added)
+++ karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java Fri Sep 14 20:54:44 2012
@@ -0,0 +1,55 @@
+/*
+ * 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.boot.principal;
+
+import java.security.Principal;
+
+public class RolePrincipal implements Principal {
+
+ private final String name;
+
+ public RolePrincipal(String name) {
+ assert name != null;
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof RolePrincipal)) return false;
+
+ RolePrincipal that = (RolePrincipal) o;
+
+ if (name != null ? !name.equals(that.name) : that.name != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return name != null ? name.hashCode() : 0;
+ }
+
+ @Override
+ public String toString() {
+ return "RolePrincipal[" + name + "]";
+ }
+}
Propchange: karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/RolePrincipal.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java?rev=1384918&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java (added)
+++ karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java Fri Sep 14 20:54:44 2012
@@ -0,0 +1,55 @@
+/*
+ * 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.boot.principal;
+
+import java.security.Principal;
+
+public class UserPrincipal implements Principal {
+
+ private final String name;
+
+ public UserPrincipal(String name) {
+ assert name != null;
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof UserPrincipal)) return false;
+
+ UserPrincipal that = (UserPrincipal) o;
+
+ if (name != null ? !name.equals(that.name) : that.name != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return name != null ? name.hashCode() : 0;
+ }
+
+ @Override
+ public String toString() {
+ return "UserPrincipal[" + name + "]";
+ }
+}
Propchange: karaf/branches/karaf-2.3.x/jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/UserPrincipal.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java (original)
+++ karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java Fri Sep 14 20:54:44 2012
@@ -21,8 +21,8 @@ import javax.security.auth.login.AppConf
import org.apache.felix.gogo.commands.Command;
import org.apache.karaf.jaas.config.JaasRealm;
import org.apache.karaf.jaas.modules.BackingEngine;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
@Command(scope = "jaas", name = "users", description = "List the users of the selected JAAS Realm/Login Module")
public class ListUsersCommand extends JaasCommandSupport {
Modified: karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java Fri Sep 14 20:54:44 2012
@@ -24,6 +24,7 @@ import javax.security.auth.login.LoginEx
import javax.security.auth.spi.LoginModule;
import org.apache.karaf.jaas.modules.encryption.EncryptionSupport;
+import org.apache.karaf.jaas.boot.principal.RolePolicy;
import org.osgi.framework.BundleContext;
public abstract class AbstractKarafLoginModule implements LoginModule {
Modified: karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java Fri Sep 14 20:54:44 2012
@@ -16,6 +16,9 @@ package org.apache.karaf.jaas.modules;
import java.util.List;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
+
public interface BackingEngine {
/**
Modified: karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java Fri Sep 14 20:54:44 2012
@@ -15,9 +15,9 @@
*/
package org.apache.karaf.jaas.modules.jdbc;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.jaas.modules.BackingEngine;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.encryption.EncryptionSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java Fri Sep 14 20:54:44 2012
@@ -15,9 +15,9 @@
*/
package org.apache.karaf.jaas.modules.jdbc;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.properties.PropertiesLoginModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java Fri Sep 14 20:54:44 2012
@@ -15,10 +15,10 @@
*/
package org.apache.karaf.jaas.modules.ldap;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.jaas.config.KeystoreManager;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java Fri Sep 14 20:54:44 2012
@@ -31,10 +31,10 @@ import javax.security.auth.callback.Unsu
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
import org.osgi.service.cm.Configuration;
public class OsgiConfigLoginModule extends AbstractKarafLoginModule {
Modified: karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java Fri Sep 14 20:54:44 2012
@@ -15,10 +15,10 @@
*/
package org.apache.karaf.jaas.modules.properties;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.felix.utils.properties.Properties;
import org.apache.karaf.jaas.modules.BackingEngine;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
import org.apache.karaf.jaas.modules.encryption.EncryptionSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java Fri Sep 14 20:54:44 2012
@@ -30,10 +30,10 @@ import javax.security.auth.callback.Unsu
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.felix.utils.properties.Properties;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java Fri Sep 14 20:54:44 2012
@@ -37,8 +37,8 @@ import javax.security.auth.login.LoginEx
import org.apache.felix.utils.properties.Properties;
import org.apache.karaf.jaas.modules.AbstractKarafLoginModule;
-import org.apache.karaf.jaas.modules.RolePrincipal;
-import org.apache.karaf.jaas.modules.UserPrincipal;
+import org.apache.karaf.jaas.boot.principal.RolePrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/branches/karaf-2.3.x/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java (original)
+++ karaf/branches/karaf-2.3.x/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java Fri Sep 14 20:54:44 2012
@@ -77,7 +77,7 @@ public class JaasAuthenticator implement
});
loginContext.login();
if (role != null && role.length() > 0) {
- String clazz = "org.apache.karaf.jaas.modules.RolePrincipal";
+ String clazz = "org.apache.karaf.jaas.boot.principal.RolePrincipal";
String name = role;
int idx = role.indexOf(':');
if (idx > 0) {
Modified: karaf/branches/karaf-2.3.x/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/console/pom.xml?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/console/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/console/pom.xml Fri Sep 14 20:54:44 2012
@@ -1,23 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <!--
-
- 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.
- -->
+ <!-- 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. -->
<modelVersion>4.0.0</modelVersion>
@@ -61,6 +55,10 @@
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
+ <artifactId>org.apache.karaf.jaas.boot</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.modules</artifactId>
</dependency>
<dependency>
Modified: karaf/branches/karaf-2.3.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java (original)
+++ karaf/branches/karaf-2.3.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java Fri Sep 14 20:54:44 2012
@@ -34,7 +34,7 @@ import jline.Terminal;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
import org.apache.felix.service.command.Function;
-import org.apache.karaf.jaas.modules.UserPrincipal;
+import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.sshd.agent.SshAgent;
import org.apache.sshd.agent.local.AgentImpl;
import org.fusesource.jansi.AnsiConsole;
Modified: karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasAuthenticator.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasAuthenticator.java?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasAuthenticator.java (original)
+++ karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasAuthenticator.java Fri Sep 14 20:54:44 2012
@@ -81,7 +81,7 @@ public class KarafJaasAuthenticator impl
});
loginContext.login();
if (role != null && role.length() > 0) {
- String clazz = "org.apache.karaf.jaas.modules.RolePrincipal";
+ String clazz = "org.apache.karaf.jaas.boot.principal.RolePrincipal";
String name = role;
int idx = role.indexOf(':');
if (idx > 0) {
@@ -126,7 +126,7 @@ public class KarafJaasAuthenticator impl
});
loginContext.login();
if (role != null && role.length() > 0) {
- String clazz = "org.apache.karaf.jaas.modules.RolePrincipal";
+ String clazz = "org.apache.karaf.jaas.boot.principal.RolePrincipal";
String name = role;
int idx = role.indexOf(':');
if (idx > 0) {
Modified: karaf/branches/karaf-2.3.x/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java?rev=1384918&r1=1384917&r2=1384918&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java (original)
+++ karaf/branches/karaf-2.3.x/webconsole/branding/src/main/java/org/apache/karaf/webconsole/JaasSecurityProvider.java Fri Sep 14 20:54:44 2012
@@ -90,7 +90,7 @@ public class JaasSecurityProvider implem
});
loginContext.login();
if (role != null && role.length() > 0) {
- String clazz = "org.apache.karaf.jaas.modules.RolePrincipal";
+ String clazz = "org.apache.karaf.jaas.boot.principal.RolePrincipal";
String name = role;
int idx = role.indexOf(':');
if (idx > 0) {