Skip to content

Deprecate x-security #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sarvaniv merged 8 commits into from
Feb 27, 2017
Merged

Deprecate x-security #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4bf5ad3
Deprecate x-security
sarvaniv Feb 22, 2017
202f221
Add one more swagger file
sarvaniv Feb 22, 2017
2589a63
Update swagger.yaml file also.
sarvaniv Feb 22, 2017
831ac33
Fix api_key
sarvaniv Feb 22, 2017
0de39f9
Fix indentation
sarvaniv Feb 23, 2017
1b5eeef
Update api keys correctly
sarvaniv Feb 27, 2017
ae14ff9
Merge branch 'master' of https://github.com/cloudendpoints/esp into b…
sarvaniv Feb 27, 2017
64cb8a2
Fix indentation
sarvaniv Feb 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions doc/k8s/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,8 @@ paths:
description: "Authenication info."
schema:
$ref: "#/definitions/authInfoResponse"
x-security:
- google_jwt:
audiences:
# This must match the "aud" field in the JWT. You can add multiple
# audiences to accept JWTs from multiple clients.
- "echo.endpoints.sample.google.com"
security:
- {google_jwt: [], api_key: []}
"/auth/info/googleidtoken":
get:
description: "Returns the requests' authentication information."
Expand All @@ -82,12 +78,8 @@ paths:
description: "Authenication info."
schema:
$ref: "#/definitions/authInfoResponse"
x-security:
- google_id_token:
audiences:
# Your OAuth2 client's Client ID must be added here. You can add
# multiple client IDs to accept tokens from multiple clients.
- "YOUR-CLIENT-ID"
security:
- {google_id_token: [], api_key: []}
definitions:
echoMessage:
properties:
Expand Down Expand Up @@ -116,15 +108,23 @@ securityDefinitions:
flow: "implicit"
type: "oauth2"
# This must match the 'iss' field in the JWT.
x-issuer: "jwt-client.endpoints.sample.google.com"
x-google-issuer: "jwt-client.endpoints.sample.google.com"
# Update this with your service account's email address.
x-jwks_uri: "https://www.googleapis.com/service_accounts/v1/jwk/YOUR-SERVICE-ACCOUNT-EMAIL"
x-google-jwks_uri: "https://www.googleapis.com/service_accounts/v1/jwk/YOUR-SERVICE-ACCOUNT-EMAIL"
x-google-audiences:
# This must match the "aud" field in the JWT. You can add multiple
# audiences to accept JWTs from multiple clients.
- "echo.endpoints.sample.google.com"
# This section configures authentication using Google OAuth2 ID Tokens.
# ID Tokens can be obtained using OAuth2 clients, and can be used to access
# your API on behalf of a particular user.
google_id_token:
authorizationUrl: ""
flow: "implicit"
type: "oauth2"
x-issuer: "accounts.google.com"
x-jwks_uri: "https://www.googleapis.com/oauth2/v1/certs"
x-google-issuer: "accounts.google.com"
x-google-jwks_uri: "https://www.googleapis.com/oauth2/v1/certs"
x-google-audiences:
# Your OAuth2 client's Client ID must be added here. You can add
# multiple client IDs to accept tokens from multiple clients.
- "YOUR-CLIENT-ID"
219 changes: 74 additions & 145 deletions test/bookstore/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,23 +91,18 @@
"description": "get message response"
}
},
"x-security": [
"security": [
{
"test_jwk": {
"audiences":[]
}
"test_jwk": [],
"api_key": []
},
{
"test_x509": {
"audiences":[]
}
"test_x509": [],
"api_key": []
},
{
"test_symmetric": {
"audiences": [
"test.echo.audience"
]
}
"test_symmetric": [],
"api_key": []
}
]
},
Expand All @@ -122,23 +117,18 @@
"description": "post message response"
}
},
"x-security": [
"security": [
{
"test_jwk": {
"audiences":[]
}
"test_jwk": [],
"api_key": []
},
{
"test_x509": {
"audiences":[]
}
"test_x509": [],
"api_key": []
},
{
"test_symmetric": {
"audiences": [
"test.echo.audience"
]
}
"test_symmetric": [],
"api_key": []
}
]
}
Expand Down Expand Up @@ -185,52 +175,34 @@
}
}
},
"x-security": [
{
"google_id_token": {
"audiences": [
"848149964201.apps.googleusercontent.com",
"841077041629.apps.googleusercontent.com",
"488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com",
"488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com"
]
}
"security": [
{
"google_id_token": [],
"api_key": []
},
{
"google_identity_toolkit": {
"audiences": []
}
"google_identity_toolkit": [],
"api_key": []
},
{
"auth0_symmetric": {
"audiences": [
"sI0N2qOcfYoizZtstfnkEbsUWt6bluT0"
]
}
"auth0_symmetric": [],
"api_key": []
},
{
"auth0_jwk": {
"audiences": [
"Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq"
]
}
"auth0_jwk": [],
"api_key": []
},
{
"test_jwk": {
"audiences": []
}
"test_jwk": [],
"api_key": []
},
{
"test_x509": {
"audiences": []
}
"test_x509": [],
"api_key": []
},
{
"test_symmetric": {
"audiences": [
"test.esp.audience"
]
}
"test_symmetric": [],
"api_key": []
}
]
}
Expand Down Expand Up @@ -260,55 +232,27 @@
}
}
},
"security": [],
"x-security": [
{
"google_id_token": {
"audiences": [
"848149964201.apps.googleusercontent.com",
"841077041629.apps.googleusercontent.com",
"488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com",
"488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com"
]
}
"security": [
{
"google_id_token": []
},
{
"google_identity_toolkit": {
"audiences": [
"esp-test-client"
]
}
"google_identity_toolkit": []
},
{
"auth0_symmetric": {
"audiences": [
"sI0N2qOcfYoizZtstfnkEbsUWt6bluT0"
]
}
"auth0_symmetric": []
},
{
"auth0_jwk": {
"audiences": [
"Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq"
]
}
"auth0_jwk": []
},
{
"test_jwk": {
"audiences": []
}
"test_jwk": []
},
{
"test_x509": {
"audiences": []
}
"test_x509": []
},
{
"test_symmetric": {
"audiences": [
"test.esp.audience"
]
}
"test_symmetric": []
}
]
},
Expand Down Expand Up @@ -426,54 +370,34 @@
}
}
},
"x-security": [
{
"google_id_token": {
"audiences": [
"848149964201.apps.googleusercontent.com",
"841077041629.apps.googleusercontent.com",
"488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com",
"488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com"
]
}
"security": [
{
"google_id_token": [],
"api_key": []
},
{
"google_identity_toolkit": {
"audiences": [
"esp-test-client"
]
}
"google_identity_toolkit": [],
"api_key": []
},
{
"auth0_symmetric": {
"audiences": [
"sI0N2qOcfYoizZtstfnkEbsUWt6bluT0"
]
}
"auth0_symmetric": [],
"api_key": []
},
{
"auth0_jwk": {
"audiences": [
"Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq"
]
}
"auth0_jwk": [],
"api_key": []
},
{
"test_jwk": {
"audiences": []
}
"test_jwk": [],
"api_key": []
},
{
"test_x509": {
"audiences": []
}
"test_x509": [],
"api_key": []
},
{
"test_symmetric": {
"audiences": [
"test.esp.audience"
]
}
"test_symmetric": [],
"api_key": []
}
]
},
Expand Down Expand Up @@ -608,50 +532,55 @@
"authorizationUrl": "https://esp-jwk.auth0.com/authorize",
"flow": "implicit",
"type": "oauth2",
"x-issuer": "https://esp-jwk.auth0.com/",
"x-jwks_uri": "https://esp-jwk.auth0.com/.well-known/jwks.json"
"x-google-issuer": "https://esp-jwk.auth0.com/",
"x-google-jwks_uri": "https://esp-jwk.auth0.com/.well-known/jwks.json",
"x-google-audiences": "Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq"
},
"auth0_symmetric": {
"authorizationUrl": "https://esp-symmetric.auth0.com/authorize",
"flow": "implicit",
"type": "oauth2",
"x-issuer": "https://esp-symmetric.auth0.com/",
"x-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-https_esp-symmetric_auth0_com"
"x-google-issuer": "https://esp-symmetric.auth0.com/",
"x-google-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-https_esp-symmetric_auth0_com",
"x-google-audiences" : "sI0N2qOcfYoizZtstfnkEbsUWt6bluT0"
},
"google_id_token": {
"authorizationUrl": "",
"flow": "implicit",
"type": "oauth2",
"x-issuer": "https://accounts.google.com",
"x-jwks_uri": "https://www.googleapis.com/oauth2/v1/certs"
"x-google-issuer": "https://accounts.google.com",
"x-google-jwks_uri": "https://www.googleapis.com/oauth2/v1/certs",
"x-google-audiences": "848149964201.apps.googleusercontent.com, 841077041629.apps.googleusercontent.com, 488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com, 488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com"
},
"google_identity_toolkit": {
"authorizationUrl": "",
"flow": "implicit",
"type": "oauth2",
"x-issuer": "https://securetoken.google.com",
"x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/securetoken@system.gserviceaccount.com"
"x-google-issuer": "https://securetoken.google.com",
"x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/securetoken@system.gserviceaccount.com",
"x-google-audiences": "esp-test-client"
},
"test_jwk": {
"authorizationUrl": "",
"flow": "implicit",
"type": "oauth2",
"x-issuer": "loadtest@esp-test-client.iam.gserviceaccount.com",
"x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/jwk/loadtest@esp-test-client.iam.gserviceaccount.com"
"x-google-issuer": "loadtest@esp-test-client.iam.gserviceaccount.com",
"x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/jwk/loadtest@esp-test-client.iam.gserviceaccount.com"
},
"test_symmetric": {
"authorizationUrl": "",
"flow": "implicit",
"type": "oauth2",
"x-issuer": "https://test.esp.client",
"x-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-test_esp_client"
"x-google-issuer": "https://test.esp.client",
"x-google-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-test_esp_client",
"x-google-audiences": "test.echo.audience, test.esp.audience"
},
"test_x509": {
"authorizationUrl": "",
"flow": "implicit",
"type": "oauth2",
"x-issuer": "23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com",
"x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com"
"x-google-issuer": "23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com",
"x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com"
}
}
}
Loading