jdk-sandbox: comparison jdk/test/sun/security/tools/jarsigner/TimestampCheck.java

equal deleted inserted replaced

-:4fe905a2d72f
+:efd0203db371
 /*
-* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 static final String TSKS = "tsks";
 static final String JAR = "old.jar";
 static final String defaultPolicyId = "2.3.4.5";
-static class Handler implements HttpHandler {
+static class Handler implements HttpHandler, AutoCloseable {
+private final HttpServer httpServer;
+private final String keystore;
+@Override
 public void handle(HttpExchange t) throws IOException {
 int len = 0;
 for (String h: t.getRequestHeaders().keySet()) {
 if (h.equalsIgnoreCase("Content-length")) {
 len = Integer.valueOf(t.getRequestHeaders().get(h).get(0));
 }
 // Write TSResponse
 System.err.println("\nResponse\n===================");
 KeyStore ks = KeyStore.getInstance("JKS");
-ks.load(new FileInputStream(TSKS), "changeit".toCharArray());
+try (FileInputStream fis = new FileInputStream(keystore)) {
+ks.load(fis, "changeit".toCharArray());
+}
 String alias = "ts";
 if (path == 6) alias = "tsbad1";
 if (path == 7) alias = "tsbad2";
 if (path == 8) alias = "tsbad3";
 DerOutputStream out = new DerOutputStream();
 out.write(DerValue.tag_Sequence, response);
 return out.toByteArray();
 }
+private Handler(HttpServer httpServer, String keystore) {
+this.httpServer = httpServer;
+this.keystore = keystore;
+}
+/**
+* Initialize TSA instance.
+*
+* Extended Key Info extension of certificate that is used for
+* signing TSA responses should contain timeStamping value.
+*/
+static Handler init(int port, String keystore) throws IOException {
+HttpServer httpServer = HttpServer.create(
+new InetSocketAddress(port), 0);
+Handler tsa = new Handler(httpServer, keystore);
+httpServer.createContext("/", tsa);
+return tsa;
+}
+/**
+* Start TSA service.
+*/
+void start() {
+httpServer.start();
+}
+/**
+* Stop TSA service.
+*/
+void stop() {
+httpServer.stop(0);
+}
+/**
+* Return server port number.
+*/
+int getPort() {
+return httpServer.getAddress().getPort();
+}
+@Override
+public void close() throws Exception {
+stop();
+}
 }
 public static void main(String[] args) throws Exception {
+try (Handler tsa = Handler.init(0, TSKS);) {
-Handler h = new Handler();
+tsa.start();
-HttpServer server = HttpServer.create(new InetSocketAddress(0), 0);
+int port = tsa.getPort();
-int port = server.getAddress().getPort();
-HttpContext ctx = server.createContext("/", h);
+String cmd;
-server.start();
+// Use -J-Djava.security.egd=file:/dev/./urandom to speed up
+// nonce generation in timestamping request. Not avaibale on
-String cmd = null;
+// Windows and defaults to thread seed generator, not too bad.
-// Use -J-Djava.security.egd=file:/dev/./urandom to speed up
+if (System.getProperty("java.home").endsWith("jre")) {
-// nonce generation in timestamping request. Not avaibale on
+cmd = System.getProperty("java.home") + "/../bin/jarsigner";
-// Windows and defaults to thread seed generator, not too bad.
+} else {
-if (System.getProperty("java.home").endsWith("jre")) {
+cmd = System.getProperty("java.home") + "/bin/jarsigner";
-cmd = System.getProperty("java.home") + "/../bin/jarsigner";
+}
-} else {
-cmd = System.getProperty("java.home") + "/bin/jarsigner";
+cmd += System.getProperty("test.tool.vm.opts")
-}
++ " -J-Djava.security.egd=file:/dev/./urandom"
++ " -debug -keystore " + TSKS + " -storepass changeit"
-cmd +=  " " + System.getProperty("test.tool.vm.opts") +
++ " -tsa http://localhost:" + port + "/%d"
-" -J-Djava.security.egd=file:/dev/./urandom" +
++ " -signedjar new_%d.jar " + JAR + " old";
-" -debug -keystore " + TSKS + " -storepass changeit" +
-" -tsa http://localhost:" + port + "/%d" +
-" -signedjar new_%d.jar " + JAR + " old";
-try {
 if (args.length == 0) {         // Run this test
 jarsigner(cmd, 0, true);    // Success, normal call
 jarsigner(cmd, 1, false);   // These 4 should fail
 jarsigner(cmd, 2, false);
 jarsigner(cmd, 3, false);
 checkTimestamp("new_12.jar", defaultPolicyId, "SHA-1");
 } else {                        // Run as a standalone server
 System.err.println("Press Enter to quit server");
 System.in.read();
 }
-} finally {
-server.stop(0);
 }
 }
 static void checkTimestamp(String file, String policyId, String digestAlg)
 throws Exception {

changeset 28662	efd0203db371
parent 24116	9f9b4ba34aad
child 28664	2f79ecb05ada