Merge remote-tracking branch 'origin/release/2.9'

OpenConext · Apr 19, 2018 · 48492cd · 48492cd
2 parents 1ea292c + ffef1a7
commit 48492cd
Show file tree

Hide file tree

Showing 33 changed files with 914 additions and 491 deletions.
diff --git a/app/Resources/SurfnetStepupBundle/views/Exception/error.html.twig b/app/Resources/SurfnetStepupBundle/views/Exception/error.html.twig
diff --git a/app/Resources/SurfnetStepupBundle/views/Exception/error404.html.twig b/app/Resources/SurfnetStepupBundle/views/Exception/error404.html.twig
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/views/base.html.twig b/app/Resources/views/base.html.twig
@@ -22,9 +22,8 @@
     {% endblock header %}
         {% block page_header %}
             <div class="page-header clearfix">
-                <img src="/images/SURFconext.png" class="pull-right logo" alt="SURFconext">
+                <img src="/images/header-logo.png" class="pull-right logo" alt="OpenConext Stepup">
                 <h1>{{ 'app.name'|trans }}</h1>
-                <h2>{{ 'app.subname'|trans }}</h2>
             </div>
         {% if app.user %}
             <div class="clearfix page-header-user">

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -35,7 +35,7 @@ framework:
 twig:
     debug:            "%kernel.debug%"
     strict_variables: "%kernel.debug%"
-    exception_controller:  SurfnetStepupBundle:Exception:show
+    exception_controller: SurfnetStepupSelfServiceSelfServiceBundle:Exception:show
     globals:
         global_view_parameters: "@self_service.service.global_view_parameters"
 
@@ -67,27 +67,6 @@ nelmio_security:
         # Content types: default, script, object, style, img, media, frame, font, connect
         default: [ self ]
 
-monolog:
-    handlers:
-        main:
-            type: group
-            members:
-                - main_graylog
-                - main_logfile
-        main_graylog:
-            type: buffer
-            handler: graylog
-            level: NOTICE
-        main_logfile:
-            type: stream
-            handler: logfile
-            level: NOTICE
-            path: %kernel.logs_dir%/%kernel.environment%.log
-        graylog:
-            type: gelf
-            publisher: { hostname: %graylog_hostname% }
-            formatter: surfnet_stepup.monolog.full_message_exception_gelf_message_formatter
-
 mopa_bootstrap:
     form:
         show_legend: false
@@ -114,6 +93,8 @@ surfnet_stepup_middleware_client:
 
 surfnet_saml:
     hosted:
+        attribute_dictionary:
+            ignore_unknown_attributes: true
         service_provider:
             enabled: true
             assertion_consumer_route: selfservice_serviceprovider_consume_assertion
@@ -165,7 +146,6 @@ jms_translation:
             extractors: []
 
 surfnet_stepup_self_service_self_service:
-    max_number_of_tokens: %number_of_tokens_per_identity%
     enabled_second_factors: %enabled_second_factors%
     enabled_generic_second_factors: %enabled_generic_second_factors%
     second_factor_test_identity_provider:

diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
@@ -11,45 +11,27 @@ web_profiler:
     toolbar: "%debug_toolbar%"
     intercept_redirects: "%debug_redirects%"
 
-# Be careful not to remove the prod-signaler handler, which overwrites
-# the prod-signaler handler defined in logging.yml. The handler defined
-# in logging.yml disables bubbling which means that none of the handlers
-# below are invoked. Since the current dev setup is incompatible with the
-# prod setup defined in logging.yml, this means we won't see any logs in
-# the infrastructure currently used (graylog). Overwriting the handler
-# here resolves that and reinstates the dev logging setup.
-#
-# this configuration must be replaced to reflect production setup
-# see https://www.pivotaltracker.com/story/show/96056010
-#
+# The monolog configuration below overwrites the in logging.yml that
+# is normally used for production.
 monolog:
     handlers:
         prod-signaler:
