Another buglet: fallback key for instances without a configured URL w…

…as by accident just 'key'.
jenkinsci · Apr 13, 2017 · 660058c · 660058c
1 parent 02d2405
commit 660058c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/core/src/main/java/hudson/cli/ClientAuthenticationCache.java b/core/src/main/java/hudson/cli/ClientAuthenticationCache.java
@@ -113,7 +113,7 @@ public Authentication get() {
     String getPropertyKey() {
         String url = Jenkins.getInstance().getRootUrl();
         if (url!=null)  return url;
-        return Secret.fromString("key").toString();
+        return Secret.fromString("key").getEncryptedValue();
     }
 
     /**

diff --git a/test/src/test/java/hudson/cli/ClientAuthenticationCacheTest.java b/test/src/test/java/hudson/cli/ClientAuthenticationCacheTest.java
@@ -34,6 +34,7 @@
 import java.util.Arrays;
 import java.util.List;
 import javax.annotation.CheckForNull;
+import jenkins.model.JenkinsLocationConfiguration;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.output.TeeOutputStream;
 import static org.hamcrest.Matchers.containsString;
@@ -102,6 +103,15 @@ public void overHttp() throws Exception {
         }
     }
 
+    @Test
+    public void getPropertyKey() throws Exception {
+        ClientAuthenticationCache cache = new ClientAuthenticationCache(null);
+        assertEquals(r.getURL().toString(), cache.getPropertyKey());
+        JenkinsLocationConfiguration.get().setUrl(null);
+        String key = cache.getPropertyKey();
+        assertTrue(key, Secret.decrypt(key) != null);
+    }
+
     private void assertCLI(int code, @CheckForNull String output, File jar, String... args) throws Exception {
         List<String> commands = Lists.newArrayList("java", "-jar", jar.getAbsolutePath(), "-s", r.getURL().toString(), "-noKeyAuth");
         commands.addAll(Arrays.asList(args));