Merge branch 'release/2.10'

.travis.yml

@@ -32,3 +32,4 @@ branches:
   only:
     - master
     - develop
+    - feature/fine-grained-authorization

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 3.0.0 FGA (fine grained authorization)
+
+The new fine grained authorization logic will allow Ra's from other institutions to accredidate RA's on behalf of another organisation. This is determined based on the institution configuration. https://github.com/OpenConext/Stepup-Deploy/wiki/rfc-fine-grained-authorization/b6852587baee698cccae7ebc922f29552420a296
+
+**Features & Bugfixes**
+The changes to SelfService in regards to the FGA changes only where to remain compatible with API changes made for Stepup-RA. No new features have been added.
+
+## 2.10.5
+**Bugfix**
+* Create a pdf base template to support local url's #168
+
 ## 2.10.4
 **Improvement**
 * Optimized the PSR-4 autoload configuration

app/Resources/views/pdf.html.twig

@@ -0,0 +1,58 @@
+{% extends 'MopaBootstrapBundle::base.html.twig' %}
+
+{% block title %}
+    {%  if block('page_title') is not empty %}{{ block('page_title') }} — {% endif %}
+    {{ 'app.name'|trans }}
+{% endblock title %}
+
+{% block head_style %}
+
+    <style type="text/css">
+        body {
+            font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+        }
+        .registration-print-options {
+            display: none !important;
+        }
+        .pull-right {
+            float: right;
+        }
+        .clearfix {
+            float: none;
+        }
+        .page-header {
+            height: 100px;
+        }
+        .page-header h1 {
+            padding-top: 14px;
+        }
+    </style>
+
+{% endblock head_style %}
+{% block head_bottom %}
+{% endblock head_bottom %}
+
+{% block navbar %}
+{% endblock navbar %}
+
+    {% block header %}
+    {% endblock header %}
+
+    {% block page_header %}
+        <div class="page-header clearfix">
+            <img src="file://{{ root_path }}/../web/images/header-logo.png" class="pull-right logo" alt="OpenConext Stepup" style="width:55mm;">
+            <h1>{{ 'app.name'|trans }}</h1>
+        </div>
+    {% endblock page_header %}
+
+    {% block content_row %}
+        {% block content %}
+        {% endblock content %}
+    {% endblock content_row %}
+
+    {% block footer %}
+    {% endblock footer %}
+
+{% block foot_script %}
+
+{% endblock foot_script %}

app/config/config.yml

@@ -37,6 +37,7 @@ twig:
     exception_controller: SurfnetStepupSelfServiceSelfServiceBundle:Exception:show
     globals:
         global_view_parameters: "@self_service.service.global_view_parameters"
+        root_path: "%kernel.root_dir%"
 
 # Assetic Configuration
 assetic:

build.xml

@@ -2,7 +2,7 @@
 
 <project name="StepupSelfService-ci" default="build">
         <target name="build"
-            depends="php-lint-ci,phpmd-ci,phpcs-ci,phpcpd-ci,phpunit-ci"/>
+            depends="php-lint-ci,phpmd-ci,phpcs-ci,phpcpd-ci,phpunit-ci,security-tests"/>
 
     <target name="get-changeset.php.raw"
             description="creates a list of changed php files separated by newline">
@@ -82,4 +82,9 @@
         </exec>
     </target>
 
+    <target name="security-tests">
+        <exec executable="vendor/bin/security-checker" failonerror="true">
+            <arg line="security:check" />
+        </exec>
+    </target>
 </project>

composer.json

@@ -29,7 +29,7 @@
     "jms/translation-bundle": "~1.3.0",
     "guzzlehttp/guzzle": "^6",
     "surfnet/stepup-bundle": "~4.0",
-    "surfnet/stepup-middleware-client-bundle": "^2.4",
+    "surfnet/stepup-middleware-client-bundle": "^3.0",
     "surfnet/stepup-saml-bundle": "^4.1",
     "surfnet/stepup-u2f-bundle": "dev-develop",
     "mopa/composer-bridge": "~1.5",
@@ -42,9 +42,8 @@
     "phpmd/phpmd": "^2.6",
     "phpunit/phpunit": "^5.7",
     "sebastian/exporter": "~2.0",
-    "sensiolabs/security-checker": "^3.0",
     "sebastian/phpcpd": "^2.0",
-    "squizlabs/php_codesniffer": "^1.0",
+    "squizlabs/php_codesniffer": "^3.4",
     "symfony/phpunit-bridge": "^3.0"
   },
   "scripts": {