org.springframework.osgi.extender,\
org.argeo.server.ads.server,\
org.argeo.node.repo.jackrabbit,\
-org.argeo.security.manager.ldap,\
+org.argeo.security.dao.ldap,\
org.argeo.security.services,\
org.argeo.security.services.admin,\
com.springsource.javax.servlet,\
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.argeo.security.dao.admin.ldap</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+++ /dev/null
-Bundle-SymbolicName: org.argeo.security.dao.admin.ldap
-Bundle-Version: 0.2.3.SNAPSHOT
-Import-Package: com.sun.jndi.ldap;resolution:=optional,
- org.argeo.security,
- org.argeo.security.ldap,
- org.argeo.security.ldap.nature,
- org.argeo.security.nature,
- org.argeo.server.json;resolution:=optional,
- org.springframework.beans.factory.config,
- org.springframework.ldap.core.support,
- org.springframework.security,
- org.springframework.security.ldap,
- org.springframework.security.ldap.populator,
- org.springframework.security.providers,
- org.springframework.security.providers.encoding;specification-version="2.0.6.RELEASE",
- org.springframework.security.providers.ldap,
- org.springframework.security.providers.ldap.authenticator,
- org.springframework.security.userdetails,
- org.springframework.security.userdetails.ldap
-Bundle-Name: Security Manager LDAP
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
- xsi:schemaLocation="http://www.springframework.org/schema/osgi \r
- http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
- http://www.springframework.org/schema/beans \r
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
- <!-- REFERENCES -->\r
- <list id="userNatureMappers" interface="org.argeo.security.ldap.UserNatureMapper"\r
- cardinality="0..N" />\r
-\r
- <!-- SERVICES -->\r
- <service ref="authenticationProvider"\r
- interface="org.springframework.security.providers.AuthenticationProvider"\r
- context-class-loader="service-provider" />\r
- <service ref="securityDao" interface="org.argeo.security.CurrentUserDao"\r
- context-class-loader="service-provider" />\r
- <service ref="securityDao" interface="org.argeo.security.UserAdminDao"\r
- context-class-loader="service-provider" />\r
- <service ref="userDetailsService"\r
- interface="org.springframework.security.userdetails.UserDetailsService"\r
- context-class-loader="service-provider" />\r
-\r
- <!-- Provides deserialization -->\r
- <service interface="org.argeo.server.json.JsonObjectFactory">\r
- <beans:bean class="org.argeo.server.json.JsonObjectFactoryImpl" />\r
- </service>\r
-\r
-</beans:beans>
\ No newline at end of file
+++ /dev/null
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:security="http://www.springframework.org/schema/security"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
-
-
- <bean
- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
- <property name="locations">
- <value>osgibundle:ldap.properties</value>
- </property>
- </bean>
-
- <bean id="passwordEncoder"
- class="org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder" />
-
- <bean id="contextSource"
- class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
- <constructor-arg
- value="${argeo.ldap.protocol}://${argeo.ldap.host}:${argeo.ldap.port}/${argeo.ldap.rootdn}" />
- <property name="userDn" value="${argeo.ldap.manager.userdn}" />
- <property name="password" value="${argeo.ldap.manager.password}" />
- </bean>
-
- <bean id="authenticationProvider"
- class="org.springframework.security.providers.ldap.LdapAuthenticationProvider">
- <constructor-arg ref="ldapAuthenticator" />
- <constructor-arg>
- <bean factory-bean="securityDao" factory-method="getAuthoritiesPopulator" />
- </constructor-arg>
- <property name="userDetailsContextMapper">
- <bean factory-bean="securityDao" factory-method="getUserDetailsMapper" />
- </property>
- </bean>
-
- <bean id="securityDao" class="org.argeo.security.ldap.ArgeoSecurityDaoLdap">
- <constructor-arg ref="contextSource" />
- <property name="userNatureMappers" ref="userNatureMappers" />
- <property name="passwordEncoder" ref="passwordEncoder" />
- </bean>
-
- <bean id="userDetailsService" factory-bean="securityDao"
- factory-method="getUserDetailsService">
- </bean>
-
- <bean id="ldapAuthenticator"
- class="org.springframework.security.providers.ldap.authenticator.PasswordComparisonAuthenticator">
- <constructor-arg ref="contextSource" />
- <property name="userDnPatterns">
- <list>
- <value>uid={0},ou=People</value>
- </list>
- </property>
- <property name="passwordEncoder">
- <bean
- class="org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder" />
- </property>
- </bean>
-</beans>
+++ /dev/null
-bin.includes = META-INF/
+++ /dev/null
-argeo.ldap.rootdn=dc=demo,dc=argeo,dc=org
-argeo.ldap.protocol=ldap
-argeo.ldap.host=localhost
-argeo.ldap.port=10389
-argeo.ldap.manager.userdn=uid=admin,ou=system
-argeo.ldap.manager.password=secret
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.argeo.security.manager.ldap</name>
+ <name>org.argeo.security.dao.ldap</name>
<comment></comment>
<projects>
</projects>
-Bundle-SymbolicName: org.argeo.security.manager.ldap
+Bundle-SymbolicName: org.argeo.security.dao.ldap
Bundle-Version: 0.2.3.SNAPSHOT
Import-Package: com.sun.jndi.ldap;resolution:=optional,
org.argeo.security,
org.argeo.security.ldap,
org.argeo.security.ldap.nature,
org.argeo.security.nature,
- org.argeo.server.json;resolution:=optional,
org.springframework.beans.factory.config,
org.springframework.ldap.core.support,
org.springframework.security,
org.springframework.security.ldap,
org.springframework.security.ldap.populator,
org.springframework.security.providers,
- org.springframework.security.providers.encoding;specification-version="2.0.6.RELEASE",
+ org.springframework.security.providers.encoding,
org.springframework.security.providers.ldap,
org.springframework.security.providers.ldap.authenticator,
org.springframework.security.userdetails,
<service ref="userDetailsService"\r
interface="org.springframework.security.userdetails.UserDetailsService"\r
context-class-loader="service-provider" />\r
-\r
- <!-- Provides deserialization -->\r
- <service interface="org.argeo.server.json.JsonObjectFactory">\r
- <beans:bean class="org.argeo.server.json.JsonObjectFactoryImpl" />\r
- </service>\r
-\r
</beans:beans>
\ No newline at end of file
<value>uid={0},ou=People</value>
</list>
</property>
- <property name="passwordEncoder">
- <bean
- class="org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder" />
- </property>
+ <property name="passwordEncoder" ref="passwordEncoder" />
</bean>
</beans>