mbiryukova/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Replace /ssh/get-hosts to /ssh/hosts

Browse source
This commit is contained in:
Mariano Cano 2019-11-27 14:27:23 -08:00 committed by max furman
parent d8b3e05a3f
commit 5d7829b198
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
api/api.go
View file

@ -297,12 +297,13 @@ func (h *caHandler) Route(r Router) {
r.MethodFunc("POST", "/ssh/config", h.SSHConfig) r.MethodFunc("POST", "/ssh/config", h.SSHConfig)
r.MethodFunc("POST", "/ssh/config/{type}", h.SSHConfig) r.MethodFunc("POST", "/ssh/config/{type}", h.SSHConfig)
r.MethodFunc("POST", "/ssh/check-host", h.SSHCheckHost) r.MethodFunc("POST", "/ssh/check-host", h.SSHCheckHost)
r.MethodFunc("GET", "/ssh/get-hosts", h.SSHGetHosts) r.MethodFunc("GET", "/ssh/hosts", h.SSHGetHosts)
r.MethodFunc("POST", "/ssh/bastion", h.SSHBastion) r.MethodFunc("POST", "/ssh/bastion", h.SSHBastion)
// For compatibility with old code: // For compatibility with old code:
r.MethodFunc("POST", "/re-sign", h.Renew) r.MethodFunc("POST", "/re-sign", h.Renew)
r.MethodFunc("POST", "/sign-ssh", h.SSHSign) r.MethodFunc("POST", "/sign-ssh", h.SSHSign)
r.MethodFunc("GET", "/ssh/get-hosts", h.SSHGetHosts)
} }
// Version is an HTTP handler that returns the version of the server. // Version is an HTTP handler that returns the version of the server.

2
ca/client.go
View file

@ -929,7 +929,7 @@ retry:
// SSHGetHosts performs the GET /ssh/get-hosts request to the CA. // SSHGetHosts performs the GET /ssh/get-hosts request to the CA.
func (c *Client) SSHGetHosts() (*api.SSHGetHostsResponse, error) { func (c *Client) SSHGetHosts() (*api.SSHGetHostsResponse, error) {
var retried bool var retried bool
u := c.endpoint.ResolveReference(&url.URL{Path: "/ssh/get-hosts"}) u := c.endpoint.ResolveReference(&url.URL{Path: "/ssh/hosts"})
retry: retry:
resp, err := c.client.Get(u.String()) resp, err := c.client.Get(u.String())
if err != nil { if err != nil {