[prev in list] [next in list] [prev in thread] [next in thread] 

List:       juddi-cvs
Subject:    svn commit: r1167182 - in /juddi/trunk/juddi-console/uddi-portlets: pom.xml
From:       kstam () apache ! org
Date:       2011-09-09 14:05:19
Message-ID: 20110909140519.8339E2388A64 () eris ! apache ! org
[Download RAW message or body]

Author: kstam
Date: Fri Sep  9 14:05:18 2011
New Revision: 1167182

URL: http://svn.apache.org/viewvc?rev=1167182&view=rev
Log:
JUDDI-518 - make juddi console work with XMLDocAuthenticator

Added:
    juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/CatalinaUser.java
 Modified:
    juddi/trunk/juddi-console/uddi-portlets/pom.xml
    juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java


Modified: juddi/trunk/juddi-console/uddi-portlets/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/pom.xml?rev=1167182&r1=1167181&r2=1167182&view=diff
 ==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/pom.xml (original)
+++ juddi/trunk/juddi-console/uddi-portlets/pom.xml Fri Sep  9 14:05:18 2011
@@ -103,6 +103,12 @@
 		
 		
 		
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>catalina</artifactId>
+			<version>6.0.33</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 	<build>
 	 <!-- Generate compiled stuff in the folder used for developing mode -->

Added: juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/CatalinaUser.java
                
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/jav \
a/org/apache/juddi/portlets/server/service/CatalinaUser.java?rev=1167182&view=auto \
                ==============================================================================
                
--- juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/CatalinaUser.java \
                (added)
+++ juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/CatalinaUser.java \
Fri Sep  9 14:05:18 2011 @@ -0,0 +1,13 @@
+package org.apache.juddi.portlets.server.service;
+
+import java.security.Principal;
+
+import org.apache.catalina.User;
+
+public class CatalinaUser {
+
+	public String getPassword(Principal user) {
+		User catalineUser = (User) user;
+		return catalineUser.getPassword();
+	}
+}

Modified: juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java
                
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/jav \
a/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java?rev=1167182&r1=1167181&r2=1167182&view=diff
 ==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java \
                (original)
+++ juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java \
Fri Sep  9 14:05:18 2011 @@ -30,6 +30,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.portlets.client.service.SecurityResponse;
 import org.apache.juddi.portlets.client.service.SecurityService;
+import org.apache.juddi.v3.client.ClassUtil;
 import org.apache.juddi.v3.client.config.UDDIClerk;
 import org.apache.juddi.v3.client.config.UDDIClerkManager;
 import org.apache.juddi.v3.client.config.WebHelper;
@@ -70,6 +71,15 @@ public class SecurityServiceImpl extends
 		if (username==null && user!=null) {
 			username = user.getName();
 			password = "";
+			try {
+				//if we can find this class we get obtain the password from the Tomcat User.
+				ClassUtil.forName("org.apache.catalina.User", this.getClass());
+				password = new CatalinaUser().getPassword(user);
+			} catch ( ClassNotFoundException cnfe) {
+				logger.warn("The class org.apache.cataline.User was not found. You may" +
+						" need a SSO solution take care of authentication, or fall back" +
+						" to JUDDIAuthentication.");
+			}
 		} 
 		if (token==null) {
 			if (username==null) {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]