JENKINS-28344 Converting the persistence of the Chef keys from using …

…Scramble to using Secret. And in a reverse compatible way too.
jenkinsci · May 11, 2015 · 50bd169 · 50bd169
1 parent 8032db6
commit 50bd169
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/src/main/java/io/chef/jenkins/ChefIdentity.java b/src/main/java/io/chef/jenkins/ChefIdentity.java
@@ -23,6 +23,7 @@
 package io.chef.jenkins;
 
 import hudson.util.Scrambler;
+import hudson.util.Secret;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import java.io.Serializable;
@@ -38,31 +39,42 @@ public class ChefIdentity implements Serializable {
 	private static final Logger log = Logger.getLogger(ChefIdentity.class.getName());
 
 	private final String idName;
-	private final String pemKey;
-	private final String knifeRb;
+	private Secret pemKey;
+	private Secret knifeRb;
+	private final boolean convertedSecret;
 
 	public ChefIdentity() {
 		this.idName = null;
 		this.pemKey = null;
 		this.knifeRb = null;
+		this.convertedSecret = false;
 	}
 
 	@DataBoundConstructor
 	public ChefIdentity(String idName, String pemKey, String knifeRb) {
 		this.idName = idName;
-		this.pemKey = Scrambler.scramble(pemKey);
-		this.knifeRb = Scrambler.scramble(knifeRb);
+		if (this.pemKey == null) this.pemKey = Secret.fromString(pemKey);
+		if (this.knifeRb == null) this.knifeRb = Secret.fromString(knifeRb);
+		this.convertedSecret = true;
 	}
 
 	public String getIdName() {
 		return idName;
 	}
 
 	public String getPemKey() {
-		return Scrambler.descramble(pemKey);
+		if (convertedSecret) {
+			return Secret.toString(pemKey);
+		} else {
+			return Scrambler.descramble(pemKey.getPlainText());
+		}
 	}
 
 	public String getKnifeRb() {
-		return Scrambler.descramble(knifeRb);
+		if (convertedSecret) {
+			return Secret.toString(knifeRb);
+		} else {
+			return Scrambler.descramble(knifeRb.getPlainText());
+		}
 	}
 }