Merge branch 'security-stable-2.7' into security-stable-2.19

core/src/test/java/hudson/console/AnnotatedLargeTextTest.java

@@ -1,125 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright 2016 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.console;
-
-import hudson.MarkupText;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.StringWriter;
-import jenkins.security.ConfidentialStoreRule;
-import org.apache.commons.io.Charsets;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-import org.junit.Test;
-import org.junit.Rule;
-import org.jvnet.hudson.test.For;
-import org.jvnet.hudson.test.Issue;
-import org.kohsuke.stapler.framework.io.ByteBuffer;
-
-@For({AnnotatedLargeText.class, ConsoleNote.class, ConsoleAnnotationOutputStream.class, PlainTextConsoleOutputStream.class})
-public class AnnotatedLargeTextTest {
-
-    @Rule
-    public ConfidentialStoreRule confidentialStoreRule = new ConfidentialStoreRule();
-
-    /* TODO in trunk:
-    @Rule
-    public LoggerRule logging = new LoggerRule().record(ConsoleAnnotationOutputStream.class, Level.FINE).capture(100);
-    */
-
-    @Test
-    public void smokes() throws Exception {
-        ByteBuffer buf = new ByteBuffer();
-        PrintStream ps = new PrintStream(buf, true);
-        ps.print("Some text.\n");
-        ps.print("Go back to " + TestNote.encodeTo("/root", "your home") + ".\n");
-        ps.print("More text.\n");
-        AnnotatedLargeText<Void> text = new AnnotatedLargeText<>(buf, Charsets.UTF_8, true, null);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        text.writeLogTo(0, baos);
-        assertEquals("Some text.\nGo back to your home.\nMore text.\n", baos.toString());
-        StringWriter w = new StringWriter();
-        text.writeHtmlTo(0, w);
-        assertEquals("Some text.\nGo back to <a href='/root'>your home</a>.\nMore text.\n", w.toString());
-    }
-
-    @Issue("SECURITY-382")
-    @Test
-    public void oldDeserialization() throws Exception {
-        ByteBuffer buf = new ByteBuffer();
-        buf.write(("hello" + ConsoleNote.PREAMBLE_STR + "AAAAwR+LCAAAAAAAAP9dzLEOwVAUxvHThtiNprYxsGiMQhiwNSIhMR/tSZXr3Lr3oJPwPt7FM5hM3gFh8i3/5Bt+1yeUrYH6ap9Yza1Ys9WKWuMiR05wqWhEgpmyEy306Jxvwb19ccGNoBJjLplmgWq0xgOGCjkNZ2IyTrsRlFayVTs4gVMYqP3pw28/JnznuABF/rYWyIyeJfLQe1vxZiDQ7NnYZLn0UZGRRjA9MiV+0OyFv3+utadQyH8B+aJxVM4AAAA=" + ConsoleNote.POSTAMBLE_STR + "there\n").getBytes());
-        AnnotatedLargeText<Void> text = new AnnotatedLargeText<>(buf, Charsets.UTF_8, true, null);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        text.writeLogTo(0, baos);
-        assertEquals("hellothere\n", baos.toString());
-        StringWriter w = new StringWriter();
-        text.writeHtmlTo(0, w);
-        assertEquals("hellothere\n", w.toString());
-        // TODO expect log record with message "Failed to resurrect annotation" and IOException with message "Refusing to deserialize unsigned note from an old log."
-        ConsoleNote.INSECURE = true;
-        try {
-            w = new StringWriter();
-            text.writeHtmlTo(0, w);
-            assertThat(w.toString(), containsString("<script>"));
-        } finally {
-            ConsoleNote.INSECURE = false;
-        }
-    }
-
-    @Issue("SECURITY-382")
-    @Test
-    public void badMac() throws Exception {
-        ByteBuffer buf = new ByteBuffer();
-        buf.write(("Go back to " + ConsoleNote.PREAMBLE_STR + "////4ByIhqPpAc43AbrEtyDUDc1/UEOXsoY6LeoHSeSlb1d7AAAAlR+LCAAAAAAAAP9b85aBtbiIQS+jNKU4P08vOT+vOD8nVc8xLy+/JLEkNcUnsSg9NSS1oiQktbhEBUT45ZekCpys9xWo8J3KxMDkycCWk5qXXpLhw8BcWpRTwiDkk5VYlqifk5iXrh9cUpSZl25dUcQghWaBM4QGGcYAAYxMDAwVBUAGZwkDq35Rfn4JABmN28qcAAAA" + ConsoleNote.POSTAMBLE_STR + "your home.\n").getBytes());
-        AnnotatedLargeText<Void> text = new AnnotatedLargeText<>(buf, Charsets.UTF_8, true, null);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        text.writeLogTo(0, baos);
-        assertEquals("Go back to your home.\n", baos.toString());
-        StringWriter w = new StringWriter();
-        text.writeHtmlTo(0, w);
-        assertEquals("Go back to your home.\n", w.toString());
-        // TODO expect log record with message "Failed to resurrect annotation" and IOException with message "MAC mismatch"
-    }
-
-    /** Simplified version of {@link HyperlinkNote}. */
-    static class TestNote extends ConsoleNote<Void> {
-        private final String url;
-        private final int length;
-        TestNote(String url, int length) {
-            this.url = url;
-            this.length = length;
-        }
-        @Override
-        public ConsoleAnnotator<?> annotate(Void context, MarkupText text, int charPos) {
-            text.addMarkup(charPos, charPos + length, "<a href='" + url + "'" + ">", "</a>");
-            return null;
-        }
-        static String encodeTo(String url, String text) throws IOException {
-            return new TestNote(url, text.length()).encode() + text;
-        }
-    }
-
-}

core/src/test/java/hudson/model/TaskActionTest.java

@@ -1,16 +1,13 @@
 package hudson.model;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayOutputStream;
 
 import hudson.console.AnnotatedLargeText;
 import hudson.security.ACL;
 import hudson.security.Permission;
-import jenkins.security.ConfidentialStoreRule;
 import org.acegisecurity.Authentication;
-import static org.hamcrest.CoreMatchers.startsWith;
-import org.junit.Rule;
 import org.junit.Test;
 
 /**
@@ -18,9 +15,6 @@ import org.junit.Test;
  */
 public class TaskActionTest {
 
-    @Rule
-    public ConfidentialStoreRule confidentialStoreRule = new ConfidentialStoreRule();
-
     private static class MyTaskThread extends TaskThread {
         MyTaskThread(TaskAction taskAction) {
             super(taskAction, ListenerAndText.forMemory(taskAction));
@@ -69,6 +63,6 @@ public class TaskActionTest {
         }
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         annotatedText.writeLogTo(0, os);
-        assertThat(os.toString("UTF-8"), startsWith("a linkCompleted"));
+        assertTrue(os.toString("UTF-8").startsWith("a linkCompleted"));
     }
 }

core/src/test/java/jenkins/security/ConfidentialStoreRule.java

@@ -14,13 +14,16 @@ public class ConfidentialStoreRule extends ExternalResource {
     @Override
     protected void before() throws Throwable {
         tmp.create();
-        ConfidentialStore.TEST = new DefaultConfidentialStore(tmp.getRoot());
+        ConfidentialStore.TEST.set(new DefaultConfidentialStore(tmp.getRoot()));
     }
 
     @Override
     protected void after() {
-        ConfidentialStore.TEST = null;
+        ConfidentialStore.TEST.set(null);
         tmp.delete();
     }
 
+    static {
+        ConfidentialStore.TEST = new ThreadLocal<ConfidentialStore>();
+    }
 }