From 21ed8747e25f196580ca8d2a5e309ecef73eabc5 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 9 Jun 2025 21:33:57 +0900
Subject: [PATCH] Replace bare except

... to ensure the logic works only valid exceptions.
---
 websockify/sysloghandler.py | 4 +---
 websockify/token_plugins.py | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/websockify/sysloghandler.py b/websockify/sysloghandler.py
index b85596b..eb8da6d 100644
--- a/websockify/sysloghandler.py
+++ b/websockify/sysloghandler.py
@@ -108,7 +108,5 @@ class WebsockifySysLogHandler(handlers.SysLogHandler):
                 else:
                     self.socket.sendall(msg)
 
-        except (KeyboardInterrupt, SystemExit):
-            raise
-        except:
+        except Exception:
             self.handleError(record)
diff --git a/websockify/token_plugins.py b/websockify/token_plugins.py
index 3c19206..9307356 100644
--- a/websockify/token_plugins.py
+++ b/websockify/token_plugins.py
@@ -157,10 +157,10 @@ class JWTTokenApi(BasePlugin):
 
             try:
                 key.import_from_pem(key_data)
-            except:
+            except Exception:
                 try:
                     key.import_key(k=key_data.decode('utf-8'), kty='oct')
-                except:
+                except Exception:
                     logger.error('Failed to correctly parse key data!')
                     return None