From d790479486cd2f6ef0db967e35a2425e5b93d743 Mon Sep 17 00:00:00 2001
From: Peter Portante <peter.portante@redhat.com>
Date: Tue, 20 Dec 2022 11:15:17 -0500
Subject: [PATCH 1/2] Use the correct `abort` method

---
 lib/pbench/server/auth/auth.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/pbench/server/auth/auth.py b/lib/pbench/server/auth/auth.py
index c3f7ff98e5..ed95b07540 100644
--- a/lib/pbench/server/auth/auth.py
+++ b/lib/pbench/server/auth/auth.py
@@ -3,8 +3,9 @@
 import os
 from typing import Optional
 
-from flask import abort, request
+from flask import request
 from flask_httpauth import HTTPTokenAuth
+from flask_restful import abort
 import jwt
 
 from pbench.server.auth import OpenIDClient, OpenIDClientError
@@ -60,26 +61,29 @@ def get_secret_key(self):
 
     def get_auth_token(self, logger):
         # get auth token
+        example = (
+            "Please add Authorization header with Bearer token as,"
+            " 'Authorization: Bearer <session_token>'"
+        )
         auth_header = request.headers.get("Authorization")
-
         if not auth_header:
             abort(
                 HTTPStatus.FORBIDDEN,
-                message="Please add authorization token as 'Authorization: Bearer <session_token>'",
+                message=f"No Authorization header provided.  {example}",
             )
 
         try:
-            auth_schema, auth_token = auth_header.split()
+            auth_schema, auth_token = auth_header.split(" ", 1)
         except ValueError:
             abort(
                 HTTPStatus.UNAUTHORIZED,
-                message="Malformed Authorization header, please add request header as Authorization: Bearer <session_token>",
+                message=f"Malformed Authorization header.  {example}",
             )
         else:
             if auth_schema.lower() != "bearer":
                 abort(
                     HTTPStatus.UNAUTHORIZED,
-                    message="Malformed Authorization header, request needs bearer token: Bearer <session_token>",
+                    message=f"Malformed Authorization header.  {example}",
                 )
             return auth_token
 

From bebdaafc2a22ea2a8eedb38e7344fcb95d047be5 Mon Sep 17 00:00:00 2001
From: Peter Portante <peter.portante@redhat.com>
Date: Tue, 20 Dec 2022 09:50:41 -0500
Subject: [PATCH 2/2] Remove use of `next` keyword as a variable

---
 lib/pbench/client/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pbench/client/__init__.py b/lib/pbench/client/__init__.py
index e9c9e64515..7f0ee1eef6 100644
--- a/lib/pbench/client/__init__.py
+++ b/lib/pbench/client/__init__.py
@@ -436,10 +436,10 @@ def get_list(self, **kwargs) -> Iterator[Dataset]:
         while True:
             for d in json["results"]:
                 yield Dataset(d)
-            next = json.get("next_url")
-            if "offset" in args or not next:
+            next_url = json.get("next_url")
+            if "offset" in args or not next_url:
                 break
-            json = self.get(uri=next).json()
+            json = self.get(uri=next_url).json()
 
     def get_metadata(self, dataset_id: str, metadata: list[str]) -> JSONOBJECT:
         """Return requested metadata for a specified dataset.