gavin/snipe-it
1
0
Fork 0
mirror of https://github.com/grokability/snipe-it.git synced 2026-03-12 17:52:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Upgrade Passport to v13 and move php-jwt to v7 to remediate JWT advisory"

Browse Source
This commit is contained in:
snipe
2026-03-08 12:29:56 +00:00
committed by GitHub
parent a2efcf1ca9
commit 0a724cc49a
8 changed files with 553 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/tests-mysql.yml vendored
View File

@@ -69,8 +69,6 @@ jobs:
php artisan migrate --force
php artisan passport:install --no-interaction
chmod -R 777 storage bootstrap/cache
chmod 600 storage/oauth-private.key
chmod 660 storage/oauth-public.key
- name: Execute tests (Unit and Feature tests) via PHPUnit
env:

2
.github/workflows/tests-postgres.yml vendored
View File

@@ -67,8 +67,6 @@ jobs:
php artisan migrate --force
php artisan passport:install --no-interaction
chmod -R 777 storage bootstrap/cache
chmod 600 storage/oauth-private.key
chmod 660 storage/oauth-public.key
- name: Execute tests (Unit and Feature tests) via PHPUnit
env:

5
.github/workflows/tests-sqlite.yml vendored
View File

@@ -56,10 +56,7 @@ jobs:
run: php artisan passport:keys
- name: Directory Permissions
run: |
chmod -R 777 storage bootstrap/cache
chmod 600 storage/oauth-private.key
chmod 660 storage/oauth-public.key
run: chmod -R 777 storage bootstrap/cache
- name: Execute tests (Unit and Feature tests) via PHPUnit
env:

12
app/Http/Controllers/Api/ProfileController.php
View File

@@ -166,17 +166,7 @@ class ProfileController extends Controller
$tokens = $this->tokenRepository->forUser(auth()->user()->getAuthIdentifier());
$token_values = $tokens->load('client')->filter(function ($token) {
if ($token->revoked || ! $token->client) {
return false;
}
$client = $token->client;
if (method_exists($client, 'hasGrantType')) {
return $client->hasGrantType('personal_access');
}
return in_array('personal_access', (array) ($client->grant_types ?? []), true);
return $token->client->personal_access_client && ! $token->revoked;
})->values();
return response()->json(Helper::formatStandardApiResponse('success', $token_values, null));

2
app/Http/Controllers/SetupController.php
View File

@@ -265,4 +265,6 @@ class SetupController extends Controller
}

2
composer.json
View File

@@ -46,7 +46,7 @@
"laravel-notification-channels/microsoft-teams": "^1.2",
"laravel/framework": "^11.0",
"laravel/helpers": "^1.4",
"laravel/passport": "^13.0",
"laravel/passport": "^12.0",
"laravel/slack-notification-channel": "^3.4",
"laravel/socialite": "^5.6",
"laravel/tinker": "^2.6",

1340
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

7
upgrade.php
View File

@@ -612,13 +612,6 @@ if ((!file_exists('storage/oauth-public.key')) || (!file_exists('storage/oauth-p
echo $success_icon." OAuth keys detected. Skipping passport install.\n\n";
}
// Normalize key permissions for Passport 13 (covers both fresh installs and upgrades)
if (PHP_OS !== 'WINNT') {
if (file_exists('storage/oauth-private.key')) chmod('storage/oauth-private.key', 0600);
if (file_exists('storage/oauth-public.key')) chmod('storage/oauth-public.key', 0660);
echo $success_icon." OAuth key permissions normalized.\n\n";
}
echo "\e[95m--------------------------------------------------------\n";
echo "STEP 11: Taking application out of maintenance mode:\n";