Merge pull request #260 from silinternational/develop

Release 10.0.0-alpha.6 -- update sildisco module for SSP 2

Dockerfile

@@ -59,6 +59,9 @@ COPY dockerbuild/ssp-overrides/saml20-sp-remote.php $SSP_PATH/metadata/saml20-sp
 COPY dockerbuild/config/* $SSP_PATH/config/
 COPY dockerbuild/ssp-overrides/id.php $SSP_PATH/public/id.php
 COPY dockerbuild/ssp-overrides/announcement.php $SSP_PATH/announcement/announcement.php
+COPY dockerbuild/ssp-overrides/sp-php.patch sp-php.patch
+RUN patch /data/vendor/simplesamlphp/simplesamlphp/modules/saml/src/Auth/Source/SP.php sp-php.patch
+
 COPY tests /data/tests
 
 RUN chmod a+x /data/run.sh /data/run-tests.sh

behat.yml

@@ -18,16 +18,15 @@ default:
     profilereview_features:
       paths:    [ '%paths.base%//features//profilereview.feature' ]
       contexts: [ 'ProfileReviewContext' ]
-#    sildisco_features:
-#      contexts: ['SilDiscoContext']
-#      paths:
-#        - '%paths.base%//features//Sp1Idp1Sp2Idp2Sp3.feature'
-#        - '%paths.base%//features//Sp1Idp2Sp2Sp3Idp1.feature'
-#        - '%paths.base%//features//Sp2Idp2Sp1Idp1Sp3.feature'
-#        - '%paths.base%//features//Sp2Idp2Sp1Idp2Sp3.feature'
-#        - '%paths.base%//features//Sp3Idp1Sp1Idp1Sp2Idp2.feature'
+    sildisco_features:
+      contexts: ['SilDiscoContext']
+      paths:
+        - '%paths.base%//features//Sp1Idp1Sp2Idp2Sp3.feature'
+        - '%paths.base%//features//Sp1Idp2Sp2Sp3Idp1.feature'
+        - '%paths.base%//features//Sp2Idp2Sp1Idp1Sp3.feature'
+        - '%paths.base%//features//Sp2Idp2Sp1Idp2Sp3.feature'
+        - '%paths.base%//features//Sp3Idp1Sp1Idp1Sp2Idp2.feature'
 #        - '%paths.base%//features//WwwMetadataCept.feature'
-#        - '%paths.base%//features//ZSp1Idp1BetaSp1Idp3.feature'
     status_features:
       paths:    [ '%paths.base%//features//status.feature' ]
       contexts: [ 'StatusContext' ]

development/UserPass.php

@@ -13,7 +13,6 @@
 use SimpleSAML\Error;
 use SimpleSAML\Logger;
 use SimpleSAML\Module\core\Auth\UserPassBase;
-use SimpleSAML\Utils;
 
 /**
  * Example authentication source - username & password.
@@ -23,7 +22,7 @@
  *
  * @package SimpleSAMLphp
  */
-class UserPass extends \SimpleSAML\Module\core\Auth\UserPassBase // GTIS
+class UserPass extends UserPassBase // GTIS
 {
     /**
      * Our users, stored in an associative array. The key of the array is "<username>:<password>",

development/hub/config/authsources.php

@@ -12,7 +12,7 @@
 
         // The URL to the discovery service.
         // Can be NULL/unset, in which case a builtin discovery service will be used.
-//        'discoURL'  => 'http://ssp-hub.local/module.php/sildisco/disco.php',
+        'discoURL' => 'http://ssp-hub.local/module.php/sildisco/disco.php',
 
     ],