Merge commit '790068c8486cdd4741336f9d61de72a9a6537a30' into security-master

core/src/test/java/hudson/model/queue/AbstractQueueTaskTest.java

@@ -0,0 +1,83 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2017 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package hudson.model.queue;
+
+import hudson.model.Queue;
+import java.io.IOException;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.jvnet.hudson.test.Issue;
+
+@SuppressWarnings("deprecation")
+public class AbstractQueueTaskTest {
+
+    @Issue("JENKINS-47517")
+    @Test
+    public void causeOfBlockageOverrides() {
+        Queue.Task t = new LegacyTask();
+        assertFalse(t.isBuildBlocked());
+        assertNull(t.getWhyBlocked());
+        assertNull(t.getCauseOfBlockage());
+    }
+    static class LegacyTask extends AbstractQueueTask {
+        @Override
+        public boolean isBuildBlocked() {
+            return getCauseOfBlockage() != null;
+        }
+        @Override
+        public String getWhyBlocked() {
+            CauseOfBlockage causeOfBlockage = getCauseOfBlockage();
+            return causeOfBlockage != null ? causeOfBlockage.getShortDescription() : null;
+        }
+        @Override
+        public String getName() {
+            return null;
+        }
+        @Override
+        public String getFullDisplayName() {
+            return null;
+        }
+        @Override
+        public void checkAbortPermission() {
+        }
+        @Override
+        public boolean hasAbortPermission() {
+            return false;
+        }
+        @Override
+        public String getUrl() {
+            return null;
+        }
+        @Override
+        public String getDisplayName() {
+            return null;
+        }
+        @Override
+        public Queue.Executable createExecutable() throws IOException {
+            throw new IOException();
+        }
+    }
+
+}

core/src/test/java/hudson/util/SecretUtilTest.java

@@ -0,0 +1,65 @@
+package hudson.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.jvnet.hudson.test.Issue;
+
+public class SecretUtilTest {
+
+    @Issue("JENKINS-47500")
+    @Test
+    public void decrypt() throws Exception {
+        String data = "{}";
+
+        try {
+            Secret secret = Secret.decrypt(data);
+            Assert.assertNull(secret);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            Assert.fail(data + " shouldn't throw an ArrayIndexOutOfBoundsException but returning null");
+        }
+
+    }
+
+
+    @Issue("JENKINS-47500")
+    @Test
+    public void decryptJustSpace() throws Exception {
+        String data = " ";
+
+        try {
+            Secret secret = Secret.decrypt(data);
+            Assert.assertNull(secret);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            Assert.fail(data + " shouldn't throw an ArrayIndexOutOfBoundsException but returning null");
+        }
+
+    }
+
+    @Issue("JENKINS-47500")
+    @Test
+    public void decryptWithSpace() throws Exception {
+        String data = "{ }";
+
+        try {
+            Secret secret = Secret.decrypt(data);
+            Assert.assertNull(secret);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            Assert.fail(data + " shouldn't throw an ArrayIndexOutOfBoundsException but returning null");
+        }
+
+    }
+
+    @Issue("JENKINS-47500")
+    @Test
+    public void decryptWithSpaces() throws Exception {
+        String data = "{     }";
+
+        try {
+            Secret secret = Secret.decrypt(data);
+            Assert.assertNull(secret);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            Assert.fail(data + " shouldn't throw an ArrayIndexOutOfBoundsException but returning null");
+        }
+
+    }
+}