Merge pull request #370 from silinternational/develop

Release 6.8.2 -- added User-Agent header to MFA API client
silinternational · Sep 18, 2024 · fbe83f4 · fbe83f4
2 parents dc6fb25 + dee4e74
commit fbe83f4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @silinternational/php-devs
diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml
@@ -3,9 +3,6 @@ name: Test and Publish
 on:
   push:
 
-env:
-  IMAGE_NAME: ${{ vars.DOCKER_ORG }}/idp-id-broker
-
 jobs:
   tests:
     name: Tests
@@ -36,7 +33,11 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.IMAGE_NAME }}
+          images: ${{ vars.DOCKER_ORG }}/${{ github.event.repository.name }}
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:

diff --git a/api.raml b/api.raml
@@ -343,6 +343,11 @@ types:
       }
 /authentication:
   post:
+    queryParameters:
+      rpOrigin:
+        description: relying party origin
+        type: string
+        example: "https://sub.domain.com"
     body:
       type: Authentication
     responses:
@@ -359,6 +364,10 @@ types:
           authentication failed).
         body:
           type: Error
+      403:
+        description: The rpOrigin does not match any of the configured values.
+        body:
+          type: Error
       410:
         description: >
           The invite has expired. A new code has been generated and emailed

diff --git a/application/common/components/MfaApiClient.php b/application/common/components/MfaApiClient.php
@@ -3,8 +3,8 @@
 namespace common\components;
 
 use GuzzleHttp\Client as GuzzleClient;
-use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\ServerException;
 use Psr\Http\Message\ResponseInterface;
@@ -55,6 +55,7 @@ public function __construct(string $apiBaseUrl, $apiKey, $apiSecret)
             'X-MFA-APIKey' => $apiKey,
             'X-MFA-APISecret' => $apiSecret,
             'Content-type' => 'application/json',
+            'User-Agent' => 'idp-id-broker',
         ];
 
         $this->client = new GuzzleClient([
@@ -118,7 +119,6 @@ public function validateTotp(string $uuid, string $code): bool
     }
 
 
-
     /**
      * @param array $additionalHeaders
      * @return array