You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cm...@apache.org on 2010/12/05 18:06:53 UTC
svn commit: r1042387 - in
/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap:
./ GroupPrincipal.java LDAPLoginModule.java LDAPLoginProperty.java
UserPrincipal.java
Author: cmoulliard
Date: Sun Dec 5 17:06:52 2010
New Revision: 1042387
URL: http://svn.apache.org/viewvc?rev=1042387&view=rev
Log:
karaf-310: Add LDAP login module - code comes from ActiveMq
Added:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/GroupPrincipal.java
- copied, changed from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
- copied, changed from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginProperty.java
- copied, changed from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginProperty.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/UserPrincipal.java
- copied, changed from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java
Copied: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/GroupPrincipal.java (from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/GroupPrincipal.java?p2=karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/GroupPrincipal.java&p1=activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java&r1=1042385&r2=1042387&rev=1042387&view=diff
==============================================================================
--- activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/GroupPrincipal.java Sun Dec 5 17:06:52 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.jaas;
+package org.apache.karaf.jaas.modules.ldap;
import java.security.Principal;
Copied: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java (from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java?p2=karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java&p1=activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java&r1=1042385&r2=1042387&rev=1042387&view=diff
==============================================================================
--- activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java Sun Dec 5 17:06:52 2010
@@ -14,43 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.jaas;
+package org.apache.karaf.jaas.modules.ldap;
-import java.io.IOException;
-import java.security.Principal;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import javax.naming.AuthenticationException;
-import javax.naming.CommunicationException;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.naming.*;
+import javax.naming.directory.*;
import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.callback.*;
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.IOException;
+import java.security.Principal;
+import java.text.MessageFormat;
+import java.util.*;
/**
* @version $Rev: $ $Date: $
Copied: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginProperty.java (from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginProperty.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginProperty.java?p2=karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginProperty.java&p1=activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginProperty.java&r1=1042385&r2=1042387&rev=1042387&view=diff
==============================================================================
--- activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginProperty.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginProperty.java Sun Dec 5 17:06:52 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.activemq.jaas;
+package org.apache.karaf.jaas.modules.ldap;
public class LDAPLoginProperty {
private String name;
Copied: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/UserPrincipal.java (from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/UserPrincipal.java?p2=karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/UserPrincipal.java&p1=activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java&r1=1042385&r2=1042387&rev=1042387&view=diff
==============================================================================
--- activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/UserPrincipal.java Sun Dec 5 17:06:52 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.jaas;
+package org.apache.karaf.jaas.modules.ldap;
import java.security.Principal;
Re: svn commit: r1042387 - in /karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap:
./ GroupPrincipal.java LDAPLoginModule.java LDAPLoginProperty.java UserPrincipal.java
Posted by Guillaume Nodet <gn...@gmail.com>.
I think JB was working on that, and in addition, I think we need to
have that LDAP module more integrated with the roles abstraction we've
introduced lately (see
http://karaf.apache.org/manual/2.1.99-SNAPSHOT/developers-guide/security-framework.html#Rolediscoverypolicies)
On Sun, Dec 5, 2010 at 18:06, <cm...@apache.org> wrote:
> Author: cmoulliard
> Date: Sun Dec 5 17:06:52 2010
> New Revision: 1042387
>
> URL: http://svn.apache.org/viewvc?rev=1042387&view=rev
> Log:
> karaf-310: Add LDAP login module - code comes from ActiveMq
>
> Added:
> karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/
> karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/GroupPrincipal.java
> - copied, changed from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java
> karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
> - copied, changed from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java
> karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginProperty.java
> - copied, changed from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginProperty.java
> karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/UserPrincipal.java
> - copied, changed from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java
>
> Copied: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/GroupPrincipal.java (from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java)
> URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/GroupPrincipal.java?p2=karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/GroupPrincipal.java&p1=activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java&r1=1042385&r2=1042387&rev=1042387&view=diff
> ==============================================================================
> --- activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java (original)
> +++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/GroupPrincipal.java Sun Dec 5 17:06:52 2010
> @@ -14,7 +14,7 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -package org.apache.activemq.jaas;
> +package org.apache.karaf.jaas.modules.ldap;
>
> import java.security.Principal;
>
>
> Copied: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java (from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java)
> URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java?p2=karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java&p1=activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java&r1=1042385&r2=1042387&rev=1042387&view=diff
> ==============================================================================
> --- activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java (original)
> +++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java Sun Dec 5 17:06:52 2010
> @@ -14,43 +14,22 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -package org.apache.activemq.jaas;
> +package org.apache.karaf.jaas.modules.ldap;
>
> -import java.io.IOException;
> -import java.security.Principal;
> -import java.text.MessageFormat;
> -import java.util.ArrayList;
> -import java.util.HashSet;
> -import java.util.Hashtable;
> -import java.util.Iterator;
> -import java.util.Map;
> -import java.util.Set;
> -
> -import javax.naming.AuthenticationException;
> -import javax.naming.CommunicationException;
> -import javax.naming.Context;
> -import javax.naming.Name;
> -import javax.naming.NameParser;
> -import javax.naming.NamingEnumeration;
> -import javax.naming.NamingException;
> -import javax.naming.directory.Attribute;
> -import javax.naming.directory.Attributes;
> -import javax.naming.directory.DirContext;
> -import javax.naming.directory.InitialDirContext;
> -import javax.naming.directory.SearchControls;
> -import javax.naming.directory.SearchResult;
> +import org.apache.commons.logging.Log;
> +import org.apache.commons.logging.LogFactory;
> +
> +import javax.naming.*;
> +import javax.naming.directory.*;
> import javax.security.auth.Subject;
> -import javax.security.auth.callback.Callback;
> -import javax.security.auth.callback.CallbackHandler;
> -import javax.security.auth.callback.NameCallback;
> -import javax.security.auth.callback.PasswordCallback;
> -import javax.security.auth.callback.UnsupportedCallbackException;
> +import javax.security.auth.callback.*;
> import javax.security.auth.login.FailedLoginException;
> import javax.security.auth.login.LoginException;
> import javax.security.auth.spi.LoginModule;
> -
> -import org.apache.commons.logging.Log;
> -import org.apache.commons.logging.LogFactory;
> +import java.io.IOException;
> +import java.security.Principal;
> +import java.text.MessageFormat;
> +import java.util.*;
>
> /**
> * @version $Rev: $ $Date: $
>
> Copied: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginProperty.java (from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginProperty.java)
> URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginProperty.java?p2=karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginProperty.java&p1=activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginProperty.java&r1=1042385&r2=1042387&rev=1042387&view=diff
> ==============================================================================
> --- activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginProperty.java (original)
> +++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginProperty.java Sun Dec 5 17:06:52 2010
> @@ -15,7 +15,7 @@
> * limitations under the License.
> */
>
> -package org.apache.activemq.jaas;
> +package org.apache.karaf.jaas.modules.ldap;
>
> public class LDAPLoginProperty {
> private String name;
>
> Copied: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/UserPrincipal.java (from r1042385, activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java)
> URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/UserPrincipal.java?p2=karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/UserPrincipal.java&p1=activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java&r1=1042385&r2=1042387&rev=1042387&view=diff
> ==============================================================================
> --- activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java (original)
> +++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/UserPrincipal.java Sun Dec 5 17:06:52 2010
> @@ -14,7 +14,7 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -package org.apache.activemq.jaas;
> +package org.apache.karaf.jaas.modules.ldap;
>
> import java.security.Principal;
>
>
>
>
--
Cheers,
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
Open Source SOA
http://fusesource.com