-            type: group
-            members:
-                - main_graylog
-                - main_logfile
-                - main_debuglog
-        main_graylog:
-            type:    buffer
-            handler: graylog
-            level:   NOTICE
-        main_logfile:
-            type:    stream
-            handler: logfile
-            level:   NOTICE
-            path:    %kernel.logs_dir%/%kernel.environment%.log
+            type: fingers_crossed
+            action_level: ERROR
+            passthru_level: DEBUG # DEV setting: this means that all message of level DEBUG or higher are always logged
+            #passthru_level: NOTICE # PROD setting this means that all message of level NOTICE or higher are always logged
+            handler: main_syslog
+            bubble: true
+        main_syslog:
+            type: syslog
+            ident: stepup-selfservice
+            facility: user
             formatter: surfnet_stepup.monolog.json_formatter
-        main_debuglog:
-            type:    stream
+        main_logfile:
+            type: stream
             handler: logfile
-            level:   DEBUG
-            path:    "%kernel.logs_dir%/%kernel.environment%.debug.log"
-            formatter: surfnet_stepup.monolog.json_formatter
-        graylog:
-            type:      gelf
-            publisher: { hostname: %graylog_hostname% }
-            formatter: surfnet_stepup.monolog.full_message_exception_gelf_message_formatter
+            level: NOTICE
+            path: %kernel.logs_dir%/%kernel.environment%.log
 
 assetic:
     use_controller: "%use_assetic_controller%"

diff --git a/app/config/global_view_parameters.yml.dist b/app/config/global_view_parameters.yml.dist
@@ -3,5 +3,5 @@
 # Strings containing '%' should be escaped by prepending '%'
 parameters:
     support_url:
-        en_GB: "https://support.surfconext.nl/faq-strong-authentication"
-        nl_NL: "https://support.surfconext.nl/faq-sterke-authenticatie"
+        en_GB: "https://support.example.org/faq-strong-authentication"
+        nl_NL: "https://support.example.org/faq-sterke-authenticatie"
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -3,7 +3,7 @@ parameters:
 
     default_locale:         en_GB
     locales:                [nl_NL, en_GB]
-    locale_cookie_domain:   surfconext.nl
+    locale_cookie_domain:   example.org
     secret:                 NotSoSecretReplaceMe!
 
     debug_toolbar:          true
@@ -32,7 +32,6 @@ parameters:
     saml_remote_idp_entity_id:
     saml_remote_idp_sso_url:
     saml_remote_idp_certificate: 'FOR CI ONLY, REPLACE WITH ACTUAL VALUE'
-    graylog_hostname: g2-dev.stepup.coin.surf.net
     asset_version: 1
 
     second_factor_test_idp_entity_id: ~
@@ -61,6 +60,3 @@ parameters:
 
     session_max_absolute_lifetime: 3600 # 1 hours * 60 minutes * 60 seconds
     session_max_relative_lifetime: 600  # 10 minutes * 60 seconds
-
-    # The maximum number of tokens each identity (person) can register.
-    number_of_tokens_per_identity: 2
diff --git a/composer.json b/composer.json
@@ -23,10 +23,10 @@
         "fortawesome/font-awesome": "~4.2.0",
         "jms/translation-bundle": "~1.3.0",
         "jms/di-extra-bundle": "~1.4.0",
-        "surfnet/stepup-middleware-client-bundle": "^2.0",
+        "surfnet/stepup-middleware-client-bundle": "^2.4",
         "guzzlehttp/guzzle": "^6",
-        "surfnet/stepup-saml-bundle": "^3.0",
-        "surfnet/stepup-bundle": "^3.2",
+        "surfnet/stepup-saml-bundle": "^4.0",
+        "surfnet/stepup-bundle": "^3.4.0",
         "surfnet/stepup-u2f-bundle": "dev-develop",
         "mopa/composer-bridge": "~1.5",
         "openconext/monitor-bundle": "^1.0",