You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by le...@apache.org on 2011/04/15 08:10:58 UTC
svn commit: r1092597 - in /esme/trunk/server/src/main:
resources/ESMELdap.properties resources/props/default.props
scala/bootstrap/liftweb/Boot.scala scala/org/apache/esme/model/UserAuth.scala
Author: lester
Date: Fri Apr 15 06:10:57 2011
New Revision: 1092597
URL: http://svn.apache.org/viewvc?rev=1092597&view=rev
Log:
Moved LDAP-specific settings from resource bundle to property file
Removed:
esme/trunk/server/src/main/resources/ESMELdap.properties
Modified:
esme/trunk/server/src/main/resources/props/default.props
esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala
Modified: esme/trunk/server/src/main/resources/props/default.props
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/resources/props/default.props?rev=1092597&r1=1092596&r2=1092597&view=diff
==============================================================================
--- esme/trunk/server/src/main/resources/props/default.props (original)
+++ esme/trunk/server/src/main/resources/props/default.props Fri Apr 15 06:10:57 2011
@@ -27,3 +27,28 @@ admin_http_port=8087
esme.enable_tracks=true
esme.enable_actions=true
esme.enable_tokens=true
+
+;Enable LDAP
+ldap.enabled=false
+
+;Hostname or IP of LDAP server
+ldap.server.host=localhost
+;Port of LDAP server
+ldap.server.port=389
+;Base DN from the LDAP Server
+ldap.server.base=ou=esme,dc=somedomain,dc=org
+;User that has access to LDAP server to perform search operations
+ldap.server.userName=cn=Directory Manager
+;Password for user above
+ldap.server.password=********
+;Authentication type
+ldap.server.authType=simple
+;Referral
+ldap.server.referral=follow
+;Initial context factory class
+ldap.server.initial_context_factory=com.sun.jndi.ldap.LdapCtxFactory
+
+;Prefix for user to whom additional LDAP attributes belong, for example 'uid' or 'sAMAccountName'
+ldap.uidPrefix=uid
+;User base DN for user to whom additional LDAP attributes belong
+ldap.userBase=ou=esme,dc=somedomain,dc=org
\ No newline at end of file
Modified: esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=1092597&r1=1092596&r2=1092597&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Fri Apr 15 06:10:57 2011
@@ -132,7 +132,7 @@ class Boot extends Loggable {
LiftRules.dispatch.append(ESMEOpenIDVendor.dispatchPF)
//Resources for Internationalization
- LiftRules.resourceNames = "ESMELdap" :: "ESMECustom" :: "ESMEBase" :: "ESMEUI" :: Nil
+ LiftRules.resourceNames = "ESMECustom" :: "ESMEBase" :: "ESMEUI" :: Nil
//Jquery functions
Modified: esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala?rev=1092597&r1=1092596&r2=1092597&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala Fri Apr 15 06:10:57 2011
@@ -280,21 +280,21 @@ object ContainerManagedAuthModule extend
object myLdapVendor extends LDAPVendor
def myLdap : LDAPVendor = {
- val ldapSrvHost = S.?("ldap.server.host")
+ val ldapSrvHost = Props.get("ldap.server.host") openOr ""
info("LDAP server host: %s".format(ldapSrvHost))
- val ldapSrvPort = S.?("ldap.server.port")
+ val ldapSrvPort = Props.get("ldap.server.port") openOr ""
info("LDAP server port: %s".format(ldapSrvPort))
- val ldapSrvBase = S.?("ldap.server.base")
+ val ldapSrvBase = Props.get("ldap.server.base") openOr ""
info("LDAP server base: %s".format(ldapSrvBase))
- val ldapSrvUsrName = S.?("ldap.server.userName")
+ val ldapSrvUsrName = Props.get("ldap.server.userName") openOr ""
info("LDAP server username: %s".format(ldapSrvUsrName))
- val ldapSrvPwd = S.?("ldap.server.password")
+ val ldapSrvPwd = Props.get("ldap.server.password") openOr ""
info("LDAP server password: %s".format(ldapSrvPwd))
- val ldapSrvAuthType = S.?("ldap.server.authType")
+ val ldapSrvAuthType = Props.get("ldap.server.authType") openOr ""
info("LDAP server authentication type: %s".format(ldapSrvAuthType))
- val ldapSrvReferral= S.?("ldap.server.referral")
+ val ldapSrvReferral= Props.get("ldap.server.referral") openOr ""
info("LDAP server referral: %s".format(ldapSrvReferral))
- val ldapSrvCtxFactory = S.?("ldap.server.initial_context_factory")
+ val ldapSrvCtxFactory = Props.get("ldap.server.initial_context_factory") openOr ""
info("LDAP server initial context factory class: %s".format(ldapSrvCtxFactory))
@@ -309,9 +309,9 @@ object ContainerManagedAuthModule extend
}
def getAttrs(who : String) : Map[String, List[String]] = {
- val uidPrefix = S.?("ldap.uidPrefix")
+ val uidPrefix = Props.get("ldap.uidPrefix") openOr ""
info("LDAP uid prefix: %s".format(uidPrefix))
- val userBase = S.?("ldap.userBase")
+ val userBase = Props.get("ldap.userBase") openOr ""
info("LDAP user base: %s".format(userBase))
var attrsMap = Map.empty[String, List[String]]
@@ -381,8 +381,8 @@ object ContainerManagedAuthModule extend
case _ => {
val usr = User.createAndPopulate.nickname(username).saveMe
//find and save additional attributes in LDAP if it's enabled
- val ldapEnabled = S.?("ldap.enabled")
- if(ldapEnabled.toBoolean) {
+ val ldapEnabled = Props.getBool("ldap.enabled") openOr false
+ if(ldapEnabled) {
val ldapAttrs = getAttrs(username)
val firstName = ldapAttrs("givenName").head
val lastName = ldapAttrs("sn").head