add configuration for domain

Author: damikael

composer.json

@@ -1,6 +1,6 @@
 {
     "config": {
-        "version": "3.5"
+        "version": "3.6"
     },
     "repositories": {
         "spid-sp-access-button": {

setup/Setup.php

@@ -28,6 +28,7 @@ public static function setup(Event $event) {
         $_spOrganizationDisplayName = "Organization Display Name";
         $_spOrganizationURL = "https://www.organization.org";
         $_entityID = "https://localhost";
+        $_spDomain = "localhost";
         $_acsIndex = 0;
         $_adminPassword = "admin";
         $_technicalContactName = "";
@@ -91,14 +92,42 @@ public static function setup(Event $event) {
         }
 
         if (!isset($config['entityID'])) {
-            echo "Please insert your EntityID (" .
+            echo "Please insert your EntityID, must start with http:// or https:// (" .
             $colors->getColoredString($_entityID, "green") . "): ";
             $config['entityID'] = readline();
             if ($config['entityID'] == null || $config['entityID'] == "") {
                 $config['entityID'] = $_entityID;
             }
         }
 
+        if (!isset($config['spDomain'])) {
+            $lowerEntityId = strtolower($config['entityID']);
+            
+            if(substr($lowerEntityId, 0, 8)==='https://') {
+                $_spDomain = substr($config['entityID'], 8);
+            }
+    
+            if(substr($lowerEntityId, 0, 7)==='http://') {
+                $_spDomain = substr($config['entityID'], 7);
+            }
+    
+            if(substr(strtolower($_spDomain), 0, 4)==='www.') {
+                $_spDomain = substr($_spDomain, 4);
+            }
+    
+
+            echo "Please insert your Service Provider Domain, without www. (" .
+            $colors->getColoredString($_spDomain, "green") . "): ";
+            $config['spDomain'] = readline();
+            if ($config['spDomain'] == null || $config['spDomain'] == "") {
+                $config['spDomain'] = $_spDomain;
+            }
+
+            if($config['spDomain']!=$_spDomain) {
+                echo $colors->getColoredString("WARNING: the EntityID must be related to organization's domain", "yellow");
+            }
+        }
+
         if (!isset($config['spName'])) {
             echo "Please insert your Service Provider Name (" .
             $colors->getColoredString($_spName, "green") . "): ";
@@ -568,6 +597,7 @@ public static function setup(Event $event) {
         echo $colors->getColoredString("\nWeb root directory: " . $config['wwwDir'], "yellow");
         echo $colors->getColoredString("\nService Name: " . $config['serviceName'], "yellow");
         echo $colors->getColoredString("\nEntity ID: " . $config['entityID'], "yellow");
+        echo $colors->getColoredString("\nService Provider Domain: " . $config['spDomain'], "yellow");
         echo $colors->getColoredString("\nService Provider Name: " . $config['spName'], "yellow");
         echo $colors->getColoredString("\nService Provider Description: " . $config['spDescription'], "yellow");
         echo $colors->getColoredString("\nOrganization Name: " . $config['spOrganizationName'], "yellow");
@@ -715,7 +745,8 @@ public static function setup(Event $event) {
             "{{TECHCONTACT_NAME}}" => "'" . $config['technicalContactName'] . "'",
             "{{TECHCONTACT_EMAIL}}" => "'" . $config['technicalContactEmail'] . "'",
             "{{ACSCUSTOMLOCATION}}" => "'" . $config['acsCustomLocation'] . "'",
-            "{{SLOCUSTOMLOCATION}}" => "'" . $config['sloCustomLocation'] . "'"
+            "{{SLOCUSTOMLOCATION}}" => "'" . $config['sloCustomLocation'] . "'",
+            "{{SP_DOMAIN}}" => "'." . $config['spDomain'] . "'"
         );
         $template = file_get_contents($config['installDir'] . '/setup/config/config.tpl', true);
         $customized = str_replace(array_keys($vars), $vars, $template);

setup/config/config.tpl

@@ -339,7 +339,7 @@ $config = array(
      * Example:
      *  'session.cookie.domain' => '.example.org',
      */
-    'session.cookie.domain' => null,
+    'session.cookie.domain' => {{SP_DOMAIN}},
 
     /*
      * Set the secure flag in the cookie.

setup/simplesamlphp/saml2/src/SAML2/Response.php

@@ -114,6 +114,10 @@ public function __construct(DOMElement $xml = null)
 
             // Disco non funziona, vedi pure AuthnRequest
             $state = State::loadState($stateID, 'saml:sp:sso', true);
+            if($state==null) {
+                throw new \Exception('State not found for id  ' . $stateID);
+            }
+
             $req_authnContextClassRef = $state["saml:AuthnContextClassRef"];
             $req_authnContextComparison = $state["saml:AuthnContextComparison"];
             $res_authnContextClassRef = $authnContextClassRef[0]->nodeValue;

setup/simplesamlphp/simplesamlphp/modules/saml/lib/Message.php

@@ -647,14 +647,14 @@ public static function processResponse(
         $inResponseTo = $response->getInResponseTo();
 
         /* SPID-PHP CUSTOM: strip spid-php */
-        /*$stateID = substr($inResponseTo, 8);
+        $stateID = substr($inResponseTo, 8);
 
         $state = State::loadState($stateID, 'saml:sp:sso', true);
         if($state==null) {
             throw new SSP_Error\Exception(
                 'State not found for ID '.$inResponseTo
             );
-        }*/
+        }
 
         /* END SPID CUSTOM */