You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2016/10/21 20:59:54 UTC
svn commit: r1766127 - in
/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws:
server/DuccHandlerUserAuthentication.java utils/commands/CmdId.java
Author: degenaro
Date: Fri Oct 21 20:59:54 2016
New Revision: 1766127
URL: http://svn.apache.org/viewvc?rev=1766127&view=rev
Log:
UIMA-5114 DUCC WebServer (WS) needs better user validation for login
- CmdId.runnit() does not include userid on the command line
- DuccHandlerUserAuthentication.handleDuccServletLogin() does not separate userid@domain soon enough
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/commands/CmdId.java
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java?rev=1766127&r1=1766126&r2=1766127&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java Fri Oct 21 20:59:54 2016
@@ -151,6 +151,14 @@ public class DuccHandlerUserAuthenticati
duccLogger.trace(methodName, jobid, messages.fetch("enter"));
StringBuffer sb = new StringBuffer();
String userId = request.getParameter("userid");
+ String domain = null;
+ if(userId != null) {
+ if(userId.contains("@")) {
+ String[] parts = userId.split("@",2);
+ userId = parts[0];
+ domain = parts[1];
+ }
+ }
String password = request.getParameter("password");
try {
Properties properties = DuccWebProperties.get();
@@ -188,14 +196,6 @@ public class DuccHandlerUserAuthenticati
else {
Role role = Role.User;
duccLogger.debug(methodName, jobid, messages.fetch("role ")+role);
- String domain = null;
- if(userId != null) {
- if(userId.contains("@")) {
- String[] parts = userId.split("@",2);
- userId = parts[0];
- domain = parts[1];
- }
- }
duccLogger.info(methodName, jobid, messages.fetch("userId ")+userId+" "+messages.fetch("domain ")+domain);
duccLogger.debug(methodName, jobid, messages.fetchLabel("version")+duccAuthenticator.getVersion());
IAuthenticationResult result1 = duccAuthenticator.isAuthenticate(userId, domain, password);
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/commands/CmdId.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/commands/CmdId.java?rev=1766127&r1=1766126&r2=1766127&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/commands/CmdId.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/commands/CmdId.java Fri Oct 21 20:59:54 2016
@@ -70,6 +70,7 @@ public class CmdId {
try {
List<String> commandList = new ArrayList<String>();
commandList.add(command);
+ commandList.add(args[0]);
String[] commandArray = commandList.toArray(new String[0]);
ProcessBuilder pb = new ProcessBuilder( commandArray );
Process p = pb.start();