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

[schuch]

Author: schuch
Date: Sat Feb 25 21:11:34 2017
New Revision: 1784405

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

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/amazons3/AmazonS3Authority.java
    
manifoldcf/trunk/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/amazons3/AmazonS3Connector.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1784405&r1=1784404&r2=1784405&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat Feb 25 21:11:34 2017
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 2.7-dev =====================
 
+CONNECTORS-1387: Fix Amazon S3 connector not storing secret key
+and proxy credentials properly
+(Markus Schuch)
+
 CONNECTORS-1383: Fix Generic connector not to send the password
 to the client in plaintext
 (Markus Schuch)

Modified: 
manifoldcf/trunk/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/amazons3/AmazonS3Authority.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/amazons3/AmazonS3Authority.java?rev=1784405&r1=1784404&r2=1784405&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/amazons3/AmazonS3Authority.java
 (original)
+++ 
manifoldcf/trunk/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/amazons3/AmazonS3Authority.java
 Sat Feb 25 21:11:34 2017
@@ -195,7 +195,7 @@ public class AmazonS3Authority extends o
     String amazons3AccessKey = parameters
         .getParameter(AmazonS3Config.AWS_ACCESS_KEY);
     String amazons3SecretKey = parameters
-        .getParameter(AmazonS3Config.AWS_SECRET_KEY);
+        .getObfuscatedParameter(AmazonS3Config.AWS_SECRET_KEY);
 
     // default values
     if (amazons3AccessKey == null)
@@ -338,7 +338,7 @@ public class AmazonS3Authority extends o
     if (awsSecretKey != null) {
       // set as obfuscated parameter
       parameters.setObfuscatedParameter(AmazonS3Config.AWS_SECRET_KEY,
-          awsSecretKey);
+          variableContext.mapKeyToPassword(awsSecretKey));
     }
     Logging.authorityConnectors.info("Saved values for aws keys");
 
@@ -382,8 +382,8 @@ public class AmazonS3Authority extends o
     if (amazons3ProxyPassword != null) {
       // set as obfuscated parameter
       parameters.setObfuscatedParameter(
-          AmazonS3Config.AMAZONS3_PROXY_USERNAME,
-          amazons3ProxyUserName);
+          AmazonS3Config.AMAZONS3_PROXY_PASSWORD,
+          variableContext.mapKeyToPassword(amazons3ProxyPassword));
     }
 
     return null;

Modified: 
manifoldcf/trunk/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/amazons3/AmazonS3Connector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/amazons3/AmazonS3Connector.java?rev=1784405&r1=1784404&r2=1784405&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/amazons3/AmazonS3Connector.java
 (original)
+++ 
manifoldcf/trunk/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/amazons3/AmazonS3Connector.java
 Sat Feb 25 21:11:34 2017
@@ -265,7 +265,7 @@ public class AmazonS3Connector extends B
     String amazons3AccessKey = parameters
         .getParameter(AmazonS3Config.AWS_ACCESS_KEY);
     String amazons3SecretKey = parameters
-        .getParameter(AmazonS3Config.AWS_SECRET_KEY);
+        .getObfuscatedParameter(AmazonS3Config.AWS_SECRET_KEY);
 
     // default values
     if (amazons3AccessKey == null)
@@ -415,7 +415,7 @@ public class AmazonS3Connector extends B
     if (awsSecretKey != null) {
       // set as obfuscated parameter
       parameters.setObfuscatedParameter(AmazonS3Config.AWS_SECRET_KEY,
-          awsSecretKey);
+          variableContext.mapKeyToPassword(awsSecretKey));
     }
 
     // proxy tab
@@ -448,8 +448,8 @@ public class AmazonS3Connector extends B
     if (amazons3ProxyPassword != null) {
       // set as obfuscated parameter
       parameters.setObfuscatedParameter(
-          AmazonS3Config.AMAZONS3_PROXY_USERNAME,
-          amazons3ProxyUserName);
+          AmazonS3Config.AMAZONS3_PROXY_PASSWORD,
+          variableContext.mapKeyToPassword(amazons3ProxyPassword));
     }
 
     return null;