Compare revisions

Jednotné přihlášení test · Dominik Frantisek Bucik · Dominik František Bučík · semantic-release-bot · ae67b297 · ae67b297
--- a/.gitignore
+++ b/.gitignore
@@ -716,3 +716,5 @@ ehthumbs_vista.db

 # Windows shortcuts
 *.lnk
+
+modules/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+## [4.2.3](https://gitlab.ics.muni.cz/perun-proxy-aai/simplesamlphp/simplesamlphp-module-cesnet/compare/v4.2.2...v4.2.3) (2023-12-04)
+
+
+### Bug Fixes
+
+* 🐛 More fixes in IsEinfraCzEligible ([07571b8](https://gitlab.ics.muni.cz/perun-proxy-aai/simplesamlphp/simplesamlphp-module-cesnet/commit/07571b8ca19ad861638d1018b7aaaea3c21f2c76))
+
 ## [4.2.2](https://gitlab.ics.muni.cz/perun-proxy-aai/simplesamlphp/simplesamlphp-module-cesnet/compare/v4.2.1...v4.2.2) (2023-11-28)



--- a/composer.lock
+++ b/composer.lock
@@ -105,11 +105,11 @@
        },
        {
            "name": "cesnet/simplesamlphp-module-perun",
-            "version": "v9.6.0",
+            "version": "v9.6.2",
            "source": {
                "type": "git",
                "url": "https://gitlab.ics.muni.cz/perun-proxy-aai/simplesamlphp/simplesamlphp-module-perun.git",
-                "reference": "5f3cca96c8e4751312ae19032463e0891efcbd3c"
+                "reference": "3892e21170132547c27eac1dca3caf74cc53901a"
            },
            "require": {
                "cesnet/simplesamlphp-module-authswitcher": "^10.6 || ^11.0",
@@ -154,7 +154,7 @@
                "perun",
                "simplesamlphp"
            ],
-            "time": "2023-10-04T07:59:51+00:00"
+            "time": "2023-12-03T08:58:23+00:00"
        },
        {
            "name": "fgrosse/phpasn1",
@@ -725,16 +725,16 @@
        },
        {
            "name": "phpseclib/phpseclib",
-            "version": "3.0.33",
+            "version": "3.0.34",
            "source": {
                "type": "git",
                "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "33fa69b2514a61138dd48e7a49f99445711e0ad0"
+                "reference": "56c79f16a6ae17e42089c06a2144467acc35348a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/33fa69b2514a61138dd48e7a49f99445711e0ad0",
-                "reference": "33fa69b2514a61138dd48e7a49f99445711e0ad0",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/56c79f16a6ae17e42089c06a2144467acc35348a",
+                "reference": "56c79f16a6ae17e42089c06a2144467acc35348a",
                "shasum": ""
            },
            "require": {
@@ -815,7 +815,7 @@
            ],
            "support": {
                "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.33"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.34"
            },
            "funding": [
                {
@@ -831,7 +831,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-10-21T14:00:39+00:00"
+            "time": "2023-11-27T11:13:31+00:00"
        },
        {
            "name": "psr/cache",
@@ -3095,16 +3095,16 @@
        },
        {
            "name": "symfony/cache",
-            "version": "v5.4.31",
+            "version": "v5.4.32",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/cache.git",
-                "reference": "9c0a3a5d0718e51ff81e0605be38fe1acbee9eeb"
+                "reference": "2553faca77502a4f68dc93cd2f3b9ec650751e40"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/9c0a3a5d0718e51ff81e0605be38fe1acbee9eeb",
-                "reference": "9c0a3a5d0718e51ff81e0605be38fe1acbee9eeb",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/2553faca77502a4f68dc93cd2f3b9ec650751e40",
+                "reference": "2553faca77502a4f68dc93cd2f3b9ec650751e40",
                "shasum": ""
            },
            "require": {
@@ -3172,7 +3172,7 @@
                "psr6"
            ],
            "support": {
-                "source": "https://github.com/symfony/cache/tree/v5.4.31"
+                "source": "https://github.com/symfony/cache/tree/v5.4.32"
            },
            "funding": [
                {
@@ -3188,7 +3188,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-11-06T17:37:55+00:00"
+            "time": "2023-11-24T13:04:07+00:00"
        },
        {
            "name": "symfony/cache-contracts",
@@ -3350,16 +3350,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v5.4.31",
+            "version": "v5.4.32",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "11ac5f154e0e5c4c77af83ad11ead9165280b92a"
+                "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/11ac5f154e0e5c4c77af83ad11ead9165280b92a",
-                "reference": "11ac5f154e0e5c4c77af83ad11ead9165280b92a",
+                "url": "https://api.github.com/repos/symfony/console/zipball/c70df1ffaf23a8d340bded3cfab1b86752ad6ed7",
+                "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7",
                "shasum": ""
            },
            "require": {
@@ -3429,7 +3429,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.31"
+                "source": "https://github.com/symfony/console/tree/v5.4.32"
            },
            "funding": [
                {
@@ -3445,20 +3445,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-10-31T07:58:33+00:00"
+            "time": "2023-11-18T18:23:04+00:00"
        },
        {
            "name": "symfony/dependency-injection",
-            "version": "v5.4.31",
+            "version": "v5.4.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "eb1bcafa54e00ed218e1b733b8b6ad1c9ff83d20"
+                "reference": "14969a558cd6382b2a12b14b20ef9a851a02da79"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/eb1bcafa54e00ed218e1b733b8b6ad1c9ff83d20",
-                "reference": "eb1bcafa54e00ed218e1b733b8b6ad1c9ff83d20",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/14969a558cd6382b2a12b14b20ef9a851a02da79",
+                "reference": "14969a558cd6382b2a12b14b20ef9a851a02da79",
                "shasum": ""
            },
            "require": {
@@ -3518,7 +3518,7 @@
            "description": "Allows you to standardize and centralize the way objects are constructed in your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v5.4.31"
+                "source": "https://github.com/symfony/dependency-injection/tree/v5.4.33"
            },
            "funding": [
                {
@@ -3534,7 +3534,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-10-31T07:58:33+00:00"
+            "time": "2023-11-30T08:15:37+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@@ -3967,16 +3967,16 @@
        },
        {
            "name": "symfony/framework-bundle",
-            "version": "v5.4.31",
+            "version": "v5.4.32",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/framework-bundle.git",
-                "reference": "4eeac66c8b0f2793324e94cfc6ac1c8bc5b92960"
+                "reference": "14597eccde5051368918bce92393be9ba941db14"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/4eeac66c8b0f2793324e94cfc6ac1c8bc5b92960",
-                "reference": "4eeac66c8b0f2793324e94cfc6ac1c8bc5b92960",
+                "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/14597eccde5051368918bce92393be9ba941db14",
+                "reference": "14597eccde5051368918bce92393be9ba941db14",
                "shasum": ""
            },
            "require": {
@@ -4097,7 +4097,7 @@
            "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/framework-bundle/tree/v5.4.31"
+                "source": "https://github.com/symfony/framework-bundle/tree/v5.4.32"
            },
            "funding": [
                {
@@ -4113,20 +4113,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-10-31T07:58:33+00:00"
+            "time": "2023-11-23T15:18:29+00:00"
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v5.4.31",
+            "version": "v5.4.32",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "f84fd4fd8311a541ceb2ae3f257841d002450a90"
+                "reference": "cbcd80a4c36f59772d62860fdb0cb6a38da63fd2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f84fd4fd8311a541ceb2ae3f257841d002450a90",
-                "reference": "f84fd4fd8311a541ceb2ae3f257841d002450a90",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cbcd80a4c36f59772d62860fdb0cb6a38da63fd2",
+                "reference": "cbcd80a4c36f59772d62860fdb0cb6a38da63fd2",
                "shasum": ""
            },
            "require": {
@@ -4173,7 +4173,7 @@
            "description": "Defines an object-oriented layer for the HTTP specification",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v5.4.31"
+                "source": "https://github.com/symfony/http-foundation/tree/v5.4.32"
            },
            "funding": [
                {
@@ -4189,20 +4189,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-11-06T22:05:57+00:00"
+            "time": "2023-11-20T15:40:25+00:00"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v5.4.31",
+            "version": "v5.4.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "d2fad58d32a7b4864d205a7289602a27ce75018c"
+                "reference": "892636f9279f953dc266dc088f900b03eecb4ffa"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d2fad58d32a7b4864d205a7289602a27ce75018c",
-                "reference": "d2fad58d32a7b4864d205a7289602a27ce75018c",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/892636f9279f953dc266dc088f900b03eecb4ffa",
+                "reference": "892636f9279f953dc266dc088f900b03eecb4ffa",
                "shasum": ""
            },
            "require": {
@@ -4285,7 +4285,7 @@
            "description": "Provides a structured process for converting a Request into a Response",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v5.4.31"
+                "source": "https://github.com/symfony/http-kernel/tree/v5.4.33"
            },
            "funding": [
                {
@@ -4301,7 +4301,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-11-10T13:39:09+00:00"
+            "time": "2023-12-01T16:51:11+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
@@ -4952,16 +4952,16 @@
        },
        {
            "name": "symfony/routing",
-            "version": "v5.4.26",
+            "version": "v5.4.33",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/routing.git",
-                "reference": "853fc7df96befc468692de0a48831b38f04d2cb2"
+                "reference": "5b5b86670f947db92ab54cdcff585e76064d0b04"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/853fc7df96befc468692de0a48831b38f04d2cb2",
-                "reference": "853fc7df96befc468692de0a48831b38f04d2cb2",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/5b5b86670f947db92ab54cdcff585e76064d0b04",
+                "reference": "5b5b86670f947db92ab54cdcff585e76064d0b04",
                "shasum": ""
            },
            "require": {
@@ -5022,7 +5022,7 @@
                "url"
            ],
            "support": {
-                "source": "https://github.com/symfony/routing/tree/v5.4.26"
+                "source": "https://github.com/symfony/routing/tree/v5.4.33"
            },
            "funding": [
                {
@@ -5038,7 +5038,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-24T13:28:37+00:00"
+            "time": "2023-12-01T09:28:00+00:00"
        },
        {
            "name": "symfony/service-contracts",
@@ -5125,16 +5125,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v5.4.31",
+            "version": "v5.4.32",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "2765096c03f39ddf54f6af532166e42aaa05b24b"
+                "reference": "91bf4453d65d8231688a04376c3a40efe0770f04"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/2765096c03f39ddf54f6af532166e42aaa05b24b",
-                "reference": "2765096c03f39ddf54f6af532166e42aaa05b24b",
+                "url": "https://api.github.com/repos/symfony/string/zipball/91bf4453d65d8231688a04376c3a40efe0770f04",
+                "reference": "91bf4453d65d8231688a04376c3a40efe0770f04",
                "shasum": ""
            },
            "require": {
@@ -5191,7 +5191,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.31"
+                "source": "https://github.com/symfony/string/tree/v5.4.32"
            },
            "funding": [
                {
@@ -5207,7 +5207,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-11-09T08:19:44+00:00"
+            "time": "2023-11-26T13:43:46+00:00"
        },
        {
            "name": "symfony/var-dumper",
@@ -5300,16 +5300,16 @@
        },
        {
            "name": "symfony/var-exporter",
-            "version": "v5.4.26",
+            "version": "v5.4.32",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "11401fe94f960249b3c63a488c63ba73091c1e4a"
+                "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/11401fe94f960249b3c63a488c63ba73091c1e4a",
-                "reference": "11401fe94f960249b3c63a488c63ba73091c1e4a",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/fdb022f0d3d41df240c18e2eb9a117c430f06add",
+                "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add",
                "shasum": ""
            },
            "require": {
@@ -5353,7 +5353,7 @@
                "serialize"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v5.4.26"
+                "source": "https://github.com/symfony/var-exporter/tree/v5.4.32"
            },
            "funding": [
                {
@@ -5369,7 +5369,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-20T07:21:16+00:00"
+            "time": "2023-11-16T19:33:05+00:00"
        },
        {
            "name": "symfony/yaml",

--- a/lib/Auth/Process/IsEinfraCZEligible.php
+++ b/lib/Auth/Process/IsEinfraCZEligible.php
@@ -82,7 +82,7 @@ class IsEinfraCZEligible extends ProcessingFilter
        }
        Logger::debug(
            self::LOGGER_PREFIX . 'Result eligibilities attribute: ' .
-            json_encode($request['Attributes'][$this->userEligibilityAttr])
+            json_encode($request['Attributes'][$this->userEligibilityAttr] ?? 'none')
        );
    }

@@ -127,7 +127,7 @@ class IsEinfraCZEligible extends ProcessingFilter
                $data = $this->fetchAffiliationData();
            }

-            if (empty($data) and $file_age > strtotime("-" . self::FILE_MAX_AGE_HOURS . " hours")) {
+            if (empty($data) && $file_age > strtotime("-" . self::FILE_MAX_AGE_HOURS . " hours")) {
                $data = $this->readDataFromCacheFile();
            }
        } else {
No results found