Merge authors:
Lars Helge Øverland (larshelge)
revision-diff.txt (32.9 KB)
···
------------------------------------------------------------
revno: 20881 [merge]
committer: Lars Helge Overland <larshelge@gmail.com>
branch nick: dhis2
timestamp: Tue 2015-10-27 10:11:44 -0400
message:
Introduced LDAP authentication support. The flow: 1. user logs into dhis with a username / password. 2. username/password is matched/authenticated against dhis database. 3. if not successful, username is included in a pattern for the ldap DN (distinguished name) and a bind is attempted against LDAP server. 4. if authentication is successful, the username is used to look up a matching dhis user, from which we fetch the authorities / user roles. 5. If found, from now on, the combined ldap credentials and dhis authorities are assembled and used for the user session. Also introduced a DhisConfigurationProvider which loads properties from the dhis configuration file (can be reused for other purposes).
added:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/ldap/
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/ldap/authentication/
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/ldap/authentication/DhisBindAuthenticator.java
dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/
dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/ConfigurationKey.java
dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/ConfigurationPropertyFactoryBean.java
dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/DefaultDhisConfigurationProvider.java
dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/DhisConfigurationProvider.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/SecurityUtils.java
modified:
dhis-2/dhis-services/dhis-service-core/pom.xml
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUserDetailsService.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml
dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManager.java
dhis-2/dhis-support/dhis-support-external/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/ConnectionPropertyFactoryBean.java
dhis-2/dhis-support/dhis-support-system/pom.xml
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/DefaultAuthenticationSuccessHandler.java
dhis-2/pom.xml
--
lp:dhis2
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to OpenID transaction in progress