Fixed bugs in UpdateUES process filter

* Added checks into UpdateUserExtSource process filter to prevent undefined index or undefined offset errors

Author: Pavel Vyskočil

CHANGELOG.md

@@ -2,6 +2,8 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+#### Fixed
+- Added checks into UpdateUserExtSource process filter to prevent undefined index or undefined offset errors 
 
 ## [v3.1.0]
 #### Added

lib/Auth/Process/UpdateUserExtSource.php

@@ -12,6 +12,7 @@
  * This filter updates userExtSource attributes when he logs in.
  *
  * @author Dominik Baránek <[email protected]>
+ * @author Pavel Vyskočil <[email protected]>
  */
 class UpdateUserExtSource extends \SimpleSAML\Auth\ProcessingFilter
 {
@@ -68,34 +69,38 @@ public function process(&$request)
 
             $attributesToUpdate = array();
             foreach ($attributes as $attribute) {
-                $attr = $request['Attributes'][$this->attrMap[self::UES_ATTR_NMS . $attribute['friendlyName']]];
+                $attrName = self::UES_ATTR_NMS . $attribute['friendlyName'];
+                if (isset($this->attrMap[$attrName]) && isset($request['Attributes'][$this->attrMap[$attrName]])) {
+                    $attr = $request['Attributes'][$this->attrMap[$attrName]];
 
-                if (in_array(self::UES_ATTR_NMS . $attribute['friendlyName'], $this->attrsToConversion)) {
-                    $arrayAsString = array();
-                    foreach ($attr as $value) {
-                        $arrayAsString[0] .= $value . ';';
+                    if (in_array(self::UES_ATTR_NMS . $attribute['friendlyName'], $this->attrsToConversion)) {
+                        $arrayAsString = array('');
+                        foreach ($attr as $value) {
+                            $arrayAsString[0] .= $value . ';';
+                        }
+                        if (!empty($arrayAsString[0])) {
+                            $arrayAsString[0] = substr($arrayAsString[0], 0, -1);
+                        }
+                        $attr = $arrayAsString;
                     }
-                    if (!empty($arrayAsString[0])) {
-                        $arrayAsString[0] = substr($arrayAsString[0], 0, -1);
+
+                    if (strpos($attribute['type'], 'String') ||
+                        strpos($attribute['type'], 'Integer') ||
+                        strpos($attribute['type'], 'Boolean')) {
+                        $valueFromIdP = $attr[0];
+                    } elseif (strpos($attribute['type'], 'Array') || strpos($attribute['type'], 'Map')) {
+                        $valueFromIdP = $attr;
+                    } else {
+                        throw new Exception(
+                            'sspmod_perun_Auth_Process_UpdateUserExtSource: unsupported type of attribute.'
+                        );
+                    }
+                    if ($valueFromIdP !== $attribute['value']) {
+                        $attribute['value'] = $valueFromIdP;
+                        array_push($attributesToUpdate, $attribute);
                     }
-                    $attr = $arrayAsString;
                 }
 
-                if (strpos($attribute['type'], 'String') ||
-                    strpos($attribute['type'], 'Integer') ||
-                    strpos($attribute['type'], 'Boolean')) {
-                    $valueFromIdP = $attr[0];
-                } elseif (strpos($attribute['type'], 'Array') || strpos($attribute['type'], 'Map')) {
-                    $valueFromIdP = $attr;
-                } else {
-                    throw new Exception(
-                        "sspmod_perun_Auth_Process_UpdateUserExtSource: unsupported type of attribute."
-                    );
-                }
-                if ($valueFromIdP != $attribute['value']) {
-                    $attribute['value'] = $valueFromIdP;
-                    array_push($attributesToUpdate, $attribute);
-                }
             }
 
             if (!empty($attributesToUpdate)) {