Added proxy functionality.

Henry Birge-Lee · Henry Birge-Lee · commit 30b28a38a777 · 2016-12-23T15:21:19.000-08:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/bash-verify-commands.sh b/bash-verify-commands.sh
@@ -0,0 +1 @@
+bash -c "expect ./prefix-route.sh 184.164.227.1" > bashout.out
diff --git a/ca/.DS_Store b/ca/.DS_Store
diff --git a/cmd/boulder-va/main.go b/cmd/boulder-va/main.go
@@ -42,6 +42,9 @@ type config struct {
 
 		// Feature flag to enable enforcement of CAA SERVFAILs.
 		CAASERVFAILExceptions string
+
+		// A list of proxy urls
+		ProxyURLList []string
 	}
 
 	Statsd cmd.StatsdConfig
@@ -125,7 +128,13 @@ func main() {
 		resolver = r
 	}
 
+	var proxyList = c.VA.ProxyURLList
+	if proxyList == nil {
+		proxyList = []string{""}
+	}
+
 	vai := va.NewValidationAuthorityImpl(
+		proxyList,
 		pc,
 		sbc,
 		cdrClient,
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ boulder:
     build: .
     dockerfile: Dockerfile
     environment:
-        FAKE_DNS: 127.0.0.1
+        FAKE_DNS: 192.168.99.1
         PKCS11_PROXY_SOCKET: tcp://boulder-hsm:5657
     volumes:
       - $GOPATH:/go/
diff --git a/prefix-route.sh b/prefix-route.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/expect #Where the script should be run from.
+
+set ip [lindex $argv 0]
+
+#If it all goes pear shaped the script will timeout after 20 seconds.
+set timeout 20
+#First argument is assigned to the variable name
+set name route-views.routeviews.org
+#Second argument is assigned to the variable user
+set user rviews
+#Third argument is assigned to the variable password
+set password rviews
+#This spawns the telnet program and connects it to the variable name
+spawn telnet $name 
+#The script expects login
+expect "Username:" 
+#The script sends the user variable
+send "$user\r"
+
+send "terminal length 0\r"
+send "show ip bgp $ip\r"
+send "exit\r"
+
+#This hands control of the keyboard over two you (Nice expect feature!)
+interact
+
+exit
diff --git a/test.sh b/test.sh
@@ -111,12 +111,6 @@ function run_unit_tests() {
 
 #
 # Run Go Vet, a correctness-focused static analysis tool
-#
-if [[ "$RUN" =~ "vet" ]] ; then
-  start_context "vet"
-  run_and_expect_silence go vet ${TESTPATHS}
-  end_context #vet
-fi
 
 #
 # Ensure all files are formatted per the `go fmt` tool
diff --git a/test/.DS_Store b/test/.DS_Store
diff --git a/test/config-next/ra.json b/test/config-next/ra.json
@@ -78,7 +78,7 @@
   },
 
   "common": {
-    "dnsResolver": "127.0.0.1:8053",
+    "dnsResolver": "8.8.8.8:53",
     "dnsTimeout": "1s",
     "dnsAllowLoopbackAddresses": true
   }
diff --git a/test/config-next/va.json b/test/config-next/va.json
@@ -4,7 +4,7 @@
     "userAgent": "boulder",
     "debugAddr": ":8004",
     "portConfig": {
-      "httpPort": 5002,
+      "httpPort": 80,
       "httpsPort": 5001,
       "tlsPort": 5001
     },
@@ -38,7 +38,7 @@
   },
 
   "common": {
-    "dnsResolver": "127.0.0.1:8053",
+    "dnsResolver": "8.8.8.8:53",
     "dnsTimeout": "1s",
     "dnsAllowLoopbackAddresses": true
   }
diff --git a/test/config-next/wfe.json b/test/config-next/wfe.json
@@ -45,6 +45,6 @@
 
   "common": {
     "issuerCert": "test/test-ca.pem",
-    "dnsResolver": "127.0.0.1:8053"
+    "dnsResolver": "8.8.8.8:53"
   }
 }
