Merge pull request #125 from OpenConext/feature/gssp-add-through-conf…

…iguration Feature/gssp add through configuration
OpenConext · Jul 10, 2017 · e7a7586 · e7a7586
2 parents 6cc0f02 + 7a97e37
commit e7a7586
Show file tree

Hide file tree

Showing 26 changed files with 813 additions and 358 deletions.
diff --git a/app/Resources/translations/messages.en_GB.xliff b/app/Resources/translations/messages.en_GB.xliff
diff --git a/app/Resources/translations/messages.nl_NL.xliff b/app/Resources/translations/messages.nl_NL.xliff
diff --git a/app/Resources/translations/validators.en_GB.xliff b/app/Resources/translations/validators.en_GB.xliff
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2016-08-10T17:11:04Z" source-language="en" target-language="en_GB" datatype="plaintext" original="not.available">
+  <file date="2017-05-30T16:11:35Z" source-language="en" target-language="en_GB" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -78,6 +78,10 @@
         <source>Sign request version must be a string</source>
         <target>Sign request version must be a string</target>
       </trans-unit>
+      <trans-unit id="9fe9614ee06100ffa9474b193d1aec7a4c1d1334" resname="middleware_client.dto.configuration.allowed_second_factors.must_be_array">
+        <source>middleware_client.dto.configuration.allowed_second_factors.must_be_array</source>
+        <target state="new">middleware_client.dto.configuration.allowed_second_factors.must_be_array</target>
+      </trans-unit>
       <trans-unit id="e921db3beb8170142aa4dcd8c364595343b6fc64" resname="middleware_client.dto.configuration.show_raa_contact_information.must_be_boolean">
         <source>middleware_client.dto.configuration.show_raa_contact_information.must_be_boolean</source>
         <target state="new">middleware_client.dto.configuration.show_raa_contact_information.must_be_boolean</target>

diff --git a/app/Resources/translations/validators.nl_NL.xliff b/app/Resources/translations/validators.nl_NL.xliff
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2016-08-10T17:11:02Z" source-language="en" target-language="nl_NL" datatype="plaintext" original="not.available">
+  <file date="2017-05-30T16:11:31Z" source-language="en" target-language="nl_NL" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -78,6 +78,10 @@
         <source>Sign request version must be a string</source>
         <target>Sign request version must be a string</target>
       </trans-unit>
+      <trans-unit id="9fe9614ee06100ffa9474b193d1aec7a4c1d1334" resname="middleware_client.dto.configuration.allowed_second_factors.must_be_array">
+        <source>middleware_client.dto.configuration.allowed_second_factors.must_be_array</source>
+        <target state="new">middleware_client.dto.configuration.allowed_second_factors.must_be_array</target>
+      </trans-unit>
       <trans-unit id="e921db3beb8170142aa4dcd8c364595343b6fc64" resname="middleware_client.dto.configuration.show_raa_contact_information.must_be_boolean">
         <source>middleware_client.dto.configuration.show_raa_contact_information.must_be_boolean</source>
         <target state="new">middleware_client.dto.configuration.show_raa_contact_information.must_be_boolean</target>

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -162,6 +162,7 @@ jms_translation:
 
 surfnet_stepup_self_service_self_service:
     enabled_second_factors: %enabled_second_factors%
+    enabled_generic_second_factors: %enabled_generic_second_factors%
     second_factor_test_identity_provider:
         entity_id: '%second_factor_test_idp_entity_id%'
         sso_url: '%second_factor_test_idp_sso_url%'

diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -48,6 +48,11 @@ parameters:
     enabled_second_factors:
         - sms
         - yubikey
+    enabled_generic_second_factors:
+        biometric:
+            loa: 3
+        tiqr:
+            loa: 3
 
     u2f_app_id: https://gateway.tld/u2f/app-id
 

diff --git a/app/config/samlstepupproviders.yml b/app/config/samlstepupproviders.yml
@@ -18,6 +18,18 @@ surfnet_stepup_self_service_saml_stepup_provider:
                 entity_id: %gssp_tiqr_remote_entity_id%
                 sso_url: %gssp_tiqr_remote_sso_url%
                 certificate: %gssp_tiqr_remote_certificate%
