handle invalid keys by returning HTTPBadRequest

1 files changed, 7 insertions, 1 deletions

diff --git a/pypaste/server/__init__.py b/pypaste/server/__init__.py
index 582d4f8..1c40f71 100644
--- a/pypaste/server/__init__.py
+++ b/pypaste/server/__init__.py
@@ -160,7 +160,13 @@ class App:
             return web.HTTPBadRequest(text="provide a key to fetch")
 
         try:
-            paste = await self.storage.retrieve(dehumanize(key))
+            dehumanized_key = dehumanize(key)
+        except Exception as e:
+            log_warning(f"invalid key parameter: {key}: {e}")
+            return web.HTTPBadRequest(text="invalid key")
+
+        try:
+            paste = await self.storage.retrieve(dehumanized_key)
         except Exception as e:
             log_error(f"failed to retrieve paste {key}: {e}")
             return web.HTTPInternalServerError()