From 0056c3aa52cbb28b263a7a609ae5f17618b36652 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Mon, 4 Dec 2023 17:36:43 +0100
Subject: [PATCH] Merge pull request from GHSA-h56g-gq9v-vc8r
Co-authored-by: Steven Silvester <steven.silvester@ieee.org>
---
jupyter_server/base/handlers.py | 5 +++--
jupyter_server/services/kernels/handlers.py | 4 +---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/jupyter_server/base/handlers.py b/jupyter_server/base/handlers.py
index e6e6b3246..b1b783cca 100644
--- a/jupyter_server/base/handlers.py
+++ b/jupyter_server/base/handlers.py
@@ -10,7 +10,6 @@
import mimetypes
import os
import re
-import traceback
import types
import warnings
from http.client import responses
@@ -748,7 +747,9 @@ def write_error(self, status_code: int, **kwargs: Any) -> None:
else:
reply["message"] = "Unhandled error"
reply["reason"] = None
- reply["traceback"] = "".join(traceback.format_exception(*exc_info))
+ # backward-compatibility: traceback field is present,
+ # but always empty
+ reply["traceback"] = ""
self.log.warning("wrote error: %r", reply["message"], exc_info=True)
self.finish(json.dumps(reply))
diff --git a/jupyter_server/services/kernels/handlers.py b/jupyter_server/services/kernels/handlers.py
index 2fb753e93..217f0c9cc 100644
--- a/jupyter_server/services/kernels/handlers.py
+++ b/jupyter_server/services/kernels/handlers.py
@@ -5,7 +5,6 @@
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import json
-from traceback import format_tb
try:
from jupyter_client.jsonutil import json_default
@@ -102,8 +101,7 @@ async def post(self, kernel_id, action):
except Exception as e:
message = "Exception restarting kernel"
self.log.error(message, exc_info=True)
- traceback = format_tb(e.__traceback__)
- self.write(json.dumps({"message": message, "traceback": traceback}))
+ self.write(json.dumps({"message": message, "traceback": ""}))
self.set_status(500)
else:
model = await ensure_async(km.kernel_model(kernel_id))