+            view_config:
+                loa: %gssp_tiqr_loa%
+                logo: %gssp_tiqr_logo%
+                alt: %gssp_tiqr_alt%
+                title: %gssp_tiqr_title%
+                description: %gssp_tiqr_description%
+                button_use: %gssp_tiqr_button_use%
+                initiate_title: %gssp_tiqr_initiate_title%
+                initiate_button: %gssp_tiqr_initiate_button%
+                explanation: %gssp_tiqr_initiate_title%
+                authn_failed: %gssp_tiqr_authn_failed%
+                pop_failed: %gssp_tiqr_pop_failed%
         biometric:
             hosted:
                 service_provider:
@@ -30,3 +42,15 @@ surfnet_stepup_self_service_saml_stepup_provider:
                 entity_id: %gssp_biometric_remote_entity_id%
                 sso_url: %gssp_biometric_remote_sso_url%
                 certificate: %gssp_biometric_remote_certificate%
+            view_config:
+                loa: %gssp_biometric_loa%
+                logo: %gssp_biometric_logo%
+                alt: %gssp_biometric_alt%
+                title: %gssp_biometric_title%
+                description: %gssp_biometric_description%
+                button_use: %gssp_biometric_button_use%
+                initiate_title: %gssp_biometric_initiate_title%
+                initiate_button: %gssp_biometric_initiate_button%
+                explanation: %gssp_biometric_initiate_title%
+                authn_failed: %gssp_biometric_authn_failed%
+                pop_failed: %gssp_biometric_pop_failed%
diff --git a/app/config/samlstepupproviders_parameters.yml.dist b/app/config/samlstepupproviders_parameters.yml.dist
@@ -7,11 +7,69 @@ parameters:
     gssp_tiqr_remote_entity_id: 'https://actual-gssp.entity-id.tld'
     gssp_tiqr_remote_sso_url: 'https://actual-gssp.entity-id.tld/single-sign-on/url'
     gssp_tiqr_remote_certificate: 'The contents of the certificate published by the gssp'
+    gssp_tiqr_loa: 3
+    gssp_tiqr_logo: '/path/to/tiqr/tiqr.png'
+    gssp_tiqr_alt:
+        en_GB: 'Tiqr'
+        nl_NL: 'Tiqr'
+    gssp_tiqr_title:
+        en_GB: 'Tiqr'
+        nl_NL: 'Tiqr'
+    gssp_tiqr_description:
+        en_GB: 'Log in with a smartphone app. For all smartphones with %%tiqr_ios_link_start%%Apple iOS%%tiqr_ios_link_end%% or %%tiqr_android_link_start%%Android%%tiqr_android_link_end%%.'
+        nl_NL: 'Log in met een app op je smartphone. Geschikt voor smartphones met %%tiqr_ios_link_start%%Apple iOS%%tiqr_ios_link_end%% of %%tiqr_android_link_start%%Android%%tiqr_android_link_end%%.'
+    gssp_tiqr_button_use:
+        en_GB: 'Select'
+        nl_NL: 'Selecteer'
+    gssp_tiqr_initiate_title:
+        en_GB: 'Register with Tiqr'
+        nl_NL: 'Registreren bij Tiqr'
+    gssp_tiqr_initiate_button:
+        en_GB: 'Register with Tiqr'
+        nl_NL: 'Registreren bij Tiqr'
+    gssp_tiqr_explanation:
+        en_GB: 'Click the button below to register with Tiqr.'
+        nl_NL: 'Klik op de knop hieronder om je bij Tiqr te registreren.'
+    gssp_tiqr_authn_failed:
+        en_GB: 'Registration with Tiqr has failed. Please try again.'
+        nl_NL: 'Registratie bij Tiqr is mislukt. Probeer het nogmaals.'
+    gssp_tiqr_pop_failed:
+        en_GB: 'Registration of your token failed. Please try again.'
+        nl_NL: 'De registratie van uw token is mislukt. Probeer het nogmaals.'
 
