Skip to content

Bump firebase/php-jwt from 4.0.0 to 6.4.0 in /3rdparty #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Bump firebase/php-jwt from 4.0.0 to 6.4.0 in /3rdparty #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aadb730
Bump firebase/php-jwt from 4.0.0 to 6.4.0 in /3rdparty
dependabot[bot] Feb 10, 2023
661874c
fix params for decode()
ArtificialOwl Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
},
"require": {
"onelogin/php-saml": "^4.0",
"firebase/php-jwt": "^4.0"
"firebase/php-jwt": "^6.4"
}
}
30 changes: 23 additions & 7 deletions 3rdparty/composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions lib/Controller/SAMLController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
namespace OCA\User_SAML\Controller;

use Firebase\JWT\JWT;
use Firebase\JWT\Key;
use OC\Core\Controller\ClientFlowLoginController;
use OC\Core\Controller\ClientFlowLoginV2Controller;
use OCA\User_SAML\Exceptions\NoUserFoundException;
Expand Down Expand Up @@ -664,10 +665,11 @@ private function getDirectLoginUrl($redirectUrl) {
return $directUrl;
}

private function isValidJwt($jwt) {

private function isValidJwt($jwt): bool {
try {
$key = $this->config->getSystemValue('gss.jwt.key', '');
JWT::decode($jwt, $key, ['HS256']);
JWT::decode($jwt, new Key($key, 'HS256'));
} catch (\Exception $e) {
return false;
}
Expand Down