[pull] 2.x from Kovah:2.x

.github/workflows/build-docker.yml

@@ -5,6 +5,7 @@ on:
   push:
     tags:
       - "v2.*"
+  workflow_dispatch:
 
 jobs:
   build_regular_docker:

.github/workflows/build-package.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 2.x
+  workflow_dispatch:
 
 jobs:
   build-package:

composer.json

@@ -12,7 +12,7 @@
     "doctrine/dbal": "^3.7",
     "guzzlehttp/guzzle": "^7.0",
     "kovah/laravel-html-meta": "^4.0",
-    "kovah/laravel-socialite-oidc": "^0.4.0",
+    "kovah/laravel-socialite-oidc": "^0.5",
     "laracasts/flash": "^3.1",
     "laravel/fortify": "^1.7",
     "laravel/framework": "^v10.43",

config/database.php

@@ -58,8 +58,12 @@
             'prefix_indexes' => true,
             'strict' => true,
             'engine' => env('DB_ENGINE', 'InnoDB'),
+            'sslmode' => env('DB_SSL_MODE', 'prefer'),
             'options' => extension_loaded('pdo_mysql') ? array_filter([
-                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+                PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => env('MYSQL_VERIFY_SERVER_CERT', true),
+                PDO::MYSQL_ATTR_SSL_KEY => env('MYSQL_SSL_KEY'),
+                PDO::MYSQL_ATTR_SSL_CERT => env('MYSQL_SSL_CERT'),
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_SSL_CA'),
             ]) : [],
         ],
 
@@ -75,7 +79,7 @@
             'prefix' => '',
             'prefix_indexes' => true,
             'search_path' => 'public',
-            'sslmode' => 'prefer',
+            'sslmode' => env('DB_SSL_MODE', 'prefer'),
         ],
 
         'sqlsrv' => [

config/services.php

@@ -114,6 +114,7 @@
         'client_secret' => env('SSO_OIDC_CLIENT_SECRET'),
         'scopes' => env('SSO_OIDC_SCOPES'),
         'redirect' => '/auth/sso/oidc/callback',
+        'verify_jwt' => env('SSO_OIDC_VERIFY_JWT', true),
     ],
 
     'okta' => [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkace",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "description": "A small, selfhosted bookmark manager with advanced features, built with Laravel and Docker",
   "homepage": "https://github.com/Kovah/LinkAce",
   "repository": {

resources/docker/dockerfiles/release-multiplatform.Dockerfile

@@ -38,7 +38,7 @@ RUN mv vendor/spatie/laravel-backup/resources/lang/de vendor/spatie/laravel-back
 
 # ================================
 # Compile all assets
-FROM docker.io/library/node:24 AS npm_builder
+FROM docker.io/library/node:22 AS npm_builder
 WORKDIR /srv
 
 COPY ./resources/assets ./resources/assets

routes/api.php

@@ -40,7 +40,8 @@
                 'store' => 'api.links.store',
                 'update' => 'api.links.update',
                 'destroy' => 'api.links.destroy',
-            ]);
+            ])
+            ->where(['link' => '[0-9]+']);
 
         Route::get('links/{link}/notes', LinkNotesController::class)
             ->name('api.links.notes');
@@ -52,7 +53,8 @@
                 'store' => 'api.lists.store',
                 'update' => 'api.lists.update',
                 'destroy' => 'api.lists.destroy',
-            ]);
+            ])
+            ->where(['list' => '[0-9]+']);
 
         Route::get('lists/{list}/links', ListLinksController::class)
             ->name('api.lists.links');
@@ -64,7 +66,8 @@
                 'store' => 'api.tags.store',
                 'update' => 'api.tags.update',
                 'destroy' => 'api.tags.destroy',
-            ]);
+            ])
+            ->where(['tag' => '[0-9]+']);
 
         Route::get('tags/{tag}/links', TagLinksController::class)
             ->name('api.tags.links');

routes/web.php

@@ -91,11 +91,10 @@
     Route::get('dashboard', [DashboardController::class, 'index'])
         ->name('dashboard');
 
-    Route::resource('links', LinkController::class);
-    Route::resource('lists', ListController::class);
-    Route::resource('tags', TagController::class);
-    Route::resource('notes', NoteController::class)
-        ->except(['index', 'show', 'create']);
+    Route::resource('links', LinkController::class)->where(['link' => '[0-9]+']);
+    Route::resource('lists', ListController::class)->where(['list' => '[0-9]+']);
+    Route::resource('tags', TagController::class)->where(['tag' => '[0-9]+']);
+    Route::resource('notes', NoteController::class)->except(['index', 'show', 'create']);
 
     Route::post('bulk-edit', [BulkEditController::class, 'form'])
         ->name('bulk-edit.form');