Skip to content

Commit

Permalink
Merge pull request #17874 from deads2k/rbac-06-permission
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 17744, 17840, 17874).

add swagger permissions

Fixes permission problem from #17872

/assign php-coder
/assign simo5

@openshift/sig-security 

@php-coder see if this gets you to the next failure.
  • Loading branch information
openshift-merge-robot authored Dec 20, 2017
2 parents d62d6aa + 7310263 commit 31367ee
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/authorization/apis/authorization/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ var DiscoveryRule = rbac.PolicyRule{
"/api", "/api/*",
"/apis", "/apis/*",
"/oapi", "/oapi/*",
"/swaggerapi", "/swaggerapi/*", "/swagger.json",
"/swaggerapi", "/swaggerapi/*", "/swagger.json", "/swagger-2.0.0.pb-v1",
"/osapi", "/osapi/", // these cannot be removed until we can drop support for pre 3.1 clients
"/.well-known", "/.well-known/*",

Expand Down
2 changes: 2 additions & 0 deletions test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1780,6 +1780,7 @@ items:
- /swaggerapi
- /swaggerapi/*
- /swagger.json
- /swagger-2.0.0.pb-v1
- /osapi
- /osapi/
- /.well-known
Expand Down Expand Up @@ -2502,6 +2503,7 @@ items:
- /swaggerapi
- /swaggerapi/*
- /swagger.json
- /swagger-2.0.0.pb-v1
- /osapi
- /osapi/
- /.well-known
Expand Down
2 changes: 2 additions & 0 deletions test/testdata/bootstrappolicy/bootstrap_policy_file.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1942,6 +1942,7 @@ items:
- /oapi/*
- /osapi
- /osapi/
- /swagger-2.0.0.pb-v1
- /swagger.json
- /swaggerapi
- /swaggerapi/*
Expand Down Expand Up @@ -2738,6 +2739,7 @@ items:
- /oapi/*
- /osapi
- /osapi/
- /swagger-2.0.0.pb-v1
- /swagger.json
- /swaggerapi
- /swaggerapi/*
Expand Down

0 comments on commit 31367ee

Please sign in to comment.