svn commit: r1503212 - in /manifoldcf/branches/CONNECTORS-737/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio: MeridioAuthority.java MeridioConnector.java

[kwright]

Author: kwright
Date: Mon Jul 15 12:52:37 2013
New Revision: 1503212

URL: http://svn.apache.org/r1503212
Log:
Make meridio passwords be ui-secure.

Modified:
    
manifoldcf/branches/CONNECTORS-737/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
    
manifoldcf/branches/CONNECTORS-737/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java

Modified: 
manifoldcf/branches/CONNECTORS-737/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-737/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java?rev=1503212&r1=1503211&r2=1503212&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-737/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-737/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
 Mon Jul 15 12:52:37 2013
@@ -937,6 +937,8 @@ public class MeridioAuthority extends or
     String password = parameters.getObfuscatedParameter("Password");
     if (password == null)
       password = "";
+    else
+      password = out.mapPasswordToKey(password);
 
     String meridioKeystore = parameters.getParameter("MeridioKeystore");
     IKeystoreManager localKeystore;
@@ -1280,7 +1282,7 @@ public class MeridioAuthority extends or
 
     String password = variableContext.getParameter("password");
     if (password != null)
-      parameters.setObfuscatedParameter("Password",password);
+      
parameters.setObfuscatedParameter("Password",variableContext.mapKeyToPassword(password));
 
     String configOp = variableContext.getParameter("configop");
     if (configOp != null)

Modified: 
manifoldcf/branches/CONNECTORS-737/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-737/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java?rev=1503212&r1=1503211&r2=1503212&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-737/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-737/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
 Mon Jul 15 12:52:37 2013
@@ -1690,6 +1690,8 @@ public class MeridioConnector extends or
     String password = parameters.getObfuscatedParameter("Password");
     if (password == null)
       password = "";
+    else
+      password = out.mapPasswordToKey(password);
 
     String webClientProtocol = 
parameters.getParameter("MeridioWebClientProtocol");
     if (webClientProtocol == null)
@@ -2007,7 +2009,7 @@ public class MeridioConnector extends or
 
     String password = variableContext.getParameter("password");
     if (password != null)
-      parameters.setObfuscatedParameter("Password",password);
+      
parameters.setObfuscatedParameter("Password",variableContext.mapKeyToPassword(password));
 
     String webClientProtocol = 
variableContext.getParameter("webClientProtocol");
     if (webClientProtocol != null)