oauth2/recovation: resolve issues with tests

ory · Nov 22, 2016 · 2e58355 · 2e58355
1 parent 994b596
commit 2e58355
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/cmd/cli/handler_recovation.go b/cmd/cli/handler_recovation.go
@@ -8,6 +8,8 @@ import (
 	"github.com/ory-am/hydra/pkg"
 	"github.com/spf13/cobra"
 	"golang.org/x/oauth2/clientcredentials"
+	"crypto/tls"
+	"net/http"
 )
 
 type RevocationHandler struct {
@@ -23,6 +25,13 @@ func newRevocationHandler(c *config.Config) *RevocationHandler {
 }
 
 func (h *RevocationHandler) RevokeToken(cmd *cobra.Command, args []string) {
+	if ok, _ := cmd.Flags().GetBool("skip-tls-verify"); ok {
+		fmt.Println("Warning: Skipping TLS Certificate Verification.")
+		h.M.Client = &http.Client{Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+		}}
+	}
+
 	h.M.Endpoint = h.Config.Resolve("/oauth2/revoke")
 	h.M.Config = &clientcredentials.Config{
 		ClientID:     h.Config.ClientID,

diff --git a/oauth2/revocator_http.go b/oauth2/revocator_http.go
@@ -15,6 +15,7 @@ type HTTPRecovator struct {
 	Config   *clientcredentials.Config
 	Dry      bool
 	Endpoint *url.URL
+	Client *http.Client
 }
 
 func (r *HTTPRecovator) RevokeToken(ctx context.Context, token string) error {
@@ -30,7 +31,10 @@ func (r *HTTPRecovator) RevokeToken(ctx context.Context, token string) error {
 	hreq.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	hreq.Header.Add("Content-Length", strconv.Itoa(len(data.Encode())))
 	hreq.SetBasicAuth(r.Config.ClientID, r.Config.ClientSecret)
-	hres, err := http.DefaultClient.Do(hreq)
+	if r.Client == nil {
+		r.Client = http.DefaultClient
+	}
+	hres, err := r.Client.Do(hreq)
 	if err != nil {
 		return errors.Wrap(err, "")
 	}