Merge branch 'release/2.4'

.travis.yml

@@ -5,15 +5,14 @@ addons:
     packages:
       - ant
 php:
-  - 5.6
   - 7.2
   - 7.3
-
+  - 7.4
 
 matrix:
   allow_failures:
-    - php: 7.2
     - php: 7.3
+    - php: 7.4
 
 cache:
   directories:
@@ -36,4 +35,5 @@ script:
 branches:
   only:
     - develop
-    - master
+    - master
+    - feature/php72-support

CHANGELOG.md

@@ -1,3 +1,22 @@
+## 2.4.0
+
+**Feature**
+* Make SP Dashboard PHP 7.2 compatible
+
+**Bugfix**
+* Upgrade Stepup-saml-bundle to version 4.1.8 #309
+* Resolve certificate publication issue #324
+
+**Security updates**
+* Symfony to 3.4.36 
+* Handlebars to 4.5.3
+* Mixin-deep to 1.3.2
+
+## 2.3.3
+
+This is a security release that will harden the application against CVE 2019-3465
+* Upgrade xmlseclibs to version 3.0.4 #318
+
 ## 2.3.2
 
 **Feature**

ansible/roles/spdashboard/tasks/main.yml

@@ -34,7 +34,7 @@
 - name: php-fpm config
   template:
     src: '{{ item }}.j2'
-    dest: /etc/php-fpm.d/{{ item }}
+    dest: /etc/opt/remi/php72/php-fpm.d/{{ item }}
   with_items:
      - spdashboard-pool.conf
   notify:

ansible/roles/spdashboard/tasks/spdashboardvm.yml

@@ -26,12 +26,12 @@
   when: ca_update.changed
 
 - name: Install PHP Xdebug extension
-  yum: name=php-pecl-xdebug state=present
+  yum: name=php72-php-pecl-xdebug state=present
 
 - name: Configure PHP Xdebug
   template: src=xdebug.ini.j2 dest=/etc/php.d/15-xdebug.ini
   notify:
-    - restart php-fpm
+    - restart php72-php-fpm
 
 - name: Add hosts file
   lineinfile:

ansible/roles/spdashboard/templates/spdashboard-pool.conf.j2

@@ -11,7 +11,7 @@
 ; Note: This value is mandatory.
 
 ; Use unix socket
-listen = /var/run/php-fpm/spdashboard-pool.sock
+listen = /var/run/php-fpm/spdashboard-pool-72.sock
 ; Set listen(2) backlog. A value of '-1' means unlimited.
 ; Default Value: -1
 ;listen.backlog = -1

ansible/roles/spdashboard/templates/spdashboard.conf.j2

@@ -32,7 +32,7 @@ Listen {{ apache_app_listen_address.spdashboard }}:{{ loadbalancing.spdashboard.
 {% endif %}
 
     # Proxy the requests to FPM
-    ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/var/run/php-fpm/spdashboard-pool.sock|fcgi://localhost/{{ spdashboard_document_root }}/$1
+    ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/var/run/php-fpm/spdashboard-pool-72.sock|fcgi://localhost/{{ spdashboard_document_root }}/$1
 
     ErrorLog "|/usr/bin/logger -p local3.err  -t 'Apache-DASHBOARD'"
     CustomLog "|/usr/bin/logger -p local3.info  -t 'Apache-DASHBOARD'" combined

ansible/roles/spdashboard/templates/xdebug.ini.j2

@@ -1,4 +1,4 @@
-zend_extension = /usr/lib64/php/modules/xdebug.so
+zend_extension = xdebug.so
 
 xdebug.remote_enable = 1
 xdebug.remote_connect_back = 1

app/AppKernel.php

@@ -49,7 +49,12 @@ public function getRootDir()
 
     public function getCacheDir()
     {
-        return dirname(__DIR__).'/var/cache/'.$this->getEnvironment();
+        $env = $this->getEnvironment();
+        // For test and dev, use a cache folder outside the project folder.
+        if ($env === 'dev' || $env === 'test') {
+            return '/tmp/sp-dashboard/' . $env;
+        }
+        return dirname(__DIR__).'/var/cache/'.$env;
     }
 
     public function getLogDir()

app/js/application.js

@@ -1,6 +1,5 @@
 'use strict';
 
-import 'jquery';
 import './type_definitions.ts';
 import './components/form.ts';
 import './components/service_switcher.js';

app/js/components/collection_widget.ts

@@ -86,7 +86,7 @@ class CollectionWidget {
    * Remove the collection entry from the list
    * @param el
    */
-  private removeCollectionEntry(el: JQuery.Event) {
+  private removeCollectionEntry(el: JQuery.TriggeredEvent) {
     const element = $(el.target);
 
     element.closest('.collection-entry').remove();
@@ -109,7 +109,7 @@ class CollectionWidget {
    * @param $removeEntryButton
    */
   private registerRemoveClickHandler($removeEntryButton: JQuery<HTMLElement>) {
-    const handleRemoveClick = (el: JQuery.Event) => {
+    const handleRemoveClick = (el: JQuery.TriggeredEvent) => {
       this.removeCollectionEntry(el);
     };
     $removeEntryButton.on('click', handleRemoveClick);

app/js/components/modal.ts

@@ -10,7 +10,7 @@ if ($('#oidc-published-popup').length) {
   $('#oidc-published-popup').modal();
 }
 
-$('a[rel="modal:secret"]').on('click', (el: JQuery.Event) => {
+$('a[rel="modal:secret"]').on('click', (el: JQuery.TriggeredEvent) => {
   const href = $(el.target).data('url');
   $('#reset-secret-confirmation-link').attr('href', href);
   $('#reset-secret-confirmation').modal();

app/js/components/service_edit_attribute.js

@@ -1,4 +1,5 @@
 'use strict';
+import $ from 'jquery';
 
 $(document).ready(function() {
     function enableOrDisableAttributeField() {

app/js/components/service_switcher.js

@@ -1,6 +1,6 @@
 'use strict';
-
-require('../../../node_modules/jquery-mousewheel/jquery.mousewheel.js');
+import $ from 'jquery';
+require('../../../node_modules/jquery.mousewheel/jquery.mousewheel.js');
 require('../../../node_modules/select2/dist/js/select2.js');
 
 $(document).ready(function() {

app/js/components/validation.js

@@ -1,4 +1,5 @@
-import 'parsleyjs';
+import Parsley from 'parsleyjs';
+import $ from 'jquery';
 
 // Configure Parsley
 const parsleyConfig = {