Merge pull request #1105 from Kitware/releases/3.0

Merge release branch back into master

Author: zackgalbreath

app/Http/Controllers/CDash.php

@@ -328,7 +328,7 @@ public function getJsVersion()
         $version = '';
         if (is_readable($path)) {
             $file = file_get_contents($path);
-            if (preg_match("/'VERSION',\s+'(\d+)'/", $file, $match)) {
+            if (preg_match("/'VERSION',\s+'([0-9.]+)'/", $file, $match)) {
                 $version = $match[1];
             }
         }

app/Http/Middleware/CheckPassword.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use CDash\Model\AuthToken;
 use Closure;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
@@ -18,11 +19,28 @@ class CheckPassword
     public function handle($request, Closure $next)
     {
         $password_expired_path = '/editUser.php';
-        if (Auth::check() && !Str::contains(url()->current(), $password_expired_path)) {
-            $user = Auth::user();
-            if ($user->hasExpiredPassword()) {
-                $password_expired_uri = "{$password_expired_path}?password_expired=1";
-                return redirect($password_expired_uri);
+        if (Auth::check()) {
+            if (!Str::contains(url()->current(), $password_expired_path)) {
+                $user = Auth::user();
+                if ($user->hasExpiredPassword()) {
+                    $password_expired_uri = "{$password_expired_path}?password_expired=1";
+                    return redirect($password_expired_uri);
+                }
+            }
+        } else {
+            // Make sure we have a database before proceeding.
+            try {
+                \DB::connection()->getPdo();
+            } catch (\Exception $e) {
+                return $next($request);
+            }
+
+            // Check for the presence of a bearer token if we are not
+            // already authenticated.
+            $authtoken = new AuthToken();
+            $userid = $authtoken->getUserIdFromRequest();
+            if (!is_null($userid)) {
+                Auth::loginUsingId($userid);
             }
         }
 

app/cdash/app/Model/AuthToken.php

@@ -19,6 +19,8 @@
 use CDash\Config;
 use CDash\Database;
 
+require_once 'include/pdo.php';
+
 /** AuthToken class */
 class AuthToken
 {

app/cdash/include/api_common.php

@@ -18,7 +18,6 @@
 
 use App\Services\ProjectPermissions;
 
-use CDash\Model\AuthToken;
 use CDash\Model\Build;
 use CDash\Model\Project;
 use CDash\ServiceContainer;
@@ -108,13 +107,6 @@ function get_userid_from_session($required = true)
 {
     $userid = Auth::id();
 
-    // Check for the presence of a bearer token if no userid was found
-    // in the session.
-    if (is_null($userid)) {
-        $authtoken = new AuthToken();
-        $userid = $authtoken->getUserIdFromRequest();
-    }
-
     if ($required && is_null($userid)) {
         $response = ['error' => 'Permission denied'];
         json_error_response($response, 403);

app/cdash/include/common.php

@@ -20,7 +20,6 @@
 
 use CDash\Config;
 use CDash\Database;
-use CDash\Model\AuthToken;
 use CDash\ServiceContainer;
 use CDash\Model\Build;
 use CDash\Model\Project;

app/cdash/php.ini

@@ -6,3 +6,5 @@ log_errors = On
 error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
 
 memory_limit = 512M
+
+xdebug.mode=coverage

app/cdash/public/ajax/clientchecksystem.php

@@ -22,7 +22,7 @@
     "angular-ui-sortable": "^0.14.3",
     "ansi_up": "^3.0.0",
     "as-jqplot": "^1.0.8",
-    "axios": "^0.18",
+    "axios": "^0.21",
     "bootstrap": "^4.4.1",
     "bootstrap-vue": "^2.11.0",
     "cross-env": "^5.1",