build nicer api urls

cmd/auditc/auditc.go

@@ -73,7 +73,7 @@ func main() {
 	}
 
 	tlsConf := audit.TLSClientAuthConfigWithCerts(*sslCa, *sslCert, *sslKey)
-	results := runQuery(*serverUrl+"/api/1/query", tlsConf, query)
+	results := runQuery(strings.TrimRight(*serverUrl, "/")+"/api/1/query", tlsConf, query)
 	for _, msg := range results {
 		json.NewEncoder(os.Stdout).Encode(msg)
 		os.Stdout.Write([]byte{'\n'})

cmd/localauditd/localauditd.go

@@ -57,10 +57,13 @@ func newLocalServer(spoolPath string, serverUrl string, tlsConf *tls.Config) *lo
 		Transport: timeoutTransport,
 	}
 
+	// We're only talking to a single API endpoint.
+	url := strings.TrimRight(serverUrl, "/") + "/api/1/write"
+
 	l := &localServer{
 		spool: spool,
 		http:  httpClient,
-		url:   serverUrl,
+		url:   url,
 	}
 	go l.backgroundFlusher()
 	return l
@@ -245,6 +248,6 @@ func main() {
 	}
 
 	tlsConf := audit.TLSClientAuthConfigWithCerts(*sslCa, *sslCert, *sslKey)
-	locald := newLocalServer(*spoolDir, *serverUrl+"/api/1/write", tlsConf)
+	locald := newLocalServer(*spoolDir, *serverUrl, tlsConf)
 	log.Fatal(locald.Serve(*socketPath))
 }