From c430b306711e2f00fba55ac70b442e9703607a88 Mon Sep 17 00:00:00 2001 From: Thorsten Date: Tue, 30 Jan 2024 13:48:44 +0100 Subject: [PATCH 01/10] Changes to Consumption Reporting --- ...Maf_Provisioning_ConsumptionReporting.yaml | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/TS26510_Maf_Provisioning_ConsumptionReporting.yaml b/TS26510_Maf_Provisioning_ConsumptionReporting.yaml index ba17196..8a95be2 100644 --- a/TS26510_Maf_Provisioning_ConsumptionReporting.yaml +++ b/TS26510_Maf_Provisioning_ConsumptionReporting.yaml @@ -38,6 +38,9 @@ paths: post: operationId: activateConsumptionReporting summary: 'Activate the consumption reporting procedure for the specified Provisioning Session by providing the Consumption Reporting Configuration' + security: + - oAuth2ClientCredentials: + - consumption-reporting-create requestBody: description: 'A JSON representation of a Consumption Reporting Configuration' required: true @@ -79,6 +82,9 @@ paths: get: operationId: retrieveConsumptionReportingConfiguration summary: 'Retrieve the Consumption Reporting Configuration of the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - consumption-reporting-read responses: '200': # OK description: 'Success' @@ -107,6 +113,9 @@ paths: put: operationId: updateConsumptionReportingConfiguration summary: 'Update the Consumption Reporting Configuration for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - consumption-reporting-put requestBody: description: 'A JSON representation of a Consumption Reporting Configuration' required: true @@ -150,6 +159,9 @@ paths: patch: operationId: patchConsumptionReportingConfiguration summary: 'Patch the Consumption Reporting Configuration for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - consumption-reporting-patch requestBody: description: 'A JSON representation of a Consumption Reporting Configuration' required: true @@ -196,6 +208,9 @@ paths: delete: operationId: destroyConsumptionReportingConfiguration summary: 'Destroy the current Consumption Reporting Configuration of the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - consumption-reporting-delete responses: '204': # No Content description: 'Consumption Reporting Configuration Destroyed' @@ -225,7 +240,12 @@ components: flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} + scopes: + consumption-reporting-create: Create consumption reporting + consumption-reporting-read: Read consumption reporting + consumption-reporting-put: Put consumption reporting + consumption-reporting-patch: Patch consumption reporting + consumption-reporting-delete: Delete consumption reporting schemas: ConsumptionReportingConfiguration: -- GitLab From 5082ff5e03bf1abd76ec369ed16eaffab1648216 Mon Sep 17 00:00:00 2001 From: Thorsten Date: Tue, 30 Jan 2024 15:16:40 +0100 Subject: [PATCH 02/10] Added scopes for Client Credential for Maf APIs (old M1) --- TS26510_Maf_Provisioning_ContentHosting.yaml | 26 ++++++++++++++++++- ...visioning_ContentPreparationTemplates.yaml | 22 +++++++++++++++- ...510_Maf_Provisioning_ContentProtocols.yaml | 7 +++-- TS26510_Maf_Provisioning_EdgeResources.yaml | 22 +++++++++++++++- ..._Maf_Provisioning_EventDataProcessing.yaml | 23 ++++++++++++++-- ...510_Maf_Provisioning_MetricsReporting.yaml | 23 ++++++++++++++-- TS26510_Maf_Provisioning_PolicyTemplates.yaml | 22 +++++++++++++++- ...Maf_Provisioning_ProvisioningSessions.yaml | 14 +++++++++- ...0_Maf_Provisioning_ServerCertificates.yaml | 18 ++++++++++++- 9 files changed, 165 insertions(+), 12 deletions(-) diff --git a/TS26510_Maf_Provisioning_ContentHosting.yaml b/TS26510_Maf_Provisioning_ContentHosting.yaml index d33a716..00ead2c 100644 --- a/TS26510_Maf_Provisioning_ContentHosting.yaml +++ b/TS26510_Maf_Provisioning_ContentHosting.yaml @@ -38,6 +38,9 @@ paths: post: operationId: createContentHostingConfiguration summary: 'Create and upload the Content Hosting Configuration for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - content-hosting-configuration-create requestBody: description: 'A JSON representation of a Content Hosting Configuration' required: true @@ -81,6 +84,9 @@ paths: get: operationId: retrieveContentHostingConfiguration summary: 'Retrieve the Content Hosting Configuration of the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - content-hosting-configuration-read responses: '200': # OK description: 'Success' @@ -109,6 +115,9 @@ paths: put: operationId: updateContentHostingConfiguration summary: 'Update (by replacement) the Content Hosting Configuration for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - content-hosting-configuration-put requestBody: description: 'A JSON representation of a Content Hosting Configuration' required: true @@ -152,6 +161,9 @@ paths: patch: operationId: patchContentHostingConfiguration summary: 'Patch the Content Hosting Configuration for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - content-hosting-configuration-patch requestBody: description: 'A JSON representation of a Content Hosting Configuration' required: true @@ -198,6 +210,9 @@ paths: delete: operationId: destroyContentHostingConfiguration summary: 'Destroy the current Content Hosting Configuration of the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - content-hosting-configuration-delete responses: '204': # No Content description: 'Destroyed Content Hosting Configuration' @@ -231,6 +246,9 @@ paths: post: operationId: purgeContentHostingCache summary: 'Purge the content of the cache for the Content Hosting Configuration of the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - content-hosting-configuration-purge requestBody: description: 'The regular expression pattern for resources to purge from the cache' required: true @@ -280,7 +298,13 @@ components: flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} + scopes: + content-hosting-configuration-create: Create a content hosting configuration + content-hosting-configuration-read: Read a content hosting configuration + content-hosting-configuration-put: Put a content hosting configuration + content-hosting-configuration-patch: Patch a content hosting configuration + content-hosting-configuration-delete: Delete a content hosting configuration + content-hosting-configuration-purge: Purge a content hosting configuration schemas: IngestConfiguration: diff --git a/TS26510_Maf_Provisioning_ContentPreparationTemplates.yaml b/TS26510_Maf_Provisioning_ContentPreparationTemplates.yaml index 1832dab..95a60f5 100644 --- a/TS26510_Maf_Provisioning_ContentPreparationTemplates.yaml +++ b/TS26510_Maf_Provisioning_ContentPreparationTemplates.yaml @@ -38,6 +38,9 @@ paths: post: operationId: createContentPreparationTemplate summary: 'Create (and optionally upload) a new Content Preparation Template for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - content-preparation-template-create requestBody: description: 'A Content Preparation Template of any supported type' required: true @@ -94,6 +97,9 @@ paths: get: operationId: retrieveContentPreparationTemplate summary: 'Retrieve the specified Content Preparation Template of the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - content-preparation-template-read responses: '200': # OK description: 'Success' @@ -122,6 +128,9 @@ paths: put: operationId: updateContentPreparationTemplate summary: 'Update (by replacement) the specified Content Preparation Template for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - content-preparation-template-put requestBody: description: 'A Content Preparation Template of any type' required: true @@ -165,6 +174,9 @@ paths: patch: operationId: patchContentPreparationTemplate summary: 'Patch the specified Content Preparation Template for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - content-preparation-template-patch requestBody: description: 'A Content Preparation Template patch of any type' required: true @@ -205,6 +217,9 @@ paths: delete: operationId: destroyContentPreparationTemplate summary: 'Destroy the specified Content Preparation Template of the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - content-preparation-template-delete responses: '204': # No Content description: 'Content Preparation Template Destroyed' @@ -236,4 +251,9 @@ components: flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} + scopes: + content-preparation-template-create: Create a content preparation template + content-preparation-template-read: Read a content preparation template + content-preparation-template-put: Put a content preparation template + content-preparation-template-patch: Patch a content preparation template + content-preparation-template-delete: Delete a content preparation template diff --git a/TS26510_Maf_Provisioning_ContentProtocols.yaml b/TS26510_Maf_Provisioning_ContentProtocols.yaml index b007b3a..668dc81 100644 --- a/TS26510_Maf_Provisioning_ContentProtocols.yaml +++ b/TS26510_Maf_Provisioning_ContentProtocols.yaml @@ -38,6 +38,9 @@ paths: get: operationId: retrieveContentProtocols summary: 'Retrieve the set of Content Protocols supported by the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - content-protocols-read responses: '200': description: 'Success' @@ -71,8 +74,8 @@ components: flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} - + scopes: + content-protocols-read: Read supported content protocols schemas: ContentProtocolDescriptor: type: object diff --git a/TS26510_Maf_Provisioning_EdgeResources.yaml b/TS26510_Maf_Provisioning_EdgeResources.yaml index 0541cd7..e156481 100644 --- a/TS26510_Maf_Provisioning_EdgeResources.yaml +++ b/TS26510_Maf_Provisioning_EdgeResources.yaml @@ -38,6 +38,9 @@ paths: post: operationId: createEdgeResourcesConfiguration summary: 'Create an Edge Resources Configuration within the scope of the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - edge-resource-configuration-create requestBody: description: 'A JSON representation of an Edge Resources Configuration' required: true @@ -93,6 +96,9 @@ paths: get: operationId: retrieveEdgeResourcesConfiguration summary: 'Retrieve the Edge Resources Configuration of the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - edge-resource-configuration-read responses: '200': # OK description: 'Success' @@ -121,6 +127,9 @@ paths: put: operationId: updateEdgeResourcesConfiguration summary: 'Update an Edge Resources Configuration for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - edge-resource-configuration-put requestBody: description: 'A JSON representation of an Edge Resources Configuration' required: true @@ -164,6 +173,9 @@ paths: patch: operationId: patchEdgeResourcesConfiguration summary: 'Patch the Edge Resources Configuration for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - edge-resource-configuration-patch requestBody: description: 'A JSON representation of a Edge Resources Configuration' required: true @@ -210,6 +222,9 @@ paths: delete: operationId: destroyEdgeResourcesConfiguration summary: 'Destroy the specified Edge Resources Configuration of the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - edge-resource-configuration-delete responses: '204': # No Content description: 'Edge Resources Configuration Destroyed' @@ -241,7 +256,12 @@ components: flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} + scopes: + edge-resource-configuration-create: Create an edge resource configuration + edge-resource-configuration-read: Read an edge resource configuration + edge-resource-configuration-put: Put an edge resource configuration + edge-resource-configuration-patch: Patch an edge resource configuration + edge-resource-configuration-delete: Delete an edge resource configuration schemas: EdgeResourcesConfiguration: diff --git a/TS26510_Maf_Provisioning_EventDataProcessing.yaml b/TS26510_Maf_Provisioning_EventDataProcessing.yaml index a28f77e..97f054c 100644 --- a/TS26510_Maf_Provisioning_EventDataProcessing.yaml +++ b/TS26510_Maf_Provisioning_EventDataProcessing.yaml @@ -38,6 +38,9 @@ paths: post: operationId: createEventDataProcessingConfiguration summary: 'Supply an Event Data Processing Configuration for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - event-data-processing-provisioning-create requestBody: description: 'A JSON representation of a Event Data Processing Configuration' required: true @@ -94,6 +97,9 @@ paths: get: operationId: retrieveEventDataProcessingConfiguration summary: 'Retrieve the specified Event Data Processing Configuration of the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - event-data-processing-provisioning-read responses: '200': # OK description: 'Success' @@ -122,6 +128,9 @@ paths: put: operationId: updateEventDataProcessingConfiguration summary: 'Update the specified Event Data Processing Configuration for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - event-data-processing-provisioning-put requestBody: description: 'A JSON representation of a Event Data Processing Configuration' required: true @@ -165,6 +174,9 @@ paths: patch: operationId: patchEventDataProcessingConfiguration summary: 'Patch the specified Event Data Processing Configuration for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - event-data-processing-provisioning-patch requestBody: description: 'A JSON representation of a Event Data Processing Configuration' required: true @@ -211,6 +223,9 @@ paths: delete: operationId: destroyEventDataProcessingConfiguration summary: 'Destroy the specified Event Data Processing Configuration of the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - event-data-processing-provisioning-delete responses: '204': # No Content description: 'Event Data Processing Configuration Destroyed' @@ -240,8 +255,12 @@ components: flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} - + scopes: + event-data-processing-provisioning-create: Create an event data processing provisioning + event-data-processing-provisioning-read: Read an event data processing provisioning + event-data-processing-provisioning-put: Put an event data processing provisioning + event-data-processing-provisioning-patch: Patch an event data processing provisioning + event-data-processing-provisioning-delete: Delete an event data processing provisioning schemas: EventDataProcessingConfiguration: description: 'A representation of an Event Data Processing Configuration resource.' diff --git a/TS26510_Maf_Provisioning_MetricsReporting.yaml b/TS26510_Maf_Provisioning_MetricsReporting.yaml index 3ea30cb..4e2cbc2 100644 --- a/TS26510_Maf_Provisioning_MetricsReporting.yaml +++ b/TS26510_Maf_Provisioning_MetricsReporting.yaml @@ -38,6 +38,9 @@ paths: post: operationId: activateMetricsReporting summary: 'Activate the Metrics reporting procedure for the specified Provisioning Session by providing the Metrics Reporting Configuration' + security: + - oAuth2ClientCredentials: + - metrics-reporting-create requestBody: description: 'A JSON representation of a Metrics Reporting Configuration' required: true @@ -94,6 +97,9 @@ paths: get: operationId: retrieveMetricsReportingConfiguration summary: 'Retrieve the specified Metrics Reporting Configuration of the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - metrics-reporting-read responses: '200': # OK description: 'Success' @@ -122,6 +128,9 @@ paths: put: operationId: updateMetricsReportingConfiguration summary: 'Update the specified Metrics Reporting Configuration for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - metrics-reporting-put requestBody: description: 'A JSON representation of a Metrics Reporting Configuration' required: true @@ -165,6 +174,9 @@ paths: patch: operationId: patchMetricsReportingConfiguration summary: 'Patch the specified Metrics Reporting Configuration for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - metrics-reporting-patch requestBody: description: 'A JSON representation of a Metrics Reporting Configuration' required: true @@ -211,6 +223,9 @@ paths: delete: operationId: destroyMetricsReportingConfiguration summary: 'Destroy the specified Metrics Reporting Configuration of the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - metrics-reporting-delete responses: '204': # No Content description: 'Metrics Reporting Configuration Destroyed' @@ -240,8 +255,12 @@ components: flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} - + scopes: + metrics-reporting-create: Create a metric reporting + metrics-reporting-read: Read a metric reporting + metrics-reporting-put: Put a metric reporting + metrics-reporting-patch: Patch a metric reporting + metrics-reporting-delete: Delete a metric reporting schemas: MetricsReportingConfiguration: type: object diff --git a/TS26510_Maf_Provisioning_PolicyTemplates.yaml b/TS26510_Maf_Provisioning_PolicyTemplates.yaml index 012d8d7..29fec7a 100644 --- a/TS26510_Maf_Provisioning_PolicyTemplates.yaml +++ b/TS26510_Maf_Provisioning_PolicyTemplates.yaml @@ -38,6 +38,9 @@ paths: post: operationId: createPolicyTemplate summary: 'Create and upload a new Policy Template for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - policy-template-create requestBody: description: 'A JSON representation of a Policy Template' required: true @@ -94,6 +97,9 @@ paths: get: operationId: retrievePolicyTemplate summary: 'Retrieve a representation of an existing Policy Template in the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - policy-template-read responses: '200': # OK description: 'Success' @@ -122,6 +128,9 @@ paths: put: operationId: updatePolicyTemplate summary: 'Update a Policy Template for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - policy-template-put requestBody: description: 'A JSON representation of a Policy Template' required: true @@ -165,6 +174,9 @@ paths: patch: operationId: patchPolicyTemplate summary: 'Patch the Policy Template for the specified Provisioning Session' + security: + - oAuth2ClientCredentials: + - policy-template-patch requestBody: description: 'A JSON representation of a Policy Template' required: true @@ -210,6 +222,9 @@ paths: $ref: 'TS29571_CommonData.yaml#/components/responses/default' delete: operationId: destroyPolicyTemplate + security: + - oAuth2ClientCredentials: + - policy-template-delete responses: '204': # No Content description: 'Policy Template Destroyed' @@ -239,7 +254,12 @@ components: flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} + scopes: + policy-template-create: Create a policy template + policy-template-read: Read a policy template + policy-template-put: Put a policy template + policy-template-patch: Patch a policy template + policy-template-delete: Delete a policy template schemas: PolicyTemplate: diff --git a/TS26510_Maf_Provisioning_ProvisioningSessions.yaml b/TS26510_Maf_Provisioning_ProvisioningSessions.yaml index 57050ff..6f5fd03 100644 --- a/TS26510_Maf_Provisioning_ProvisioningSessions.yaml +++ b/TS26510_Maf_Provisioning_ProvisioningSessions.yaml @@ -31,6 +31,9 @@ paths: post: operationId: createProvisioningSession summary: 'Create a new Provisioning Session' + security: + - oAuth2ClientCredentials: + - provisioning-sessions-create requestBody: description: 'A JSON representation of a Provisioning Session.' required: true @@ -81,6 +84,9 @@ paths: get: operationId: getProvisioningSessionById summary: 'Retrieve an existing Provisioning Session' + security: + - oAuth2ClientCredentials: + - provisioning-sessions-read responses: '200': description: 'Success' @@ -109,6 +115,9 @@ paths: delete: operationId: destroyProvisioningSession summary: 'Destroy an existing Provisioning Session' + security: + - oAuth2ClientCredentials: + - provisioning-sessions-delete responses: '204': # No Content description: 'Provisioning Session Destroyed' @@ -138,7 +147,10 @@ components: flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} + scopes: + provisioning-sessions-create: Create a provisioning session + provisioning-sessions-read: Read a provisioning session + provisioning-sessions-delete: Delete a provisioning session schemas: ProvisioningSession: diff --git a/TS26510_Maf_Provisioning_ServerCertificates.yaml b/TS26510_Maf_Provisioning_ServerCertificates.yaml index e7ceb0c..c256f6a 100644 --- a/TS26510_Maf_Provisioning_ServerCertificates.yaml +++ b/TS26510_Maf_Provisioning_ServerCertificates.yaml @@ -39,6 +39,9 @@ paths: operationId: createOrReserveServerCertificate summary: 'Create or reserve a Service Certificate resource' description: 'Without the optional csr query parameter, an X.509 certificate is generated and this is returned. If the csr query parameter is present, a Certificate Signing Request is instead generated and returned, allowing the X.509 certificate to be generated by the invoker and later uploaded.' + security: + - oAuth2ClientCredentials: + - certificates-csr-request parameters: - in: query name: csr @@ -102,6 +105,9 @@ paths: put: operationId: uploadServerCertificate summary: "Upload the X.509 certificate for a previously reserved Server Certificate resource" + security: + - oAuth2ClientCredentials: + - certificates-upload requestBody: required: true content: @@ -138,6 +144,9 @@ paths: get: operationId: retrieveServerCertificate summary: 'Retrieve the X.509 certificate representation of the specified Server Certificate resource' + security: + - oAuth2ClientCredentials: + - certificates-retrieve responses: '200': description: 'Success' @@ -168,6 +177,9 @@ paths: delete: operationId: destroyServerCertificate summary: 'Destroy an existing Server Certificate resource' + security: + - oAuth2ClientCredentials: + - certificates-delete responses: '204': # No Content description: 'Server Certificate Destroyed' @@ -199,4 +211,8 @@ components: flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} + scopes: + certificates-csr-request: Create a Certificate Signing Resource + certificates-upload: Upload a certificate + certificates-retrieve: Retrieve a certificate + certificates-delete: Delete a certificate -- GitLab From 0ad3094d7d802095625e90611603c3dc084b083b Mon Sep 17 00:00:00 2001 From: Thorsten Date: Tue, 30 Jan 2024 15:36:35 +0100 Subject: [PATCH 03/10] Added scopes for CC and AC for Maf SessionHandling (former M5). --- ..._SessionHandling_ConsumptionReporting.yaml | 16 +++-- ...510_Maf_SessionHandling_DynamicPolicy.yaml | 45 ++++++++++++-- ..._Maf_SessionHandling_MetricsReporting.yaml | 15 +++-- ...Maf_SessionHandling_NetworkAssistance.yaml | 59 +++++++++++++++++-- 4 files changed, 114 insertions(+), 21 deletions(-) diff --git a/TS26510_Maf_SessionHandling_ConsumptionReporting.yaml b/TS26510_Maf_SessionHandling_ConsumptionReporting.yaml index 5e61a91..b582105 100644 --- a/TS26510_Maf_SessionHandling_ConsumptionReporting.yaml +++ b/TS26510_Maf_SessionHandling_ConsumptionReporting.yaml @@ -39,6 +39,11 @@ paths: post: operationId: submitConsumptionReport summary: 'Submit a Consumption Report' + security: + - oAuth2ClientCredentials: + - consumption-reporting-create + - oAuth2AuthorizationCode: + - consumption-reporting-create requestBody: description: 'A Consumption Report' required: true @@ -74,20 +79,21 @@ paths: components: securitySchemes: - OAuth2ClientCredentials: + oAuth2ClientCredentials: type: oauth2 flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} - OAuth2AuthorizationCode: + scopes: + consumption-reporting-create: Create consumption report + oAuth2AuthorizationCode: type: oauth2 flows: authorizationCode: authorizationUrl: '{authorizationUrl}' tokenUrl: '{tokenUrl}' - scopes: {} - + scopes: + consumption-reporting-create: Create consumption report schemas: ConsumptionReport: description: "A representation of a Consumption Report." diff --git a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml index 78741cd..52699a4 100644 --- a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml +++ b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml @@ -26,12 +26,16 @@ 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: + - dynamic-policy-create requestBody: description: 'An optional JSON representation of a Dynamic Policy resource' content: @@ -83,6 +87,11 @@ paths: get: operationId: retrieveDynamicPolicy summary: 'Retrieve an existing Dynamic Policy resource' + security: + - oAuth2ClientCredentials: + - dynamic-policy-read + - oAuth2AuthorizationCode: + - dynamic-policy-read responses: '200': # OK description: 'Success' @@ -111,6 +120,11 @@ paths: put: operationId: updateDynamicPolicy summary: 'Update an existing Dynamic Policy resource' + security: + - oAuth2ClientCredentials: + - metrics-reporting-put + - oAuth2AuthorizationCode: + - metrics-reporting-put requestBody: description: 'A replacement JSON representation of a Dynamic Policy resource' required: true @@ -154,6 +168,11 @@ paths: patch: operationId: patchDynamicPolicy summary: 'Patch an existing Dynamic Policy resource' + security: + - oAuth2ClientCredentials: + - dynamic-policy-patch + - oAuth2AuthorizationCode: + - dynamic-policy-patch requestBody: description: 'A JSON patch to a Dynamic Policy resource' required: true @@ -200,6 +219,11 @@ paths: delete: operationId: destroyDynamicPolicy summary: 'Destroy an existing Dynamic Policy resource' + security: + - oAuth2ClientCredentials: + - dynamic-policy-delete + - oAuth2AuthorizationCode: + - dynamic-policy-delete responses: '204': # No Content description: 'Dynamic Policy Destroyed' @@ -224,20 +248,29 @@ paths: components: securitySchemes: - OAuth2ClientCredentials: + oAuth2ClientCredentials: type: oauth2 flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} - OAuth2AuthorizationCode: + 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: authorizationCode: authorizationUrl: '{authorizationUrl}' tokenUrl: '{tokenUrl}' - scopes: {} - + 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 schemas: DynamicPolicy: description: "A representation of a Dynamic Policy resource." diff --git a/TS26510_Maf_SessionHandling_MetricsReporting.yaml b/TS26510_Maf_SessionHandling_MetricsReporting.yaml index 6f75bea..b37c932 100644 --- a/TS26510_Maf_SessionHandling_MetricsReporting.yaml +++ b/TS26510_Maf_SessionHandling_MetricsReporting.yaml @@ -45,6 +45,11 @@ paths: post: operationId: submitMetricsReport summary: 'Submit a Metrics Report' + security: + - oAuth2ClientCredentials: + - metrics-reporting-create + - oAuth2AuthorizationCode: + - metrics-reporting-create requestBody: description: 'A Metrics Report' required: true @@ -84,16 +89,18 @@ paths: components: securitySchemes: - OAuth2ClientCredentials: + oAuth2ClientCredentials: type: oauth2 flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} - OAuth2AuthorizationCode: + scopes: + metrics-reporting-create: Create a metrics report + oAuth2AuthorizationCode: type: oauth2 flows: authorizationCode: authorizationUrl: '{authorizationUrl}' tokenUrl: '{tokenUrl}' - scopes: {} + scopes: + metrics-reporting-create: Create a metrics report diff --git a/TS26510_Maf_SessionHandling_NetworkAssistance.yaml b/TS26510_Maf_SessionHandling_NetworkAssistance.yaml index 643b06d..30c867f 100644 --- a/TS26510_Maf_SessionHandling_NetworkAssistance.yaml +++ b/TS26510_Maf_SessionHandling_NetworkAssistance.yaml @@ -32,6 +32,11 @@ paths: post: operationId: createNetworkAssistanceSession summary: 'Create a new Network Assistance Session.' + security: + - oAuth2ClientCredentials: + - network-assistance-create + - oAuth2AuthorizationCode: + - network-assistance-create requestBody: description: 'The initial parameters for the Network Assistance Session resource' content: @@ -83,6 +88,11 @@ paths: get: operationId: retrieveNetworkAssistanceSession summary: 'Retrieve an existing Network Assistance Session resource' + security: + - oAuth2ClientCredentials: + - network-assistance-get + - oAuth2AuthorizationCode: + - network-assistance-get responses: '200': # OK description: 'Success' @@ -111,6 +121,11 @@ paths: put: operationId: updateNetworkAssistanceSession summary: 'Update an existing Network Assistance Session resource' + security: + - oAuth2ClientCredentials: + - network-assistance-put + - oAuth2AuthorizationCode: + - network-assistance-put requestBody: description: 'A replacement JSON representation of a Network Assistance Session resource' required: true @@ -154,6 +169,11 @@ paths: patch: operationId: patchNetworkAssistanceSession summary: 'Patch an existing Network Assistance Session resource' + security: + - oAuth2ClientCredentials: + - network-assistance-patch + - oAuth2AuthorizationCode: + - network-assistance-patch requestBody: description: 'A JSON patch to a Network Assistance Session resource' required: true @@ -200,6 +220,11 @@ paths: delete: operationId: destroyNetworkAssistanceSession summary: 'Destroy an existing Network Assistance Session resource' + security: + - oAuth2ClientCredentials: + - network-assistance-delete + - oAuth2AuthorizationCode: + - network-assistance-delete responses: '204': # No Content description: 'Network Assistance Session Destroyed' @@ -226,6 +251,11 @@ paths: get: operationId: requestBitRateRecommendation summary: 'Obtain a bit rate recommendation for the next recommendation window' + security: + - oAuth2ClientCredentials: + - network-assistance-getrec + - oAuth2AuthorizationCode: + - network-assistance-getrec parameters: - name: naSessionId description: 'The resource identifier of an existing Network Assistance Session resource' @@ -262,6 +292,11 @@ paths: post: operationId: requestDeliveryBoost summary: 'Request a delivery boost' + security: + - oAuth2ClientCredentials: + - network-assistance-boost + - oAuth2AuthorizationCode: + - network-assistance-boost parameters: - name: naSessionId description: 'The resource identifier of an existing Network Assistance Session resource' @@ -299,21 +334,33 @@ paths: components: securitySchemes: - OAuth2ClientCredentials: + oAuth2ClientCredentials: type: oauth2 flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} - OAuth2AuthorizationCode: + scopes: + network-assistance-create: Create a network assistance session + network-assistance-read: Read a network assistance session + network-assistance-put: Put a network assistance session + network-assistance-patch: Patch a network assistance session + network-assistance-delete: Delete a network assistance session + network-assistance-getrec: Obtain a bit rate recommendation + network-assistance-boost: Request a delivery boost + oAuth2AuthorizationCode: type: oauth2 flows: authorizationCode: authorizationUrl: '{authorizationUrl}' tokenUrl: '{tokenUrl}' - scopes: {} - - + scopes: + network-assistance-create: Create a network assistance session + network-assistance-read: Read a network assistance session + network-assistance-put: Put a network assistance session + network-assistance-patch: Patch a network assistance session + network-assistance-delete: Delete a network assistance session + network-assistance-getrec: Obtain a bit rate recommendation + network-assistance-boost: Request a delivery boost schemas: NetworkAssistanceSession: description: "A representation of a Network Assistance Session resource." -- GitLab From d56acbfe93928ae29a4e6f69ec4d52f8fb97c07b Mon Sep 17 00:00:00 2001 From: Thorsten Date: Wed, 31 Jan 2024 08:24:50 +0100 Subject: [PATCH 04/10] Added scopes. --- ...SessionHandling_ServiceAccessInformation.yaml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml index 49ffee5..66d2367 100644 --- a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml +++ b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml @@ -39,6 +39,11 @@ paths: get: operationId: retrieveServiceAccessInformation summary: 'Retrieve the Service Access Information resource' + security: + - oAuth2ClientCredentials: + - service-access-information-read + - oAuth2AuthorizationCode: + - service-access-information-read responses: '200': # OK description: 'Success' @@ -67,20 +72,21 @@ paths: components: securitySchemes: - OAuth2ClientCredentials: + oAuth2ClientCredentials: type: oauth2 flows: clientCredentials: tokenUrl: '{tokenUrl}' - scopes: {} - OAuth2AuthorizationCode: + scopes: + service-access-information-read: Read service access session + oAuth2AuthorizationCode: type: oauth2 flows: authorizationCode: authorizationUrl: '{authorizationUrl}' tokenUrl: '{tokenUrl}' - scopes: {} - + scopes: + service-access-information-read: Read service access session schemas: M5MediaEntryPoint: -- GitLab From 76ce2f6faed5f3bef5263337e0a017e8aa41c8e5 Mon Sep 17 00:00:00 2001 From: Thorsten Date: Wed, 31 Jan 2024 15:03:47 +0100 Subject: [PATCH 05/10] Changed from oAuth2ClientCredentials (Small leading letter) to OAuth2ClientCredentials. --- ...10_Maf_Provisioning_ConsumptionReporting.yaml | 10 +++++----- TS26510_Maf_Provisioning_ContentHosting.yaml | 12 ++++++------ ...Provisioning_ContentPreparationTemplates.yaml | 10 +++++----- TS26510_Maf_Provisioning_ContentProtocols.yaml | 2 +- TS26510_Maf_Provisioning_EdgeResources.yaml | 10 +++++----- ...510_Maf_Provisioning_EventDataProcessing.yaml | 10 +++++----- TS26510_Maf_Provisioning_MetricsReporting.yaml | 10 +++++----- TS26510_Maf_Provisioning_PolicyTemplates.yaml | 10 +++++----- ...10_Maf_Provisioning_ProvisioningSessions.yaml | 6 +++--- TS26510_Maf_Provisioning_ServerCertificates.yaml | 8 ++++---- ...Maf_SessionHandling_ConsumptionReporting.yaml | 4 ++-- TS26510_Maf_SessionHandling_DynamicPolicy.yaml | 12 ++++++------ ...510_Maf_SessionHandling_MetricsReporting.yaml | 4 ++-- ...10_Maf_SessionHandling_NetworkAssistance.yaml | 16 ++++++++-------- ...SessionHandling_ServiceAccessInformation.yaml | 4 ++-- 15 files changed, 64 insertions(+), 64 deletions(-) diff --git a/TS26510_Maf_Provisioning_ConsumptionReporting.yaml b/TS26510_Maf_Provisioning_ConsumptionReporting.yaml index 8a95be2..6d1ed2e 100644 --- a/TS26510_Maf_Provisioning_ConsumptionReporting.yaml +++ b/TS26510_Maf_Provisioning_ConsumptionReporting.yaml @@ -39,7 +39,7 @@ paths: operationId: activateConsumptionReporting summary: 'Activate the consumption reporting procedure for the specified Provisioning Session by providing the Consumption Reporting Configuration' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - consumption-reporting-create requestBody: description: 'A JSON representation of a Consumption Reporting Configuration' @@ -83,7 +83,7 @@ paths: operationId: retrieveConsumptionReportingConfiguration summary: 'Retrieve the Consumption Reporting Configuration of the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - consumption-reporting-read responses: '200': # OK @@ -114,7 +114,7 @@ paths: operationId: updateConsumptionReportingConfiguration summary: 'Update the Consumption Reporting Configuration for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - consumption-reporting-put requestBody: description: 'A JSON representation of a Consumption Reporting Configuration' @@ -160,7 +160,7 @@ paths: operationId: patchConsumptionReportingConfiguration summary: 'Patch the Consumption Reporting Configuration for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - consumption-reporting-patch requestBody: description: 'A JSON representation of a Consumption Reporting Configuration' @@ -209,7 +209,7 @@ paths: operationId: destroyConsumptionReportingConfiguration summary: 'Destroy the current Consumption Reporting Configuration of the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - consumption-reporting-delete responses: '204': # No Content diff --git a/TS26510_Maf_Provisioning_ContentHosting.yaml b/TS26510_Maf_Provisioning_ContentHosting.yaml index 00ead2c..10c04a0 100644 --- a/TS26510_Maf_Provisioning_ContentHosting.yaml +++ b/TS26510_Maf_Provisioning_ContentHosting.yaml @@ -39,7 +39,7 @@ paths: operationId: createContentHostingConfiguration summary: 'Create and upload the Content Hosting Configuration for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - content-hosting-configuration-create requestBody: description: 'A JSON representation of a Content Hosting Configuration' @@ -85,7 +85,7 @@ paths: operationId: retrieveContentHostingConfiguration summary: 'Retrieve the Content Hosting Configuration of the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - content-hosting-configuration-read responses: '200': # OK @@ -116,7 +116,7 @@ paths: operationId: updateContentHostingConfiguration summary: 'Update (by replacement) the Content Hosting Configuration for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - content-hosting-configuration-put requestBody: description: 'A JSON representation of a Content Hosting Configuration' @@ -162,7 +162,7 @@ paths: operationId: patchContentHostingConfiguration summary: 'Patch the Content Hosting Configuration for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - content-hosting-configuration-patch requestBody: description: 'A JSON representation of a Content Hosting Configuration' @@ -211,7 +211,7 @@ paths: operationId: destroyContentHostingConfiguration summary: 'Destroy the current Content Hosting Configuration of the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - content-hosting-configuration-delete responses: '204': # No Content @@ -247,7 +247,7 @@ paths: operationId: purgeContentHostingCache summary: 'Purge the content of the cache for the Content Hosting Configuration of the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - content-hosting-configuration-purge requestBody: description: 'The regular expression pattern for resources to purge from the cache' diff --git a/TS26510_Maf_Provisioning_ContentPreparationTemplates.yaml b/TS26510_Maf_Provisioning_ContentPreparationTemplates.yaml index 95a60f5..4c5d9f0 100644 --- a/TS26510_Maf_Provisioning_ContentPreparationTemplates.yaml +++ b/TS26510_Maf_Provisioning_ContentPreparationTemplates.yaml @@ -39,7 +39,7 @@ paths: operationId: createContentPreparationTemplate summary: 'Create (and optionally upload) a new Content Preparation Template for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - content-preparation-template-create requestBody: description: 'A Content Preparation Template of any supported type' @@ -98,7 +98,7 @@ paths: operationId: retrieveContentPreparationTemplate summary: 'Retrieve the specified Content Preparation Template of the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - content-preparation-template-read responses: '200': # OK @@ -129,7 +129,7 @@ paths: operationId: updateContentPreparationTemplate summary: 'Update (by replacement) the specified Content Preparation Template for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - content-preparation-template-put requestBody: description: 'A Content Preparation Template of any type' @@ -175,7 +175,7 @@ paths: operationId: patchContentPreparationTemplate summary: 'Patch the specified Content Preparation Template for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - content-preparation-template-patch requestBody: description: 'A Content Preparation Template patch of any type' @@ -218,7 +218,7 @@ paths: operationId: destroyContentPreparationTemplate summary: 'Destroy the specified Content Preparation Template of the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - content-preparation-template-delete responses: '204': # No Content diff --git a/TS26510_Maf_Provisioning_ContentProtocols.yaml b/TS26510_Maf_Provisioning_ContentProtocols.yaml index 668dc81..7176a77 100644 --- a/TS26510_Maf_Provisioning_ContentProtocols.yaml +++ b/TS26510_Maf_Provisioning_ContentProtocols.yaml @@ -39,7 +39,7 @@ paths: operationId: retrieveContentProtocols summary: 'Retrieve the set of Content Protocols supported by the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - content-protocols-read responses: '200': diff --git a/TS26510_Maf_Provisioning_EdgeResources.yaml b/TS26510_Maf_Provisioning_EdgeResources.yaml index e156481..fb2dfe0 100644 --- a/TS26510_Maf_Provisioning_EdgeResources.yaml +++ b/TS26510_Maf_Provisioning_EdgeResources.yaml @@ -39,7 +39,7 @@ paths: operationId: createEdgeResourcesConfiguration summary: 'Create an Edge Resources Configuration within the scope of the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - edge-resource-configuration-create requestBody: description: 'A JSON representation of an Edge Resources Configuration' @@ -97,7 +97,7 @@ paths: operationId: retrieveEdgeResourcesConfiguration summary: 'Retrieve the Edge Resources Configuration of the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - edge-resource-configuration-read responses: '200': # OK @@ -128,7 +128,7 @@ paths: operationId: updateEdgeResourcesConfiguration summary: 'Update an Edge Resources Configuration for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - edge-resource-configuration-put requestBody: description: 'A JSON representation of an Edge Resources Configuration' @@ -174,7 +174,7 @@ paths: operationId: patchEdgeResourcesConfiguration summary: 'Patch the Edge Resources Configuration for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - edge-resource-configuration-patch requestBody: description: 'A JSON representation of a Edge Resources Configuration' @@ -223,7 +223,7 @@ paths: operationId: destroyEdgeResourcesConfiguration summary: 'Destroy the specified Edge Resources Configuration of the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - edge-resource-configuration-delete responses: '204': # No Content diff --git a/TS26510_Maf_Provisioning_EventDataProcessing.yaml b/TS26510_Maf_Provisioning_EventDataProcessing.yaml index 97f054c..5ffa9ef 100644 --- a/TS26510_Maf_Provisioning_EventDataProcessing.yaml +++ b/TS26510_Maf_Provisioning_EventDataProcessing.yaml @@ -39,7 +39,7 @@ paths: operationId: createEventDataProcessingConfiguration summary: 'Supply an Event Data Processing Configuration for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - event-data-processing-provisioning-create requestBody: description: 'A JSON representation of a Event Data Processing Configuration' @@ -98,7 +98,7 @@ paths: operationId: retrieveEventDataProcessingConfiguration summary: 'Retrieve the specified Event Data Processing Configuration of the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - event-data-processing-provisioning-read responses: '200': # OK @@ -129,7 +129,7 @@ paths: operationId: updateEventDataProcessingConfiguration summary: 'Update the specified Event Data Processing Configuration for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - event-data-processing-provisioning-put requestBody: description: 'A JSON representation of a Event Data Processing Configuration' @@ -175,7 +175,7 @@ paths: operationId: patchEventDataProcessingConfiguration summary: 'Patch the specified Event Data Processing Configuration for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - event-data-processing-provisioning-patch requestBody: description: 'A JSON representation of a Event Data Processing Configuration' @@ -224,7 +224,7 @@ paths: operationId: destroyEventDataProcessingConfiguration summary: 'Destroy the specified Event Data Processing Configuration of the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - event-data-processing-provisioning-delete responses: '204': # No Content diff --git a/TS26510_Maf_Provisioning_MetricsReporting.yaml b/TS26510_Maf_Provisioning_MetricsReporting.yaml index 4e2cbc2..364aab9 100644 --- a/TS26510_Maf_Provisioning_MetricsReporting.yaml +++ b/TS26510_Maf_Provisioning_MetricsReporting.yaml @@ -39,7 +39,7 @@ paths: operationId: activateMetricsReporting summary: 'Activate the Metrics reporting procedure for the specified Provisioning Session by providing the Metrics Reporting Configuration' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - metrics-reporting-create requestBody: description: 'A JSON representation of a Metrics Reporting Configuration' @@ -98,7 +98,7 @@ paths: operationId: retrieveMetricsReportingConfiguration summary: 'Retrieve the specified Metrics Reporting Configuration of the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - metrics-reporting-read responses: '200': # OK @@ -129,7 +129,7 @@ paths: operationId: updateMetricsReportingConfiguration summary: 'Update the specified Metrics Reporting Configuration for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - metrics-reporting-put requestBody: description: 'A JSON representation of a Metrics Reporting Configuration' @@ -175,7 +175,7 @@ paths: operationId: patchMetricsReportingConfiguration summary: 'Patch the specified Metrics Reporting Configuration for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - metrics-reporting-patch requestBody: description: 'A JSON representation of a Metrics Reporting Configuration' @@ -224,7 +224,7 @@ paths: operationId: destroyMetricsReportingConfiguration summary: 'Destroy the specified Metrics Reporting Configuration of the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - metrics-reporting-delete responses: '204': # No Content diff --git a/TS26510_Maf_Provisioning_PolicyTemplates.yaml b/TS26510_Maf_Provisioning_PolicyTemplates.yaml index 29fec7a..2949439 100644 --- a/TS26510_Maf_Provisioning_PolicyTemplates.yaml +++ b/TS26510_Maf_Provisioning_PolicyTemplates.yaml @@ -39,7 +39,7 @@ paths: operationId: createPolicyTemplate summary: 'Create and upload a new Policy Template for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - policy-template-create requestBody: description: 'A JSON representation of a Policy Template' @@ -98,7 +98,7 @@ paths: operationId: retrievePolicyTemplate summary: 'Retrieve a representation of an existing Policy Template in the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - policy-template-read responses: '200': # OK @@ -129,7 +129,7 @@ paths: operationId: updatePolicyTemplate summary: 'Update a Policy Template for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - policy-template-put requestBody: description: 'A JSON representation of a Policy Template' @@ -175,7 +175,7 @@ paths: operationId: patchPolicyTemplate summary: 'Patch the Policy Template for the specified Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - policy-template-patch requestBody: description: 'A JSON representation of a Policy Template' @@ -223,7 +223,7 @@ paths: delete: operationId: destroyPolicyTemplate security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - policy-template-delete responses: '204': # No Content diff --git a/TS26510_Maf_Provisioning_ProvisioningSessions.yaml b/TS26510_Maf_Provisioning_ProvisioningSessions.yaml index 6f5fd03..e8024fb 100644 --- a/TS26510_Maf_Provisioning_ProvisioningSessions.yaml +++ b/TS26510_Maf_Provisioning_ProvisioningSessions.yaml @@ -32,7 +32,7 @@ paths: operationId: createProvisioningSession summary: 'Create a new Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - provisioning-sessions-create requestBody: description: 'A JSON representation of a Provisioning Session.' @@ -85,7 +85,7 @@ paths: operationId: getProvisioningSessionById summary: 'Retrieve an existing Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - provisioning-sessions-read responses: '200': @@ -116,7 +116,7 @@ paths: operationId: destroyProvisioningSession summary: 'Destroy an existing Provisioning Session' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - provisioning-sessions-delete responses: '204': # No Content diff --git a/TS26510_Maf_Provisioning_ServerCertificates.yaml b/TS26510_Maf_Provisioning_ServerCertificates.yaml index c256f6a..215e1e6 100644 --- a/TS26510_Maf_Provisioning_ServerCertificates.yaml +++ b/TS26510_Maf_Provisioning_ServerCertificates.yaml @@ -40,7 +40,7 @@ paths: summary: 'Create or reserve a Service Certificate resource' description: 'Without the optional csr query parameter, an X.509 certificate is generated and this is returned. If the csr query parameter is present, a Certificate Signing Request is instead generated and returned, allowing the X.509 certificate to be generated by the invoker and later uploaded.' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - certificates-csr-request parameters: - in: query @@ -106,7 +106,7 @@ paths: operationId: uploadServerCertificate summary: "Upload the X.509 certificate for a previously reserved Server Certificate resource" security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - certificates-upload requestBody: required: true @@ -145,7 +145,7 @@ paths: operationId: retrieveServerCertificate summary: 'Retrieve the X.509 certificate representation of the specified Server Certificate resource' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - certificates-retrieve responses: '200': @@ -178,7 +178,7 @@ paths: operationId: destroyServerCertificate summary: 'Destroy an existing Server Certificate resource' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - certificates-delete responses: '204': # No Content diff --git a/TS26510_Maf_SessionHandling_ConsumptionReporting.yaml b/TS26510_Maf_SessionHandling_ConsumptionReporting.yaml index b582105..c905c8d 100644 --- a/TS26510_Maf_SessionHandling_ConsumptionReporting.yaml +++ b/TS26510_Maf_SessionHandling_ConsumptionReporting.yaml @@ -40,7 +40,7 @@ paths: operationId: submitConsumptionReport summary: 'Submit a Consumption Report' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - consumption-reporting-create - oAuth2AuthorizationCode: - consumption-reporting-create @@ -79,7 +79,7 @@ paths: components: securitySchemes: - oAuth2ClientCredentials: + OAuth2ClientCredentials: type: oauth2 flows: clientCredentials: diff --git a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml index 52699a4..c4fdc10 100644 --- a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml +++ b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml @@ -32,7 +32,7 @@ paths: operationId: createDynamicPolicy summary: 'Create (and optionally upload) a new Dynamic Policy resource' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - dynamic-policy-create - oAuth2AuthorizationCode: - dynamic-policy-create @@ -88,7 +88,7 @@ paths: operationId: retrieveDynamicPolicy summary: 'Retrieve an existing Dynamic Policy resource' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - dynamic-policy-read - oAuth2AuthorizationCode: - dynamic-policy-read @@ -121,7 +121,7 @@ paths: operationId: updateDynamicPolicy summary: 'Update an existing Dynamic Policy resource' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - metrics-reporting-put - oAuth2AuthorizationCode: - metrics-reporting-put @@ -169,7 +169,7 @@ paths: operationId: patchDynamicPolicy summary: 'Patch an existing Dynamic Policy resource' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - dynamic-policy-patch - oAuth2AuthorizationCode: - dynamic-policy-patch @@ -220,7 +220,7 @@ paths: operationId: destroyDynamicPolicy summary: 'Destroy an existing Dynamic Policy resource' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - dynamic-policy-delete - oAuth2AuthorizationCode: - dynamic-policy-delete @@ -248,7 +248,7 @@ paths: components: securitySchemes: - oAuth2ClientCredentials: + OAuth2ClientCredentials: type: oauth2 flows: clientCredentials: diff --git a/TS26510_Maf_SessionHandling_MetricsReporting.yaml b/TS26510_Maf_SessionHandling_MetricsReporting.yaml index b37c932..415f936 100644 --- a/TS26510_Maf_SessionHandling_MetricsReporting.yaml +++ b/TS26510_Maf_SessionHandling_MetricsReporting.yaml @@ -46,7 +46,7 @@ paths: operationId: submitMetricsReport summary: 'Submit a Metrics Report' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - metrics-reporting-create - oAuth2AuthorizationCode: - metrics-reporting-create @@ -89,7 +89,7 @@ paths: components: securitySchemes: - oAuth2ClientCredentials: + OAuth2ClientCredentials: type: oauth2 flows: clientCredentials: diff --git a/TS26510_Maf_SessionHandling_NetworkAssistance.yaml b/TS26510_Maf_SessionHandling_NetworkAssistance.yaml index 30c867f..e8d64ab 100644 --- a/TS26510_Maf_SessionHandling_NetworkAssistance.yaml +++ b/TS26510_Maf_SessionHandling_NetworkAssistance.yaml @@ -33,7 +33,7 @@ paths: operationId: createNetworkAssistanceSession summary: 'Create a new Network Assistance Session.' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - network-assistance-create - oAuth2AuthorizationCode: - network-assistance-create @@ -89,7 +89,7 @@ paths: operationId: retrieveNetworkAssistanceSession summary: 'Retrieve an existing Network Assistance Session resource' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - network-assistance-get - oAuth2AuthorizationCode: - network-assistance-get @@ -122,7 +122,7 @@ paths: operationId: updateNetworkAssistanceSession summary: 'Update an existing Network Assistance Session resource' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - network-assistance-put - oAuth2AuthorizationCode: - network-assistance-put @@ -170,7 +170,7 @@ paths: operationId: patchNetworkAssistanceSession summary: 'Patch an existing Network Assistance Session resource' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - network-assistance-patch - oAuth2AuthorizationCode: - network-assistance-patch @@ -221,7 +221,7 @@ paths: operationId: destroyNetworkAssistanceSession summary: 'Destroy an existing Network Assistance Session resource' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - network-assistance-delete - oAuth2AuthorizationCode: - network-assistance-delete @@ -252,7 +252,7 @@ paths: operationId: requestBitRateRecommendation summary: 'Obtain a bit rate recommendation for the next recommendation window' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - network-assistance-getrec - oAuth2AuthorizationCode: - network-assistance-getrec @@ -293,7 +293,7 @@ paths: operationId: requestDeliveryBoost summary: 'Request a delivery boost' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - network-assistance-boost - oAuth2AuthorizationCode: - network-assistance-boost @@ -334,7 +334,7 @@ paths: components: securitySchemes: - oAuth2ClientCredentials: + OAuth2ClientCredentials: type: oauth2 flows: clientCredentials: diff --git a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml index 66d2367..43a7bf0 100644 --- a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml +++ b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml @@ -40,7 +40,7 @@ paths: operationId: retrieveServiceAccessInformation summary: 'Retrieve the Service Access Information resource' security: - - oAuth2ClientCredentials: + - OAuth2ClientCredentials: - service-access-information-read - oAuth2AuthorizationCode: - service-access-information-read @@ -72,7 +72,7 @@ paths: components: securitySchemes: - oAuth2ClientCredentials: + OAuth2ClientCredentials: type: oauth2 flows: clientCredentials: -- GitLab From 7b08adf96ed0a014dc8f7edde789f6ac96f6fdf3 Mon Sep 17 00:00:00 2001 From: Thorsten Date: Wed, 31 Jan 2024 15:16:07 +0100 Subject: [PATCH 06/10] Removal of security configuration from root. --- TS26512_Maf_Provisioning.yaml | 13 ------------- TS26512_Maf_SessionHandling.yaml | 20 -------------------- 2 files changed, 33 deletions(-) diff --git a/TS26512_Maf_Provisioning.yaml b/TS26512_Maf_Provisioning.yaml index 1bf38a1..01f387f 100755 --- a/TS26512_Maf_Provisioning.yaml +++ b/TS26512_Maf_Provisioning.yaml @@ -22,19 +22,6 @@ servers: default: https://example.com description: See 3GPP TS 29.512 clause 6.1. -security: - - {} - - OAuth2ClientCredentials: [] - -components: - securitySchemes: - OAuth2ClientCredentials: - type: oauth2 - flows: - clientCredentials: - tokenUrl: '{tokenUrl}' - scopes: {} - paths: # Provisioning Sessions API /provisioning-sessions: diff --git a/TS26512_Maf_SessionHandling.yaml b/TS26512_Maf_SessionHandling.yaml index 47b79d9..0ecc26f 100755 --- a/TS26512_Maf_SessionHandling.yaml +++ b/TS26512_Maf_SessionHandling.yaml @@ -22,26 +22,6 @@ servers: default: https://example.com description: See 3GPP TS 29.512 clause 6.1. -security: - - {} - - OAuth2ClientCredentials: [] - - OAuth2AuthorizationCode: [] - -components: - securitySchemes: - OAuth2ClientCredentials: - type: oauth2 - flows: - clientCredentials: - tokenUrl: '{tokenUrl}' - scopes: {} - OAuth2AuthorizationCode: - type: oauth2 - flows: - authorizationCode: - authorizationUrl: '{authorizationUrl}' - tokenUrl: '{tokenUrl}' - scopes: {} paths: # Service Access Information API -- GitLab From 97346b19fe9b37d2a5b59b5aa78cb53a1d12ec6a Mon Sep 17 00:00:00 2001 From: Richard Bradbury Date: Mon, 19 Feb 2024 16:50:13 +0000 Subject: [PATCH 07/10] 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 08/10] . --- 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 09/10] 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 10/10] 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