Fix bugs

Author: tvdijen

src/Controller/Cas10.php

@@ -8,7 +8,7 @@
 use SimpleSAML\Configuration;
 use SimpleSAML\Logger;
 use SimpleSAML\Module;
-use SimpleSAML\Module\casserver\Utils\Url;
+use SimpleSAML\Module\casserver\Utils\Url as UrlUtils;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
@@ -49,9 +49,9 @@ public function __construct(
 
     /**
      * @param \Symfony\Component\HttpFoundation\Request $request
-     * @return \SimpleSAML\XHTML\Template
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse
      */
-    public function validate(Request $request): Template
+    public function validate(Request $request): StreamedResponse
     {
         /* Load simpleSAMLphp, configuration and metadata */
         $casconfig = Configuration::getConfig('module_casserver.php');
@@ -97,7 +97,7 @@ public function validate(Request $request): Template
                         (!$forceAuthn || $serviceTicket['forceAuthn']) &&
                         array_key_exists($usernameField, $serviceTicket['attributes'])
                     ) {
-                        $response->setCallback(function() {
+                        $response->setCallback(function() use ($protocol, $serviceTicket, $usernameField) {
                             echo $protocol->getValidateSuccessResponse($serviceTicket['attributes'][$usernameField][0]);
                         });
                     } else {
@@ -107,7 +107,7 @@ public function validate(Request $request): Template
                                 var_export($usernameField, true)
                             ));
 
-                            $response->setCallback(function() {
+                            $response->setCallback(function() use ($protocol) {
                                 echo $protocol->getValidateFailureResponse();
                             });
                         } else {
@@ -124,7 +124,7 @@ public function validate(Request $request): Template
                             }
                             Logger::debug('casserver:' . $message);
 
-                            $response->setCallback(function() {
+                            $response->setCallback(function() use ($protocol) {
                                 echo $protocol->getValidateFailureResponse();
                             });
                         }
@@ -138,14 +138,14 @@ public function validate(Request $request): Template
 
                     Logger::debug('casserver:' . $message);
 
-                    $response->setCallback(function() {
+                    $response->setCallback(function() use ($protocol) {
                         echo $protocol->getValidateFailureResponse();
                     });
                 }
             } catch (Exception $e) {
                 Logger::error('casserver:validate: internal server error. ' . var_export($e->getMessage(), true));
 
-                $response->setCallback(function() {
+                $response->setCallback(function() use ($protocol) {
                     echo $protocol->getValidateFailureResponse();
                 });
             }
@@ -157,7 +157,7 @@ public function validate(Request $request): Template
             }
 
             Logger::debug('casserver:' . $message);
-            $response->setCallback(function() {
+            $response->setCallback(function() use ($protocol) {
                 echo $protocol->getValidateFailureResponse();
             });
         }

src/Utils/Url.php

@@ -38,7 +38,7 @@ class Url
      * @param array $legal_service_urls
      * @return bool
      */
-    function checkServiceURL(string $service, array $legal_service_urls): bool
+    public function checkServiceURL(string $service, array $legal_service_urls): bool
     {
         //delegate to ServiceValidator until all references to this can be cleaned up
         $config = Configuration::loadFromArray(['legal_service_urls' => $legal_service_urls]);
@@ -51,7 +51,7 @@ function checkServiceURL(string $service, array $legal_service_urls): bool
      * @param string $parameter
      * @return string
      */
-    function sanitize(string $parameter): string
+    public function sanitize(string $parameter): string
     {
         return TicketValidator::sanitize($parameter);
     }