Merge branch '1.x' into 2.x

# Conflicts: # DependencyInjection/Configuration.php # Tests/DependencyInjection/HslavichOneloginSamlExtensionTest.php
hslavich · Nov 1, 2021 · b73c76a · b73c76a
2 parents a0a57c5 + 7245edd
commit b73c76a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -66,16 +66,19 @@ hslavich_onelogin_saml:
     strict: true
     debug: true    
     security:
-        nameIdEncrypted:       false
-        authnRequestsSigned:   false
-        logoutRequestSigned:   false
-        logoutResponseSigned:  false
-        wantMessagesSigned:    false
-        wantAssertionsSigned:  false
-        wantNameIdEncrypted:   false
+        nameIdEncrypted: false
+        authnRequestsSigned: false
+        logoutRequestSigned: false
+        logoutResponseSigned: false
+        wantMessagesSigned: false
+        wantAssertionsSigned: false
+        wantNameIdEncrypted: false
         requestedAuthnContext: true
         signMetadata: false
         wantXMLValidation: true
+        relaxDestinationValidation: false
+        destinationStrictlyMatches: true
+        rejectUnsolicitedResponsesWithInResponseTo: false
         signatureAlgorithm: 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256'
         digestAlgorithm: 'http://www.w3.org/2001/04/xmlenc#sha256'
     contactPerson:

diff --git a/Tests/DependencyInjection/Fixtures/full.yaml b/Tests/DependencyInjection/Fixtures/full.yaml
@@ -28,20 +28,21 @@ hslavich_onelogin_saml:
     baseurl: 'http://myapp.com/app_dev.php/saml/'
     debug: false
     security:
-        nameIdEncrypted:       false
-        authnRequestsSigned:   false
-        logoutRequestSigned:   false
-        logoutResponseSigned:  false
-        wantMessagesSigned:    false
-        wantAssertionsSigned:  false
-        wantNameIdEncrypted:   false
+        nameIdEncrypted: false
+        authnRequestsSigned: false
+        logoutRequestSigned: false
+        logoutResponseSigned: false
+        wantMessagesSigned: false
+        wantAssertionsSigned: false
+        wantNameIdEncrypted: false
         requestedAuthnContext: true
         signMetadata: false
         wantXMLValidation: false
         relaxDestinationValidation: false
         destinationStrictlyMatches: true
         rejectUnsolicitedResponsesWithInResponseTo: false
         signatureAlgorithm: 'http://www.w3.org/2000/09/xmldsig#rsa-sha1'
+        digestAlgorithm: 'http://www.w3.org/2001/04/xmlenc#sha256'
     contactPerson:
         technical:
             givenName: 'Tech User'

diff --git a/Tests/DependencyInjection/HslavichOneloginSamlExtensionTest.php b/Tests/DependencyInjection/HslavichOneloginSamlExtensionTest.php
@@ -58,10 +58,11 @@ public function testLoadSecuritySettings(): void
         self::assertTrue($settings['security']['requestedAuthnContext']);
         self::assertFalse($settings['security']['signMetadata']);
         self::assertFalse($settings['security']['wantXMLValidation']);
-        self::assertEquals('http://www.w3.org/2000/09/xmldsig#rsa-sha1', $settings['security']['signatureAlgorithm']);       
         self::assertFalse($settings['security']['relaxDestinationValidation']);
         self::assertTrue($settings['security']['destinationStrictlyMatches']);
         self::assertFalse($settings['security']['rejectUnsolicitedResponsesWithInResponseTo']);
+        self::assertEquals('http://www.w3.org/2000/09/xmldsig#rsa-sha1', $settings['security']['signatureAlgorithm']);
+        self::assertEquals('http://www.w3.org/2001/04/xmlenc#sha256', $settings['security']['digestAlgorithm']);
     }
 
     public function testLoadBasicSettings(): void