svn commit: r1784399 - in /manifoldcf/trunk: ./ connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/ connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/

[schuch]

Author: schuch
Date: Sat Feb 25 18:34:24 2017
New Revision: 1784399

URL: http://svn.apache.org/viewvc?rev=1784399&view=rev
Log:
Fix for CONNECTORS-1383

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/GenericAuthority.java
    
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1784399&r1=1784398&r2=1784399&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat Feb 25 18:34:24 2017
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 2.7-dev =====================
 
+CONNECTORS-1383: Fix Generic connector not to send the password
+to the client in plaintext
+(Markus Schuch)
+
 CONNECTORS-1384: Fix GridFS connector not to send the password
 to the client in plaintext and enabled password obfuscation
 (Markus Schuch)

Modified: 
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/GenericAuthority.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/GenericAuthority.java?rev=1784399&r1=1784398&r2=1784399&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/GenericAuthority.java
 (original)
+++ 
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/GenericAuthority.java
 Sat Feb 25 18:34:24 2017
@@ -372,7 +372,7 @@ public class GenericAuthority extends or
     String login = getParam(parameters, "genericLogin", "");
     String password = "";
     try {
-      password = ManifoldCF.deobfuscate(getParam(parameters, 
"genericPassword", ""));
+      password = 
out.mapPasswordToKey(ManifoldCF.deobfuscate(getParam(parameters, 
"genericPassword", "")));
     } catch (ManifoldCFException ignore) {
     }
     String conTimeout = getParam(parameters, "genericConnectionTimeout", 
"60000");
@@ -433,7 +433,7 @@ public class GenericAuthority extends or
     if (password == null) {
       password = "";
     }
-    parameters.setParameter("genericPassword", 
org.apache.manifoldcf.core.system.ManifoldCF.obfuscate(password));
+    parameters.setParameter("genericPassword", 
org.apache.manifoldcf.core.system.ManifoldCF.obfuscate(variableContext.mapKeyToPassword(password)));
     return null;
   }
 

Modified: 
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java?rev=1784399&r1=1784398&r2=1784399&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
 (original)
+++ 
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
 Sat Feb 25 18:34:24 2017
@@ -485,7 +485,7 @@ public class GenericConnector extends Ba
     String login = getParam(parameters, "genericLogin", "");
     String password = "";
     try {
-      password = ManifoldCF.deobfuscate(getParam(parameters, 
"genericPassword", ""));
+      password = 
out.mapPasswordToKey(ManifoldCF.deobfuscate(getParam(parameters, 
"genericPassword", "")));
     } catch (ManifoldCFException ignore) {
     }
     String conTimeout = getParam(parameters, "genericConnectionTimeout", 
"60000");
@@ -539,7 +539,7 @@ public class GenericConnector extends Ba
     if (password == null) {
       password = "";
     }
-    parameters.setParameter("genericPassword", ManifoldCF.obfuscate(password));
+    parameters.setParameter("genericPassword", 
ManifoldCF.obfuscate(variableContext.mapKeyToPassword(password)));
     return null;
   }