Convert AWS Secret Key to use Secret rather than String primitive type.

https://issues.jenkins-ci.org/browse/SECURITY-833
jenkinsci · May 17, 2018 · 4bef706 · 4bef706
1 parent 5e07b16
commit 4bef706
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java b/src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java
@@ -46,6 +46,7 @@
 import hudson.util.DirScanner;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
+import hudson.util.Secret;
 import jenkins.tasks.SimpleBuildStep;
 import net.sf.json.JSONObject;
 
@@ -101,7 +102,7 @@ public class AWSCodeDeployPublisher extends Publisher implements SimpleBuildStep
     private final int proxyPort;
 
     private final String awsAccessKey;
-    private final String awsSecretKey;
+    private final Secret awsSecretKey;
     private final String credentials;
     private final String deploymentMethod;
     private final String versionFileName;
@@ -125,7 +126,7 @@ public AWSCodeDeployPublisher(
             String versionFileName,
             String deploymentMethod,
             String awsAccessKey,
-            String awsSecretKey,
+            Secret awsSecretKey,
             String iamRoleArn,
             String externalId,
             String includes,
@@ -194,7 +195,7 @@ public void perform(@Nonnull Run<?,?> build, @Nonnull FilePath workspace, @Nonnu
 
         final AWSClients aws;
         if ("awsAccessKey".equals(credentials)) {
-            if (StringUtils.isEmpty(this.awsAccessKey) && StringUtils.isEmpty(this.awsSecretKey)) {
+            if (StringUtils.isEmpty(this.awsAccessKey) && StringUtils.isEmpty(Secret.toString(this.awsSecretKey))) {
                 aws = AWSClients.fromDefaultCredentialChain(
                         this.region,
                         this.proxyHost,
@@ -203,7 +204,7 @@ public void perform(@Nonnull Run<?,?> build, @Nonnull FilePath workspace, @Nonnu
                 aws = AWSClients.fromBasicCredentials(
                         this.region,
                         this.awsAccessKey,
-                        this.awsSecretKey,
+                        Secret.toString(this.awsSecretKey),
                         this.proxyHost,
                         this.proxyPort);
             }
@@ -504,7 +505,7 @@ public static final class DescriptorImpl extends BuildStepDescriptor<Publisher>
 
         private String externalId;
         private String awsAccessKey;
-        private String awsSecretKey;
+        private Secret awsSecretKey;
         private String proxyHost;
         private int proxyPort;
 
@@ -543,7 +544,7 @@ public String getDisplayName() {
         public boolean configure(StaplerRequest req, JSONObject formData) throws FormException {
 
             awsAccessKey = formData.getString("awsAccessKey");
-            awsSecretKey = formData.getString("awsSecretKey");
+            awsSecretKey = Secret.fromString(formData.getString("awsSecretKey"));
             proxyHost = formData.getString("proxyHost");
             proxyPort = Integer.parseInt(formData.getString("proxyPort"));
 
@@ -618,12 +619,12 @@ public ListBoxModel doFillRegionItems() {
 
         public String getAwsSecretKey()
         {
-            return awsSecretKey;
+            return Secret.toString(awsSecretKey);
         }
 
         public void setAwsSecretKey(String awsSecretKey)
         {
-            this.awsSecretKey = awsSecretKey;
+            this.awsSecretKey = Secret.fromString(awsSecretKey);
         }
 
         public String getAwsAccessKey()
@@ -671,7 +672,7 @@ public String getAwsAccessKey() {
     }
 
     public String getAwsSecretKey() {
-        return awsSecretKey;
+        return Secret.toString(awsSecretKey);
     }
 
     public Long getPollingFreqSec() {