diff --git a/test/config/ra.json b/test/config/ra.json
@@ -55,7 +55,7 @@
   },
 
   "common": {
-    "dnsResolver": "127.0.0.1:8053",
+    "dnsResolver": "8.8.8.8:53",
     "dnsTimeout": "1s",
     "dnsAllowLoopbackAddresses": true
   }
diff --git a/test/config/va.json b/test/config/va.json
@@ -4,7 +4,7 @@
     "userAgent": "boulder",
     "debugAddr": ":8004",
     "portConfig": {
-      "httpPort": 5002,
+      "httpPort": 80,
       "httpsPort": 5001,
       "tlsPort": 5001
     },
@@ -15,8 +15,13 @@
     "amqp": {
       "serverURLFile": "test/secrets/amqp_url",
       "insecure": true,
-      "serviceQueue": "VA.server"
-    }
+      "serviceQueue": "VA.server",
+      "RA": {
+        "server": "RA.server",
+        "rpcTimeout": "15s"
+      }
+    },
+    "proxyURLList": [""]
   },
 
   "statsd": {
@@ -29,7 +34,7 @@
   },
 
   "common": {
-    "dnsResolver": "127.0.0.1:8053",
+    "dnsResolver": "8.8.8.8:53",
     "dnsTimeout": "1s",
     "dnsAllowLoopbackAddresses": true
   }
diff --git a/test/js/test.js b/test/js/test.js
@@ -375,7 +375,7 @@ function validateHttp01(challenge) {
   }
   state.httpServer = http.createServer(httpResponder)
   if (/localhost/.test(state.newRegistrationURL)) {
-    state.httpServer.listen(5002)
+    state.httpServer.listen(80)
   } else {
     state.httpServer.listen(80)
   }
diff --git a/test/rate-limit-policies.yml b/test/rate-limit-policies.yml
@@ -4,7 +4,7 @@ totalCertificates:
   threshold: 100000
 certificatesPerName:
   window: 2160h
-  threshold: 2
+  threshold: 10000
   overrides:
     ratelimit.me: 1
     lim.it: 0
@@ -22,15 +22,15 @@ certificatesPerName:
     101: 1000
 registrationsPerIP:
   window: 168h # 1 week
-  threshold: 10000
+  threshold: 1000000
   overrides:
     127.0.0.1: 1000000
 pendingAuthorizationsPerAccount:
   window: 168h # 1 week, should match pending authorization lifetime.
-  threshold: 3
+  threshold: 1000000
 certificatesPerFQDNSet:
   window: 24h
-  threshold: 5
+  threshold: 10000
   overrides:
     le.wtf: 10000
     le1.wtf: 10000
diff --git a/va/va.go b/va/va.go

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+bash -c "expect ./prefix-route.sh 184.164.227.1" > bashout.out`
Original file line number	Diff line number	Diff line change
`@@ -111,12 +111,6 @@ function run_unit_tests() {`
`111`	`111`
`112`	`112`	`#`
`113`	`113`	`# Run Go Vet, a correctness-focused static analysis tool`
`114`		`-#`
`115`		`-if [[ "$RUN" =~ "vet" ]] ; then`
`116`		`- start_context "vet"`
`117`		`- run_and_expect_silence go vet ${TESTPATHS}`
`118`		`- end_context #vet`
`119`		`-fi`
`120`	`114`
`121`	`115`	`#`
`122`	`116`	# Ensure all files are formatted per the `go fmt` tool
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@`
`78`	`78`	`},`
`79`	`79`
`80`	`80`	`"common": {`
`81`		`- "dnsResolver": "127.0.0.1:8053",`
	`81`	`+ "dnsResolver": "8.8.8.8:53",`
`82`	`82`	`"dnsTimeout": "1s",`
`83`	`83`	`"dnsAllowLoopbackAddresses": true`
`84`	`84`	`}`