From d9e77000f69402c84d0738b467770ab970c0d879 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Fri, 14 Mar 2014 20:46:25 +0000
Subject: [PATCH] build nicer api urls
---
cmd/auditc/auditc.go | 2 +-
cmd/localauditd/localauditd.go | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/cmd/auditc/auditc.go b/cmd/auditc/auditc.go
index 676bd51..b2ed0d1 100644
--- a/cmd/auditc/auditc.go
+++ b/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'})
diff --git a/cmd/localauditd/localauditd.go b/cmd/localauditd/localauditd.go
index b0a9a5c..db4805f 100644
--- a/cmd/localauditd/localauditd.go
+++ b/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))
}
--
GitLab