-    gssp_biometric_sp_publickey: '/full/path/to/the/gateway-as-sp/public-key-file.cer'
-    gssp_biometric_sp_privatekey: '/full/path/to/the/gateway-as-sp/private-key-file.pem'
-    gssp_biometric_metadata_publickey: '/full/path/to/the/gateway-metadata/public-key-file.cer'
-    gssp_biometric_metadata_privatekey: '/full/path/to/the/gateway-as-sp/private-key-file.pem'
+    gssp_biometric_sp_publickey: /full/path/to/the/gateway-as-sp/public-key-file.cer
+    gssp_biometric_sp_privatekey: /full/path/to/the/gateway-as-sp/private-key-file.pem
+    gssp_biometric_metadata_publickey: /full/path/to/the/gateway-metadata/public-key-file.cer
+    gssp_biometric_metadata_privatekey: /full/path/to/the/gateway-as-sp/private-key-file.pem
     gssp_biometric_remote_entity_id: 'https://actual-gssp.entity-id.tld'
     gssp_biometric_remote_sso_url: 'https://actual-gssp.entity-id.tld/single-sign-on/url'
     gssp_biometric_remote_certificate: 'The contents of the certificate published by the gssp'
+    gssp_biometric_loa: 3
+    gssp_biometric_logo: '/images/second-factor/biometric.png'
+    gssp_biometric_alt:
+        en_GB: 'Biometric device'
+        nl_NL: 'Biometrisch apparaat'
+    gssp_biometric_title:
+        en_GB: 'Biometric device'
+        nl_NL: 'Biometrisch apparaat'
+    gssp_biometric_description:
+        en_GB: 'Log in using a biometric device.'
+        nl_NL: 'Log in met een biometrisch apparaat.'
+    gssp_biometric_button_use:
+        en_GB: 'Select'
+        nl_NL: 'Selecteer'
+    gssp_biometric_initiate_title:
+        en_GB: 'Register a biometric device'
+        nl_NL: 'Registratie biometrisch apparaat'
+    gssp_biometric_initiate_button:
+        en_GB: 'Register biometric device'
+        nl_NL: 'Registreer biometrisch apparaat'
+    gssp_biometric_explanation:
+        en_GB: 'Click the button below to register a biometric device.'
+        nl_NL: 'Klik op de knop hieronder om je biometrisch apparaat te registreren.'
+    gssp_biometric_authn_failed:
+        en_GB: 'Registration of biometric device has failed. Please try again.'
+        nl_NL: 'Registratie biometrisch apparaat is mislukt. Probeer het nogmaals.'
+    gssp_biometric_pop_failed:
+        en_GB: 'Registration of your token failed. Please try again.'
+        nl_NL: 'De registratie van uw token is mislukt. Probeer het nogmaals.'
diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
@@ -10,6 +10,7 @@
     <testsuites>
         <testsuite name="Project Test Suite">
             <directory>../src/Surfnet/StepupSelfService/SelfServiceBundle/Tests</directory>
+            <directory>../src/Surfnet/StepupSelfService/SamlStepupProviderBundle/Tests</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "surfnet/stepup-middleware-client-bundle": "^2.0",
         "guzzlehttp/guzzle": "^6",
         "surfnet/stepup-saml-bundle": "^2.5",
-        "surfnet/stepup-bundle": "^1.7",
+        "surfnet/stepup-bundle": "^2.0",
         "surfnet/stepup-u2f-bundle": "dev-develop",
         "mopa/composer-bridge": "~1.5"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/src/Surfnet/StepupSelfService/SamlStepupProviderBundle/DependencyInjection/Configuration.php b/src/Surfnet/StepupSelfService/SamlStepupProviderBundle/DependencyInjection/Configuration.php
