luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

agent: rename authorize param ClientID to ClientCertURI

This commit is contained in:
Mitchell Hashimoto 2018-03-28 14:29:35 -07:00
parent 26f254fac0
commit 62b746c380
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/agent_endpoint.go
View File

@ -906,7 +906,7 @@ func (s *HTTPServer) AgentConnectAuthorize(resp http.ResponseWriter, req *http.R
} }
// Parse the certificate URI from the client ID // Parse the certificate URI from the client ID
uriRaw, err := url.Parse(authReq.ClientID) uriRaw, err := url.Parse(authReq.ClientCertURI)
if err != nil { if err != nil {
return &connectAuthorizeResp{ return &connectAuthorizeResp{
Authorized: false, Authorized: false,

14
agent/agent_endpoint_test.go
View File

@ -2173,7 +2173,7 @@ func TestAgentConnectAuthorize_idInvalidFormat(t *testing.T) {
args := &structs.ConnectAuthorizeRequest{ args := &structs.ConnectAuthorizeRequest{
Target: "web", Target: "web",
ClientID: "tubes", ClientCertURI: "tubes",
} }
req, _ := http.NewRequest("POST", "/v1/agent/connect/authorize", jsonReader(args)) req, _ := http.NewRequest("POST", "/v1/agent/connect/authorize", jsonReader(args))
resp := httptest.NewRecorder() resp := httptest.NewRecorder()
@ -2196,7 +2196,7 @@ func TestAgentConnectAuthorize_idNotService(t *testing.T) {
args := &structs.ConnectAuthorizeRequest{ args := &structs.ConnectAuthorizeRequest{
Target: "web", Target: "web",
ClientID: "spiffe://1234.consul", ClientCertURI: "spiffe://1234.consul",
} }
req, _ := http.NewRequest("POST", "/v1/agent/connect/authorize", jsonReader(args)) req, _ := http.NewRequest("POST", "/v1/agent/connect/authorize", jsonReader(args))
resp := httptest.NewRecorder() resp := httptest.NewRecorder()
@ -2238,7 +2238,7 @@ func TestAgentConnectAuthorize_allow(t *testing.T) {
args := &structs.ConnectAuthorizeRequest{ args := &structs.ConnectAuthorizeRequest{
Target: target, Target: target,
ClientID: connect.TestSpiffeIDService(t, "web").URI().String(), ClientCertURI: connect.TestSpiffeIDService(t, "web").URI().String(),
} }
req, _ := http.NewRequest("POST", "/v1/agent/connect/authorize", jsonReader(args)) req, _ := http.NewRequest("POST", "/v1/agent/connect/authorize", jsonReader(args))
resp := httptest.NewRecorder() resp := httptest.NewRecorder()
@ -2280,7 +2280,7 @@ func TestAgentConnectAuthorize_deny(t *testing.T) {
args := &structs.ConnectAuthorizeRequest{ args := &structs.ConnectAuthorizeRequest{
Target: target, Target: target,
ClientID: connect.TestSpiffeIDService(t, "web").URI().String(), ClientCertURI: connect.TestSpiffeIDService(t, "web").URI().String(),
} }
req, _ := http.NewRequest("POST", "/v1/agent/connect/authorize", jsonReader(args)) req, _ := http.NewRequest("POST", "/v1/agent/connect/authorize", jsonReader(args))
resp := httptest.NewRecorder() resp := httptest.NewRecorder()
@ -2321,7 +2321,7 @@ func TestAgentConnectAuthorize_serviceWrite(t *testing.T) {
args := &structs.ConnectAuthorizeRequest{ args := &structs.ConnectAuthorizeRequest{
Target: "foo", Target: "foo",
ClientID: connect.TestSpiffeIDService(t, "web").URI().String(), ClientCertURI: connect.TestSpiffeIDService(t, "web").URI().String(),
} }
req, _ := http.NewRequest("POST", req, _ := http.NewRequest("POST",
"/v1/agent/connect/authorize?token="+token, jsonReader(args)) "/v1/agent/connect/authorize?token="+token, jsonReader(args))
@ -2340,7 +2340,7 @@ func TestAgentConnectAuthorize_defaultDeny(t *testing.T) {
args := &structs.ConnectAuthorizeRequest{ args := &structs.ConnectAuthorizeRequest{
Target: "foo", Target: "foo",
ClientID: connect.TestSpiffeIDService(t, "web").URI().String(), ClientCertURI: connect.TestSpiffeIDService(t, "web").URI().String(),
} }
req, _ := http.NewRequest("POST", "/v1/agent/connect/authorize?token=root", jsonReader(args)) req, _ := http.NewRequest("POST", "/v1/agent/connect/authorize?token=root", jsonReader(args))
resp := httptest.NewRecorder() resp := httptest.NewRecorder()
@ -2370,7 +2370,7 @@ func TestAgentConnectAuthorize_defaultAllow(t *testing.T) {
args := &structs.ConnectAuthorizeRequest{ args := &structs.ConnectAuthorizeRequest{
Target: "foo", Target: "foo",
ClientID: connect.TestSpiffeIDService(t, "web").URI().String(), ClientCertURI: connect.TestSpiffeIDService(t, "web").URI().String(),
} }
req, _ := http.NewRequest("POST", "/v1/agent/connect/authorize?token=root", jsonReader(args)) req, _ := http.NewRequest("POST", "/v1/agent/connect/authorize?token=root", jsonReader(args))
resp := httptest.NewRecorder() resp := httptest.NewRecorder()

4
agent/structs/connect.go
View File

@ -6,12 +6,12 @@ type ConnectAuthorizeRequest struct {
// Target is the name of the service that is being requested. // Target is the name of the service that is being requested.
Target string Target string
// ClientID is a unique identifier for the requesting client. This // ClientCertURI is a unique identifier for the requesting client. This
// is currently the URI SAN from the TLS client certificate. // is currently the URI SAN from the TLS client certificate.
// //
// ClientCertSerial is a colon-hex-encoded of the serial number for // ClientCertSerial is a colon-hex-encoded of the serial number for
// the requesting client cert. This is used to check against revocation // the requesting client cert. This is used to check against revocation
// lists. // lists.
ClientID string ClientCertURI string
ClientCertSerial string ClientCertSerial string
} }