Request hydra.keys scope and fix panic

ory · Nov 19, 2017 · 546b2cf · 546b2cf
1 parent 8f16a9b
commit 546b2cf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/cmd/serve_all.go b/cmd/serve_all.go
@@ -23,7 +23,7 @@ var allCmd = &cobra.Command{
 				ClientID:     viper.GetString("HYDRA_CLIENT_ID"),
 				ClientSecret: viper.GetString("HYDRA_CLIENT_SECRET"),
 				EndpointURL:  viper.GetString("HYDRA_URL"),
-				Scopes:       []string{"hydra.warden"},
+				Scopes:       []string{"hydra.warden", "hydra.keys.*"},
 			},
 			rules: rules, backendURL: viper.GetString("BACKEND_URL"),
 			cors:         parseCorsOptions(""),
@@ -36,7 +36,7 @@ var allCmd = &cobra.Command{
 				ClientID:     viper.GetString("HYDRA_CLIENT_ID"),
 				ClientSecret: viper.GetString("HYDRA_CLIENT_SECRET"),
 				EndpointURL:  viper.GetString("HYDRA_URL"),
-				Scopes:       []string{"hydra.warden"},
+				Scopes:       []string{"hydra.warden", "hydra.keys.*"},
 			},
 			rules:   rules,
 			address: fmt.Sprintf("%s:%s", viper.GetString("MANAGEMENT_HOST"), viper.GetString("MANAGEMENT_PORT")),

diff --git a/cmd/serve_management.go b/cmd/serve_management.go
@@ -94,7 +94,7 @@ HTTP CONTROLS
 				ClientID:     viper.GetString("HYDRA_CLIENT_ID"),
 				ClientSecret: viper.GetString("HYDRA_CLIENT_SECRET"),
 				EndpointURL:  viper.GetString("HYDRA_URL"),
-				Scopes:       []string{"hydra.warden"},
+				Scopes:       []string{"hydra.warden", "hydra.keys.*"},
 			},
 			rules:   rules,
 			address: fmt.Sprintf("%s:%s", viper.GetString("MANAGEMENT_HOST"), viper.GetString("MANAGEMENT_PORT")),

diff --git a/cmd/serve_proxy.go b/cmd/serve_proxy.go
@@ -101,7 +101,7 @@ OTHER CONTROLS
 				ClientID:     viper.GetString("HYDRA_CLIENT_ID"),
 				ClientSecret: viper.GetString("HYDRA_CLIENT_SECRET"),
 				EndpointURL:  viper.GetString("HYDRA_URL"),
-				Scopes:       []string{"hydra.warden"},
+				Scopes:       []string{"hydra.warden", "hydra.keys.*"},
 			},
 			rules: rules, backendURL: viper.GetString("BACKEND_URL"),
 			cors:         parseCorsOptions(""),

diff --git a/director/director.go b/director/director.go
@@ -110,6 +110,7 @@ func (d *Director) Director(r *http.Request) {
 			WithFields(map[string]interface{}{"user": access.User, "client_id": access.ClientID, "request_url": r.URL.String()}).
 			Errorf("Unable to fetch private key for signing JSON Web Token")
 		*r = *r.WithContext(context.WithValue(r.Context(), requestDenied, &directorError{err: errors.WithStack(err), statusCode: http.StatusInternalServerError}))
+		return
 	}
 
 	token, err := jwt.NewWithClaims(jwt.SigningMethodRS256, access.ToClaims()).SignedString(privateKey)