@@ -68,6 +68,7 @@ private function addRoutesSection(ArrayNodeDefinition $rootNode)
 
     /**
      * @param ArrayNodeDefinition $rootNode
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     private function addProvidersSection(ArrayNodeDefinition $rootNode)
     {
@@ -129,6 +130,126 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
                         ->end()
                     ->end()
                 ->end()
+                ->arrayNode('view_config')
+                    ->children()
+                        ->scalarNode('loa')
+                            ->isRequired()
+                            ->info('The loa level (for now 1-3 are supported)')
+                        ->end()
+                        ->scalarNode('logo')
+                            ->isRequired()
+                            ->info('The absolute path to the logo of the gssp')
+                        ->end()
+                        ->arrayNode('alt')
+                            ->children()
+                                ->scalarNode('en_GB')
+                                    ->isRequired()
+                                    ->info('English alt text translation')
+                                ->end()
+                                ->scalarNode('nl_NL')
+                                    ->isRequired()
+                                    ->info('Dutch alt text translation')
+                                ->end()
+                            ->end()
+                        ->end()
+                        ->arrayNode('title')
+                            ->children()
+                                ->scalarNode('en_GB')
+                                    ->isRequired()
+                                    ->info('English title of the gssp')
+                                ->end()
+                                ->scalarNode('nl_NL')
+                                    ->isRequired()
+                                    ->info('Dutch title of the gssp')
+                                ->end()
+                            ->end()
+                        ->end()
+                        ->arrayNode('description')
+                            ->children()
+                                ->scalarNode('en_GB')
+                                    ->isRequired()
+                                    ->info('English description of the gssp')
+                                ->end()
+                                ->scalarNode('nl_NL')
+                                    ->isRequired()
+                                    ->info('Dutch description of the gssp')
+                                ->end()
+                            ->end()
+                        ->end()
+                        ->arrayNode('button_use')
+                            ->children()
+                                ->scalarNode('en_GB')
+                                    ->isRequired()
+                                    ->info('English text shown on the use button')
+                                ->end()
+                                ->scalarNode('nl_NL')
+                                    ->isRequired()
+                                    ->info('Dutch text shown on the use button')
+                                ->end()
+                            ->end()
+                        ->end()
+                        ->arrayNode('initiate_title')
+                            ->children()
+                                ->scalarNode('en_GB')
+                                    ->isRequired()
+                                    ->info('English initiate title text')
+                                ->end()
+                                ->scalarNode('nl_NL')
+                                    ->isRequired()
+                                    ->info('Dutch initiate title text')
+                                ->end()
+                            ->end()
+                        ->end()
+                        ->arrayNode('initiate_button')
+                            ->children()
+                                ->scalarNode('en_GB')
+                                    ->isRequired()
+                                    ->info('English initiate button text')
+                                ->end()
+                                ->scalarNode('nl_NL')
+                                    ->isRequired()
+                                    ->info('Dutch initiate button text')
+                                ->end()
+                            ->end()
+                        ->end()
+                        ->arrayNode('explanation')
+                            ->children()
+                                ->scalarNode('en_GB')
+                                    ->isRequired()
+                                    ->info('English explanation for step 2')
+                                ->end()
+                                ->scalarNode('nl_NL')
+                                    ->isRequired()
+                                    ->info('Dutch explanation for step 2')
+                                ->end()
+                            ->end()
+                        ->end()
+                        ->arrayNode('authn_failed')
+                            ->children()
+                                ->scalarNode('en_GB')
+                                    ->isRequired()
+                                    ->info('English text shown when authn request failed')
+                                ->end()
+                                ->scalarNode('nl_NL')
+                                    ->isRequired()
+                                    ->info('Dutch text shown when authn request failed')
+                                ->end()
+                            ->end()
+                        ->end()
+                        ->arrayNode('pop_failed')
+                            ->children()
+                                ->scalarNode('en_GB')
+                                    ->isRequired()
+                                    ->info('English text shown on failed proof of posession')
+                                ->end()
+                                ->scalarNode('nl_NL')
+                                    ->isRequired()
+                                    ->info('Dutch text shown on failed proof of posession')
+                                ->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
             ->end();
     }
 }