3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

database: return 404 when a key or namespace is not found 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-03-03 19:23:18 -05:00
parent 84f46b1cb1
commit 63c685e1c4
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
moonraker/plugins/database.py
View File

@ -107,8 +107,7 @@ class MoonrakerDatabase:
item = reduce(operator.getitem, key_list[1:-1], record) item = reduce(operator.getitem, key_list[1:-1], record)
except Exception: except Exception:
raise self.server.error( raise self.server.error(
f"Error updating value at key '{key}' " f"Key '{key}' in namespace '{namespace}' not found", 404)
f"in namespace '{namespace}'. Key doesn't exist.")
if isinstance(item[key_list[-1]], dict) \ if isinstance(item[key_list[-1]], dict) \
and isinstance(value, dict): and isinstance(value, dict):
item[key_list[-1]].update(value) item[key_list[-1]].update(value)
@ -128,7 +127,7 @@ class MoonrakerDatabase:
val = item.pop(key_list[-1]) val = item.pop(key_list[-1])
except Exception: except Exception:
raise self.server.error( raise self.server.error(
f"Error deleting key '{key}' in namespace '{namespace}'") f"Key '{key}' in namespace '{namespace}' not found", 404)
remove_record = False if record else True remove_record = False if record else True
if remove_record: if remove_record:
db = self.namespaces[namespace] db = self.namespaces[namespace]
@ -156,8 +155,7 @@ class MoonrakerDatabase:
if default != Sentinel: if default != Sentinel:
return default return default
raise self.server.error( raise self.server.error(
f"Invalid database key, namespace: '{namespace}', " f"Key '{key}' in namespace '{namespace}' not found", 404)
f"key: {key}")
return val return val
def ns_length(self, namespace): def ns_length(self, namespace):
@ -202,7 +200,7 @@ class MoonrakerDatabase:
def wrap_namespace(self, namespace, parse_keys=True): def wrap_namespace(self, namespace, parse_keys=True):
if namespace not in self.namespaces: if namespace not in self.namespaces:
raise self.server.error( raise self.server.error(
f"Invalid database namespace '{namespace}'") f"Namespace '{namespace}' not found", 404)
self.protected_namespaces.add(namespace) self.protected_namespaces.add(namespace)
return NamespaceWrapper(namespace, self, parse_keys) return NamespaceWrapper(namespace, self, parse_keys)
@ -212,7 +210,7 @@ class MoonrakerDatabase:
except Exception: except Exception:
key_list = [] key_list = []
if not key_list or "" in key_list: if not key_list or "" in key_list:
raise self.server.error(f"Key '{key}' is invalid") raise self.server.error(f"Invalid Key Format: '{key}'")
return key_list return key_list
def _insert_record(self, namespace, key, val): def _insert_record(self, namespace, key, val):
@ -224,7 +222,7 @@ class MoonrakerDatabase:
def _get_record(self, namespace, key, force=False): def _get_record(self, namespace, key, force=False):
if namespace not in self.namespaces: if namespace not in self.namespaces:
raise self.server.error( raise self.server.error(
f"Invalid database namespace '{namespace}'") f"Namespace '{namespace}' not found", 404)
db = self.namespaces[namespace] db = self.namespaces[namespace]
with self.lmdb_env.begin(buffers=True, db=db) as txn: with self.lmdb_env.begin(buffers=True, db=db) as txn:
value = txn.get(key.encode()) value = txn.get(key.encode())
@ -232,7 +230,7 @@ class MoonrakerDatabase:
if force: if force:
return {} return {}
raise self.server.error( raise self.server.error(
f"Invalid key '{key}' in namespace '{namespace}'") f"Key '{key}' in namespace '{namespace}' not found", 404)
return self._decode_value(value) return self._decode_value(value)
def _get_namespace(self, namespace): def _get_namespace(self, namespace):