[JENKINS-41653] malformed xml files are not included. Test validating…

… the issue.
jenkinsci · Oct 20, 2017 · c60bb65 · c60bb65
1 parent b33c145
commit c60bb65
Showing 1 changed file with 91 additions and 0 deletions.
diff --git a/src/test/java/com/cloudbees/jenkins/support/configfiles/SecretHandlerTest.java b/src/test/java/com/cloudbees/jenkins/support/configfiles/SecretHandlerTest.java
@@ -0,0 +1,91 @@
+package com.cloudbees.jenkins.support.configfiles;
+
+import com.cloudbees.plugins.credentials.SecretBytes;
+import hudson.util.Secret;
+import org.apache.commons.io.FileUtils;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.Issue;
+import org.jvnet.hudson.test.JenkinsRule;
+
+import java.io.File;
+
+import static org.junit.Assert.assertEquals;
+
+public class SecretHandlerTest {
+
+    @Rule
+    public JenkinsRule r = new JenkinsRule();
+
+    private String xml;
+
+    private final String expectedXml = "<com.cloudbees.plugins.credentials.SystemCredentialsProvider plugin=\"credentials@1.18\">\n" +
+            "    <domainCredentialsMap class=\"hudson.util.CopyOnWriteMap$Hash\">\n" +
+            "        <entry>\n" +
+            "            <com.cloudbees.plugins.credentials.domains.Domain>\n" +
+            "                <specifications/>\n" +
+            "            </com.cloudbees.plugins.credentials.domains.Domain>\n" +
+            "            <java.util.concurrent.CopyOnWriteArrayList>\n" +
+            "                <com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl>\n" +
+            "                    <scope>GLOBAL</scope>\n" +
+            "                    <id>f9ebaa5c-a7fc-46e4-93ab-453699781181</id>\n" +
+            "                    <description>Alice</description>\n" +
+            "                    <username/>\n" +
+            "                    <password>" + SecretHandler.SECRET_MARKER + "</password>\n" +
+            "                </com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl>\n" +
+            "                <com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl>\n" +
+            "                    <scope>GLOBAL</scope>\n" +
+            "                    <id>f9ebaa5c-a7fc-46e4-93ab-453699781182</id>\n" +
+            "                    <description>Bobby&#0x;</description>\n" +
+            "                    <username/>\n" +
+            "                    <password>" + SecretHandler.SECRET_MARKER + "</password>\n" +
+            "                </com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl>\n" +
+            "            </java.util.concurrent.CopyOnWriteArrayList>\n" +
+            "        </entry>\n" +
+            "    </domainCredentialsMap>\n" +
+            "</com.cloudbees.plugins.credentials.SystemCredentialsProvider>";
+
+    @Before
+    public void setup() {
+        Secret secret = Secret.fromString("this-is-a-secret");
+        SecretBytes secret2 = SecretBytes.fromBytes("this-is-another-type-of-secret".getBytes());
+        assertEquals("this-is-a-secret", secret.getPlainText());
+        assertEquals("this-is-another-type-of-secret", new String(secret2.getPlainData()));
+        String encrypted_secret = secret.getEncryptedValue();
+        String encrypted_secret2 = secret2.toString();
+        xml = "<com.cloudbees.plugins.credentials.SystemCredentialsProvider plugin=\"credentials@1.18\">\n" +
+                "    <domainCredentialsMap class=\"hudson.util.CopyOnWriteMap$Hash\">\n" +
+                "        <entry>\n" +
+                "            <com.cloudbees.plugins.credentials.domains.Domain>\n" +
+                "                <specifications/>\n" +
+                "            </com.cloudbees.plugins.credentials.domains.Domain>\n" +
+                "            <java.util.concurrent.CopyOnWriteArrayList>\n" +
+                "                <com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl>\n" +
+                "                    <scope>GLOBAL</scope>\n" +
+                "                    <id>f9ebaa5c-a7fc-46e4-93ab-453699781181</id>\n" +
+                "                    <description>Alice</description>\n" +
+                "                    <username/>\n" +
+                "                    <password>" + encrypted_secret + "</password>\n" +
+                "                </com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl>\n" +
+                "                <com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl>\n" +
+                "                    <scope>GLOBAL</scope>\n" +
+                "                    <id>f9ebaa5c-a7fc-46e4-93ab-453699781182</id>\n" +
+                "                    <description>Bobby&#0x;</description>\n" +
+                "                    <username/>\n" +
+                "                    <password>" + encrypted_secret2 + "</password>\n" +
+                "                </com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl>\n" +
+                "            </java.util.concurrent.CopyOnWriteArrayList>\n" +
+                "        </entry>\n" +
+                "    </domainCredentialsMap>\n" +
+                "</com.cloudbees.plugins.credentials.SystemCredentialsProvider>";
+    }
+
+    @Issue("JENKINS-41653")
+    @Test
+    public void shouldPutAPlaceHolderInsteadOfSecret() throws Exception {
+        File file = File.createTempFile("test", ".xml");
+        FileUtils.writeStringToFile(file, xml);
+        String patchedXml = SecretHandler.findSecrets(file);
+        assertEquals(expectedXml, patchedXml);
+    }}