Merge pull request #690 from DiamondLightSource/prerelease

On Build: Satisfy Psalm Config (#689)

Author: John-Holt-Tessella

api/src/Authentication/Type/OIDC.php

@@ -8,11 +8,12 @@
 
 class OIDC extends AuthenticationParent implements AuthenticationInterface
 {
-    private $providerConfig = array();
+    //** Cache for providerConfig */
+    private $providerConfigCache = null;
 
-    private function getEndpoints() {
-        if (empty($this->providerConfig)) {
-            global $sso_url, $oidc_client_id, $oidc_client_secret;
+    private function getProviderConfig() {
+        global $sso_url, $oidc_client_id, $oidc_client_secret;
+        if (is_null($this->providerConfigCache)) {            
 
             $ch = curl_init();
             curl_setopt($ch, CURLOPT_URL, 'https://' . $sso_url . '/.well-known/openid-configuration');
@@ -27,21 +28,21 @@ private function getEndpoints() {
                 || !isset($newProviderConfig->authorization_endpoint) 
                 || !isset($newProviderConfig->token_endpoint)) {
                 error_log("OIDC Authentication provider replied with invalid JSON body");
-                return;
+                return null;
             }
             $newProviderConfig->b64ClientCreds = base64_encode(
                 $oidc_client_id . ":" . $oidc_client_secret
             );
 
-            $this->providerConfig = $newProviderConfig;
+            $this->providerConfigCache = $newProviderConfig;
         }
+        return $this->providerConfigCache;
     }
 
     private function getUser($token)
     {        
-        $this->getEndpoints();
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $this->providerConfig->userinfo_endpoint);
+        curl_setopt($ch, CURLOPT_URL, $this->getProviderConfig()->userinfo_endpoint);
         curl_setopt($ch, CURLOPT_HEADER, 0);
         curl_setopt($ch, CURLOPT_HTTPHEADER, array('Authorization: Bearer ' . $token));
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -74,32 +75,30 @@ function check()
 
     function authorise() 
     {
-        $this->getEndpoints();
         global $oidc_client_id;
         $redirect_url = Utils::filterParamFromUrl($_SERVER["HTTP_REFERER"], "code");
 
-        return ( $this->providerConfig->authorization_endpoint . 
+        return ( $this->getProviderConfig()->authorization_endpoint . 
             '?response_type=code&client_id=' . $oidc_client_id . 
             '&redirect_uri=' . $redirect_url
         );
     }
 
     function authenticateByCode($code) 
     {   
-        $this->getEndpoints();
         global $cacert, $oidc_client_secret, $oidc_client_id, $cookie_key;
 
         $redirect_url = Utils::filterParamFromUrl($_SERVER["HTTP_REFERER"], "code");
 
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $this->providerConfig->token_endpoint . 
+        curl_setopt($ch, CURLOPT_URL, $this->getProviderConfig()->token_endpoint . 
             '?grant_type=authorization_code&redirect_uri=' . 
             $redirect_url . 
             "&code=" . $code
         );
         curl_setopt($ch, CURLOPT_HEADER, 0);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Authorization: Basic ' . $this->providerConfig->b64ClientCreds));
+        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Authorization: Basic ' . $this->getProviderConfig()->b64ClientCreds));
         $response = curl_exec($ch);
         curl_close($ch);
 

api/src/Page/Download.php

@@ -527,13 +527,13 @@ function set_mime_content($response, $filename, $prefix = null)
 
     function _set_disposition_attachment($response, $filename) {
         $response->headers->set("Content-Disposition",
-            ResponseHeaderBag::makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $filename)
+            (new ResponseHeaderBag())->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $filename)
         );
     }
 
     function _set_disposition_inline($response) {
         $response->headers->set("Content-Disposition",
-            ResponseHeaderBag::makeDisposition(ResponseHeaderBag::DISPOSITION_INLINE, '')
+        (new ResponseHeaderBag())->makeDisposition(ResponseHeaderBag::DISPOSITION_INLINE, '')
         );
     }
 

api/src/Page/Processing.php

@@ -424,7 +424,7 @@ function _get_downstreams($dcid = null, $aid = null) {
             if ($downstream["PARAMETERS"]) {
                 $str_params = explode(',', $downstream["PARAMETERS"]);
                 foreach ($str_params as $str_param) {
-                    if (str_contains($str_param, '=')) {
+                    if (strpos($str_param, '=') !== false) {
                         list($key, $value) = explode('=', $str_param);
                         $params[$key] = $value;
                     }