Add to settings

Author: jtpio

jupyter_server/log.py

@@ -62,9 +62,7 @@ def log_request(handler, record_prometheus_metrics=True):
     except AttributeError:
         logger = access_log
 
-    extra_param_keys = []
-    if hasattr(handler, "serverapp") and hasattr(handler.serverapp, "extra_log_scrub_param_keys"):
-        extra_param_keys = handler.serverapp.extra_log_scrub_param_keys
+    extra_param_keys = handler.settings.get("extra_log_scrub_param_keys", [])
 
     if status < 300 or status == 304:
         # Successes (or 304 FOUND) are debug-level

jupyter_server/serverapp.py

@@ -442,6 +442,7 @@ def init_settings(
             "allow_remote_access": jupyter_app.allow_remote_access,
             "local_hostnames": jupyter_app.local_hostnames,
             "authenticate_prometheus": jupyter_app.authenticate_prometheus,
+            "extra_log_scrub_param_keys": jupyter_app.extra_log_scrub_param_keys,
             # managers
             "kernel_manager": kernel_manager,
             "contents_manager": contents_manager,

tests/test_log.py

@@ -31,7 +31,9 @@ def test_log_request_scrubs_sensitive_params_default(server_app_with_default_scr
     handler.request.remote_ip = "127.0.0.1"
     handler.request.uri = "http://example.com/path?token=secret123&normal=value"
     handler.request.request_time.return_value = 0.1
-    handler.serverapp = server_app_with_default_scrub_keys
+    handler.settings = {
+        "extra_log_scrub_param_keys": server_app_with_default_scrub_keys.extra_log_scrub_param_keys
+    }
     handler.log = Mock()
     handler.current_user = None
 
@@ -55,7 +57,9 @@ def test_log_request_scrubs_sensitive_params_extra(server_app_with_extra_scrub_k
         "http://example.com/path?password=secret123&token=default_token&normal=value"
     )
     handler.request.request_time.return_value = 0.1
-    handler.serverapp = server_app_with_extra_scrub_keys
+    handler.settings = {
+        "extra_log_scrub_param_keys": server_app_with_extra_scrub_keys.extra_log_scrub_param_keys
+    }
     handler.log = Mock()
     handler.current_user = None