Merge branch 'release/2.8'

Conflicts: composer.json composer.lock
OpenConext · Mar 15, 2018 · 49fbee6 · 49fbee6
2 parents b97a6b7 + f6f0356
commit 49fbee6
Show file tree

Hide file tree

Showing 42 changed files with 1,600 additions and 935 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -34,6 +34,7 @@ public function registerBundles()
             new Surfnet\StepupRa\SamlStepupProviderBundle\SurfnetStepupRaSamlStepupProviderBundle(),
             new Nelmio\SecurityBundle\NelmioSecurityBundle(),
             new Mopa\Bundle\BootstrapBundle\MopaBootstrapBundle(),
+            new OpenConext\MonitorBundle\OpenConextMonitorBundle(),
             new Surfnet\StepupMiddlewareClientBundle\SurfnetStepupMiddlewareClientBundle(),
             new Surfnet\SamlBundle\SurfnetSamlBundle(),
             new Surfnet\StepupBundle\SurfnetStepupBundle(),
@@ -43,6 +44,7 @@ public function registerBundles()
             // Replace with Pagerfanta https://www.pivotaltracker.com/story/show/89688680
             new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(),
             new Surfnet\StepupU2fBundle\SurfnetStepupU2fBundle(),
+            new EE\DataExporterBundle\EEDataExporterBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {

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="2017-06-15T15:47:57Z" source-language="en" target-language="en_GB" datatype="plaintext" original="not.available">
+  <file date="2018-03-12T10:12:27Z" 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>
@@ -18,6 +18,10 @@
         <source>middleware_client.dto.configuration.use_ra_locations.must_be_boolean</source>
         <target>Use RA locations option must be boolean.</target>
       </trans-unit>
+      <trans-unit id="77ed46e12521792cd4b8d2040443b43b6df3dc25" resname="middleware_client.dto.configuration.verify_email.must_be_boolean">
+        <source>middleware_client.dto.configuration.verify_email.must_be_boolean</source>
+        <target state="new">middleware_client.dto.configuration.verify_email.must_be_boolean</target>
+      </trans-unit>
       <trans-unit id="f033a6177f4f371fbc302f07a6b8c67ec8b46549" resname="middleware_client.dto.identity.common_name.must_be_string">
         <source>middleware_client.dto.identity.common_name.must_be_string</source>
         <target>Remote identity common name must be a string.</target>
@@ -418,10 +422,6 @@
         <source>ra.search_ra_second_factors.status.invalid_choice</source>
         <target>Cannot filter by given status.</target>
       </trans-unit>
-      <trans-unit id="35adfd1c62274a4757400abb4c2cb8a4d7d295c6" resname="ra.search_ra_second_factors.type.invalid_choice">
-        <source>ra.search_ra_second_factors.type.invalid_choice</source>
-        <target>Cannot filter by given token type.</target>
-      </trans-unit>
       <trans-unit id="25f28c755234f7056ca31e9a493447c1f328fbfd" resname="ra.start_vetting_procedure.registration_code.may_not_be_empty">
         <source>ra.start_vetting_procedure.registration_code.may_not_be_empty</source>
         <target>Please enter the registration code the user has received by e-mail</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="2017-06-15T15:47:50Z" source-language="en" target-language="nl_NL" datatype="plaintext" original="not.available">
+  <file date="2018-03-12T10:12:23Z" 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>
@@ -16,9 +16,13 @@
       </trans-unit>
       <trans-unit id="53ef4f54259698cee5e0aaba2d7f20417cd8e9fb" resname="middleware_client.dto.configuration.use_ra_locations.must_be_boolean">
         <source>middleware_client.dto.configuration.use_ra_locations.must_be_boolean</source>
-        <target>Use RA locations option must be boolean.
+        <target xml:space="preserve">Use RA locations option must be boolean.
 </target>
       </trans-unit>
+      <trans-unit id="77ed46e12521792cd4b8d2040443b43b6df3dc25" resname="middleware_client.dto.configuration.verify_email.must_be_boolean">
+        <source>middleware_client.dto.configuration.verify_email.must_be_boolean</source>
+        <target state="new">middleware_client.dto.configuration.verify_email.must_be_boolean</target>
+      </trans-unit>
       <trans-unit id="f033a6177f4f371fbc302f07a6b8c67ec8b46549" resname="middleware_client.dto.identity.common_name.must_be_string">
         <source>middleware_client.dto.identity.common_name.must_be_string</source>
         <target>Remote identity common name must be a string.</target>
@@ -419,10 +423,6 @@
         <source>ra.search_ra_second_factors.status.invalid_choice</source>
         <target>Kan niet filteren op de opgegeven status.</target>
       </trans-unit>
-      <trans-unit id="35adfd1c62274a4757400abb4c2cb8a4d7d295c6" resname="ra.search_ra_second_factors.type.invalid_choice">
-        <source>ra.search_ra_second_factors.type.invalid_choice</source>
-        <target>Kan niet filteren op het opgegeven tokentype.</target>
-      </trans-unit>
       <trans-unit id="25f28c755234f7056ca31e9a493447c1f328fbfd" resname="ra.start_vetting_procedure.registration_code.may_not_be_empty">
         <source>ra.start_vetting_procedure.registration_code.may_not_be_empty</source>
         <target>Typ hier de registratiecode die de gebruiker per e-mail heeft ontvangen.</target>

diff --git a/app/config/routing.yml b/app/config/routing.yml
@@ -3,6 +3,10 @@ nelmio_security_report:
     defaults: { _controller: nelmio_security.csp_reporter_controller:indexAction }
     methods: [POST]
 
+openconext_monitor:
+    resource: "@OpenConextMonitorBundle/Resources/config/routing.yml"
+    prefix: /
+
 surfnet_stepup_ra_ra:
     resource: "@SurfnetStepupRaRaBundle/Resources/config/routing.yml"
 

diff --git a/app/config/samlstepupproviders.yml b/app/config/samlstepupproviders.yml
@@ -19,6 +19,7 @@ surfnet_stepup_ra_saml_stepup_provider:
                 sso_url: %gssp_tiqr_remote_sso_url%
                 certificate: %gssp_tiqr_remote_certificate%
             view_config:
+                title: %gssp_tiqr_title%
                 page_title: %gssp_tiqr_page_title%
                 explanation: %gssp_tiqr_explanation%
                 initiate: %gssp_tiqr_initiate%
@@ -36,6 +37,7 @@ surfnet_stepup_ra_saml_stepup_provider:
                 sso_url: %gssp_biometric_remote_sso_url%
                 certificate: %gssp_biometric_remote_certificate%
             view_config:
+                title: %gssp_biometric_title%
                 page_title: %gssp_biometric_page_title%
                 explanation: %gssp_biometric_explanation%
                 initiate: %gssp_biometric_initiate%

diff --git a/app/config/samlstepupproviders_parameters.yml.dist b/app/config/samlstepupproviders_parameters.yml.dist
@@ -6,6 +6,9 @@ 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_title:
+        en_GB: 'Tiqr'
+        nl_NL: 'Tiqr'
     gssp_tiqr_page_title:
         en_GB: 'EN ra.vetting.gssf.initiate.tiqr.title.page'
         nl_NL: 'NL ra.vetting.gssf.initiate.tiqr.title.page'
@@ -25,6 +28,9 @@ parameters:
     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_title:
+        en_GB: 'Biometric'
+        nl_NL: 'Biometrisch'
     gssp_biometric_page_title:
         en_GB: 'EN ra.vetting.gssf.initiate.biometric.title.page'
         nl_NL: 'NL ra.vetting.gssf.initiate.biometric.title.page'

diff --git a/app/config/security.yml b/app/config/security.yml
@@ -12,6 +12,10 @@ security:
             pattern: ^/authentication/(metadata|session-expired)$
             anonymous: ~
 
+        monitor:
+            pattern: ^/(info|health)$
+            security: false
+
         saml_based:
             saml: true
             logout:

diff --git a/composer.json b/composer.json
@@ -21,20 +21,21 @@
         "mopa/bootstrap-bundle": "3.0.0-RC2",
         "twbs/bootstrap": "~3.2.0",
         "fortawesome/font-awesome": "~4.2.0",
-        "jms/translation-bundle": "~1.1.0",
+        "jms/translation-bundle": "~1.3.0",
         "jms/di-extra-bundle": "~1.4.0",
         "surfnet/stepup-middleware-client-bundle": "^2.0",
-        "surfnet/stepup-saml-bundle": "^2.5",
-        "surfnet/stepup-bundle": "^3.0",
+        "surfnet/stepup-bundle": "^3.2",
         "surfnet/stepup-u2f-bundle": "dev-develop",
         "guzzlehttp/guzzle": "^6",
         "knplabs/knp-paginator-bundle": "~2.4",
         "mopa/composer-bridge": "~1.5",
-        "ramsey/uuid": "^3.5"
+        "ramsey/uuid": "^3.5",
+        "ee/dataexporter-bundle": "^0.4.2",
+        "openconext/monitor-bundle": "^1.0",
+        "surfnet/stepup-saml-bundle": "^3.0"
     },
     "require-dev": {
         "sensio/generator-bundle": "~2.3",
-        "liip/rmt": "1.1.*",
         "matthiasnoback/symfony-config-test": "^1.2",
         "mockery/mockery": "^0.9.5",
         "phpmd/phpmd": "^2.0",