Merge pull request #675 from nextcloud/enh/upgrade-php-jwt

nextcloud · Aug 30, 2023 · d92fe87 · d92fe87
2 parents 024ef1a + f7b68dd
commit d92fe87
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 45 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -22,15 +22,6 @@ jobs:
         databases: ['sqlite', 'mysql', 'pgsql']
         server-versions: ['master']
         include:
-            - php-versions: 7.4
-              databases: mysql
-              server-versions: stable21
-            - php-versions: 8.0
-              databases: mysql
-              server-versions: stable22
-            - php-versions: 8.0
-              databases: mysql
-              server-versions: stable23
             - php-versions: 8.1
               databases: mysql
               server-versions: stable24

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4', '8.0', "8.1"]
+        php-versions: ['7.4', '8.0', "8.1"]
 
     name: php${{ matrix.php-versions }}
     steps:

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -19,32 +19,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.3', '7.4', '8.0', '8.1']
+        php-versions: ['7.4', '8.0', '8.1']
         databases: ['mysql']
-        server-versions: ['stable21', 'stable22', 'stable23', 'stable24', 'stable25', 'stable26', 'stable27', 'master']
+        server-versions: ['stable24', 'stable25', 'stable26', 'stable27', 'master']
         exclude:
-          - php-versions: 7.3
-            server-versions: master
           - php-versions: 7.4
             server-versions: master
-          - php-versions: 7.3
-            server-versions: stable27
           - php-versions: 7.4
             server-versions: stable27
-          - php-versions: 7.3
-            server-versions: stable26
           - php-versions: 7.4
             server-versions: stable26
-          - php-versions: 7.3
-            server-versions: stable25
-          - php-versions: 7.3
-            server-versions: stable24
-          - php-versions: 8.1
-            server-versions: stable21
-          - php-versions: 8.1
-            server-versions: stable22
-          - php-versions: 8.1
-            server-versions: stable23
         include:
           - php-versions: 8.2
             databases: mysql

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -19,7 +19,7 @@
 	<bugs>https://github.com/nextcloud/user_oidc/issues</bugs>
 	<repository>https://github.com/nextcloud/user_oidc</repository>
 	<dependencies>
-		<nextcloud min-version="21" max-version="28"/>
+		<nextcloud min-version="24" max-version="28"/>
 	</dependencies>
 	<settings>
 		<admin>OCA\UserOIDC\Settings\AdminSettings</admin>

diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
       "bamarni/composer-bin-plugin": true
     },
 	"platform": {
-      "php": "7.3"
+      "php": "7.4"
     }
   },
   "scripts": {
@@ -30,7 +30,7 @@
   },
   "require": {
     "id4me/id4me-rp": "^1.2",
-    "firebase/php-jwt": "^5.2",
+    "firebase/php-jwt": "^6.8.1",
     "bamarni/composer-bin-plugin": "^1.4"
   },
   "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Controller/LoginController.php b/lib/Controller/LoginController.php
@@ -416,7 +416,7 @@ public function code(string $state = '', string $code = '', string $scope = '',
 		$idTokenRaw = $data['id_token'];
 		$jwks = $this->discoveryService->obtainJWK($provider);
 		JWT::$leeway = 60;
-		$idTokenPayload = JWT::decode($idTokenRaw, $jwks, array_keys(JWT::$supported_algs));
+		$idTokenPayload = JWT::decode($idTokenRaw, $jwks);
 
 		$this->logger->debug('Parsed the JWT payload: ' . json_encode($idTokenPayload, JSON_THROW_ON_ERROR));
 
@@ -617,7 +617,7 @@ public function backChannelLogout(string $providerIdentifier, string $logout_tok
 		// decrypt the logout token
 		$jwks = $this->discoveryService->obtainJWK($provider);
 		JWT::$leeway = 60;
-		$logoutTokenPayload = JWT::decode($logout_token, $jwks, array_keys(JWT::$supported_algs));
+		$logoutTokenPayload = JWT::decode($logout_token, $jwks);
 
 		$this->logger->debug('Parsed the logout JWT payload: ' . json_encode($logoutTokenPayload, JSON_THROW_ON_ERROR));
 

diff --git a/lib/User/Provisioning/SelfEncodedTokenProvisioning.php b/lib/User/Provisioning/SelfEncodedTokenProvisioning.php
@@ -30,7 +30,7 @@ public function __construct(ProvisioningService $provisioningService, DiscoveryS
 	public function provisionUser(Provider $provider, string $tokenUserId, string $bearerToken): ?IUser {
 		JWT::$leeway = 60;
 		try {
-			$payload = JWT::decode($bearerToken, $this->discoveryService->obtainJWK($provider), array_keys(JWT::$supported_algs));
+			$payload = JWT::decode($bearerToken, $this->discoveryService->obtainJWK($provider));
 		} catch (Throwable $e) {
 			$this->logger->error('Impossible to decode OIDC token:' . $e->getMessage());
 			return null;

diff --git a/lib/User/Validator/SelfEncodedValidator.php b/lib/User/Validator/SelfEncodedValidator.php
@@ -57,7 +57,7 @@ public function isValidBearerToken(Provider $provider, string $bearerToken): ?st
 		// try to decode the bearer token
 		JWT::$leeway = 60;
 		try {
-			$payload = JWT::decode($bearerToken, $this->discoveryService->obtainJWK($provider), array_keys(JWT::$supported_algs));
+			$payload = JWT::decode($bearerToken, $this->discoveryService->obtainJWK($provider));
 		} catch (Throwable $e) {
 			$this->logger->error('Impossible to decode OIDC token:' . $e->getMessage());
 			return null;