Check a CT submission happens during integration tests

rolandshoemaker · rolandshoemaker · commit 9287d7ecd809 · 2015-09-28T16:17:41.000-07:00
diff --git a/test/amqp-integration-test.py b/test/amqp-integration-test.py
@@ -7,12 +7,13 @@
 import subprocess
 import sys
 import tempfile
+import urllib2
 
 import startservers
 
 
 class ExitStatus:
-    OK, PythonFailure, NodeFailure, Error, OCSPFailure = range(5)
+    OK, PythonFailure, NodeFailure, Error, OCSPFailure, CTFailure = range(6)
 
 
 class ProcInfo:
@@ -62,6 +63,13 @@ def verify_ocsp_revoked(certFile, url):
         die(ExitStatus.OCSPFailure)
     pass
 
+def verify_ct_submission(expectedSubmissions, url):
+    resp = urllib2.urlopen(url)
+    submissionStr = resp.read()
+    if int(submissionStr) != expectedSubmissions:
+        print "Expected %d submissions, found %d" % (expectedSubmissions, int(submissionStr))
+        die(ExitStatus.CTFailure)
+
 def run_node_test():
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     try:
@@ -91,6 +99,7 @@ def run_node_test():
     # Also verify that the static OCSP responder, which answers with a
     # pre-signed, long-lived response for the CA cert, also works.
     verify_ocsp_good("../test-ca.der", issuer_ocsp_url)
+    verify_ct_submission(1, "http://localhost:4500/submissions")
 
     if subprocess.Popen('''
         node revoke.js %s %s http://localhost:4000/acme/revoke-cert
diff --git a/test/ct-test-srv/main.go b/test/ct-test-srv/main.go
@@ -10,47 +10,70 @@ package main
 
 import (
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"log"
 	"net/http"
+	"sync/atomic"
 )
 
 type ctSubmissionRequest struct {
 	Chain []string `json:"chain"`
 }
 
-func handler(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "POST" || r.URL.Path != "/ct/v1/add-chain" {
+type integrationSrv struct {
+	submissions int64
+}
+
+func (is *integrationSrv) handler(w http.ResponseWriter, r *http.Request) {
+	switch r.URL.Path {
+	case "/ct/v1/add-chain":
+		if r.Method != "POST" {
+			http.NotFound(w, r)
+			return
+		}
+		bodyBytes, err := ioutil.ReadAll(r.Body)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusBadRequest)
+		}
+
+		var addChainReq ctSubmissionRequest
+		err = json.Unmarshal(bodyBytes, &addChainReq)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusBadRequest)
+		}
+
+		w.WriteHeader(http.StatusOK)
+		// id is a sha256 of a random EC key. Generate your own with:
+		// openssl ecparam -name prime256v1 -genkey -outform der | openssl sha256 -binary | base64
+		w.Write([]byte(`{
+			"sct_version": 0,
+			"id": "8fjM8cvLPOhzCFwI62IYJhjkOcvWFLx1dMJbs0uhxJU=",
+			"timestamp": 1442400000,
+			"extensions": "",
+			"signature": "BAMARzBFAiBB5wKED8KqKhADT37n0y28fZIPiGbCfZRVKq0wNo0hrwIhAOIa2tPBF/rB1y30Y/ROh4LBmJ0mItAbTWy8XZKh7Wcp"
+		}`))
+		atomic.AddInt64(&is.submissions, 1)
+	case "/submissions":
+		if r.Method != "GET" {
+			http.NotFound(w, r)
+			return
+		}
+
+		submissions := atomic.LoadInt64(&is.submissions)
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(fmt.Sprintf("%d", submissions)))
+	default:
 		http.NotFound(w, r)
 		return
 	}
-	bodyBytes, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-	}
-
-	var addChainReq ctSubmissionRequest
-	err = json.Unmarshal(bodyBytes, &addChainReq)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-	}
-
-	w.WriteHeader(http.StatusOK)
-	// id is a sha256 of a random EC key. Generate your own with:
-	// openssl ecparam -name prime256v1 -genkey -outform der | openssl sha256 -binary | base64
-	w.Write([]byte(`{
-		"sct_version": 0,
-		"id": "8fjM8cvLPOhzCFwI62IYJhjkOcvWFLx1dMJbs0uhxJU=",
-		"timestamp": 1442400000,
-		"extensions": "",
-		"signature": "BAMARzBFAiBB5wKED8KqKhADT37n0y28fZIPiGbCfZRVKq0wNo0hrwIhAOIa2tPBF/rB1y30Y/ROh4LBmJ0mItAbTWy8XZKh7Wcp"
-	}`))
 }
 
 func main() {
+	is := integrationSrv{}
 	s := &http.Server{
-		Addr:    ":4500",
-		Handler: http.HandlerFunc(handler),
+		Addr:    "localhost:4500",
+		Handler: http.HandlerFunc(is.handler),
 	}
 	log.Fatal(s.ListenAndServe())
 }
