From 97346b19fe9b37d2a5b59b5aa78cb53a1d12ec6a Mon Sep 17 00:00:00 2001 From: Richard Bradbury Date: Mon, 19 Feb 2024 16:50:13 +0000 Subject: [PATCH 1/4] Combine clientCredentials and authorizationCode into a merged securityScheme. --- 5gms_pro_ph2,oauth2,bbc.nppsess | 26 ++++++++++ ...510_Maf_SessionHandling_DynamicPolicy.yaml | 52 +++++++------------ 2 files changed, 46 insertions(+), 32 deletions(-) create mode 100755 5gms_pro_ph2,oauth2,bbc.nppsess diff --git a/5gms_pro_ph2,oauth2,bbc.nppsess b/5gms_pro_ph2,oauth2,bbc.nppsess new file mode 100755 index 0000000..f1963a9 --- /dev/null +++ b/5gms_pro_ph2,oauth2,bbc.nppsess @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml index c4fdc10..0dfa7a8 100644 --- a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml +++ b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml @@ -26,15 +26,14 @@ security: - {} - OAuth2ClientCredentials: [] - OAuth2AuthorizationCode: [] + paths: /dynamic-policies: post: operationId: createDynamicPolicy summary: 'Create (and optionally upload) a new Dynamic Policy resource' security: - - OAuth2ClientCredentials: - - dynamic-policy-create - - oAuth2AuthorizationCode: + - OAuth2: - dynamic-policy-create requestBody: description: 'An optional JSON representation of a Dynamic Policy resource' @@ -88,10 +87,8 @@ paths: operationId: retrieveDynamicPolicy summary: 'Retrieve an existing Dynamic Policy resource' security: - - OAuth2ClientCredentials: - - dynamic-policy-read - - oAuth2AuthorizationCode: - - dynamic-policy-read + - OAuth2: + - dynamic-policy-retrieve responses: '200': # OK description: 'Success' @@ -121,10 +118,8 @@ paths: operationId: updateDynamicPolicy summary: 'Update an existing Dynamic Policy resource' security: - - OAuth2ClientCredentials: - - metrics-reporting-put - - oAuth2AuthorizationCode: - - metrics-reporting-put + - OAuth2: + - dynamic-policy-replace requestBody: description: 'A replacement JSON representation of a Dynamic Policy resource' required: true @@ -169,9 +164,7 @@ paths: operationId: patchDynamicPolicy summary: 'Patch an existing Dynamic Policy resource' security: - - OAuth2ClientCredentials: - - dynamic-policy-patch - - oAuth2AuthorizationCode: + - OAuth2: - dynamic-policy-patch requestBody: description: 'A JSON patch to a Dynamic Policy resource' @@ -220,10 +213,8 @@ paths: operationId: destroyDynamicPolicy summary: 'Destroy an existing Dynamic Policy resource' security: - - OAuth2ClientCredentials: - - dynamic-policy-delete - - oAuth2AuthorizationCode: - - dynamic-policy-delete + - OAuth2: + - dynamic-policy-destroy responses: '204': # No Content description: 'Dynamic Policy Destroyed' @@ -248,29 +239,26 @@ paths: components: securitySchemes: - OAuth2ClientCredentials: + OAuth2: type: oauth2 flows: clientCredentials: tokenUrl: '{tokenUrl}' scopes: - dynamic-policy-create: Create a dynamic policy - dynamic-policy-read: Read a dynamic policy - dynamic-policy-put: Put a dynamic policy - dynamic-policy-patch: Patch a dynamic policy - dynamic-policy-delete: Delete a dynamic policy - oAuth2AuthorizationCode: - type: oauth2 - flows: + dynamic-policy-create: Create a Dynamic Policy resource + dynamic-policy-retrieve: Retrieve a Dynamic Policy resource + dynamic-policy-replace: Replace a Dynamic Policy resource + dynamic-policy-patch: Patch a Dynamic Policy resource + dynamic-policy-destroy: Destroy a Dynamic Policy resource authorizationCode: authorizationUrl: '{authorizationUrl}' tokenUrl: '{tokenUrl}' scopes: - dynamic-policy-create: Create a dynamic policy - dynamic-policy-read: Read a dynamic policy - dynamic-policy-put: Put a dynamic policy - dynamic-policy-patch: Patch a dynamic policy - dynamic-policy-delete: Delete a dynamic policy + dynamic-policy-create: Create a Dynamic Policy resource + dynamic-policy-retrieve: Retrieve a Dynamic Policy resource + dynamic-policy-replace: Replace a Dynamic Policy resource + dynamic-policy-patch: Patch a Dynamic Policy resource + dynamic-policy-destroy: Destroy a Dynamic Policy resource schemas: DynamicPolicy: description: "A representation of a Dynamic Policy resource." -- GitLab From 4e6d53f90dc1f2d7736bfe607da02be257ce74a5 Mon Sep 17 00:00:00 2001 From: Richard Bradbury Date: Mon, 19 Feb 2024 16:53:48 +0000 Subject: [PATCH 2/4] . --- 5gms_pro_ph2,oauth2,bbc.nppsess | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100755 5gms_pro_ph2,oauth2,bbc.nppsess diff --git a/5gms_pro_ph2,oauth2,bbc.nppsess b/5gms_pro_ph2,oauth2,bbc.nppsess deleted file mode 100755 index f1963a9..0000000 --- a/5gms_pro_ph2,oauth2,bbc.nppsess +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -- GitLab From 11105809d02e6b82c03dc35617bd96de331e07a6 Mon Sep 17 00:00:00 2001 From: Richard Bradbury Date: Mon, 19 Feb 2024 16:57:46 +0000 Subject: [PATCH 3/4] Merged security parmeters. --- TS26510_Maf_SessionHandling_DynamicPolicy.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml index 0dfa7a8..afd7eb0 100644 --- a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml +++ b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml @@ -24,8 +24,7 @@ servers: security: - {} - - OAuth2ClientCredentials: [] - - OAuth2AuthorizationCode: [] + - OAuth2: [] paths: /dynamic-policies: -- GitLab From db6f5be7fa33d4518142de294f75af56a9bac838 Mon Sep 17 00:00:00 2001 From: Richard Bradbury Date: Tue, 20 Feb 2024 16:00:23 +0000 Subject: [PATCH 4/4] Renamed security scheme as "oauth2_dynamic-policy". --- TS26510_Maf_SessionHandling_DynamicPolicy.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml index afd7eb0..08d9e68 100644 --- a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml +++ b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml @@ -24,7 +24,7 @@ servers: security: - {} - - OAuth2: [] + - oauth2_dynamic-policy: [] paths: /dynamic-policies: @@ -32,7 +32,7 @@ paths: operationId: createDynamicPolicy summary: 'Create (and optionally upload) a new Dynamic Policy resource' security: - - OAuth2: + - oauth2_dynamic-policy: - dynamic-policy-create requestBody: description: 'An optional JSON representation of a Dynamic Policy resource' @@ -86,7 +86,7 @@ paths: operationId: retrieveDynamicPolicy summary: 'Retrieve an existing Dynamic Policy resource' security: - - OAuth2: + - oauth2_dynamic-policy: - dynamic-policy-retrieve responses: '200': # OK @@ -117,7 +117,7 @@ paths: operationId: updateDynamicPolicy summary: 'Update an existing Dynamic Policy resource' security: - - OAuth2: + - oauth2_dynamic-policy: - dynamic-policy-replace requestBody: description: 'A replacement JSON representation of a Dynamic Policy resource' @@ -163,7 +163,7 @@ paths: operationId: patchDynamicPolicy summary: 'Patch an existing Dynamic Policy resource' security: - - OAuth2: + - oauth2_dynamic-policy: - dynamic-policy-patch requestBody: description: 'A JSON patch to a Dynamic Policy resource' @@ -212,7 +212,7 @@ paths: operationId: destroyDynamicPolicy summary: 'Destroy an existing Dynamic Policy resource' security: - - OAuth2: + - oauth2_dynamic-policy: - dynamic-policy-destroy responses: '204': # No Content @@ -238,7 +238,7 @@ paths: components: securitySchemes: - OAuth2: + oauth2_dynamic-policy: type: oauth2 flows: clientCredentials: -- GitLab