Completed ESME-367: Make path used in container-based authentication (CMA) - dynamic
git-svn-id: https://svn.apache.org/repos/asf/esme/trunk@1180355 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/server/src/main/resources/props/default.props b/server/src/main/resources/props/default.props
index 21a841c..6c84346 100644
--- a/server/src/main/resources/props/default.props
+++ b/server/src/main/resources/props/default.props
@@ -57,4 +57,7 @@
;Allow access to application for following roles
-role_list=esme-users,monitoring-admin
\ No newline at end of file
+role.list=esme-users,monitoring-admin
+
+;Path to resource secured by container-managed authentication
+cma.path=cm/login
\ No newline at end of file
diff --git a/server/src/main/scala/org/apache/esme/model/UserAuth.scala b/server/src/main/scala/org/apache/esme/model/UserAuth.scala
index 84e69d7..cc9a320 100644
--- a/server/src/main/scala/org/apache/esme/model/UserAuth.scala
+++ b/server/src/main/scala/org/apache/esme/model/UserAuth.scala
@@ -287,7 +287,7 @@
object myLdapVendor extends LDAPVendor
- val rolesToCheck = Props.get("role_list") match {
+ val rolesToCheck = Props.get("role.list") match {
case Full(s) => s.split(',').toList
case _ => Nil
}
@@ -375,10 +375,15 @@
def moduleName: String = "cm"
+ val cmaPath = Props.get("cma.path") match {
+ case Full(s) => s.split('/').toList
+ case _ => List("cm", "login")
+ }
+
def performInit(): Unit = {
LiftRules.dispatch.append {
- case Req("cm" :: "login" :: Nil, _, _) => {
+ case Req(`cmaPath`, _, _) => {
val from = "/"
S.request match {
