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

database: check for invalid keys 

It is invalid for a namespace to contain a top level key represented as an empty bytestring.  If this is detected, log the result and drop the invalid key.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-06-13 08:18:12 -04:00
parent 92423911a9
commit 9a316fe84a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
moonraker/components/database.py
View File

@ -316,12 +316,21 @@ class MoonrakerDatabase:
f"Invalid database namespace '{namespace}'") f"Invalid database namespace '{namespace}'")
db = self.namespaces[namespace] db = self.namespaces[namespace]
result = {} result = {}
invalid_key_result = None
with self.lmdb_env.begin(buffers=True, db=db) as txn: with self.lmdb_env.begin(buffers=True, db=db) as txn:
cursor = txn.cursor() cursor = txn.cursor()
cursor.first() cursor.first()
for db_key, value in cursor: for db_key, value in cursor:
k = bytes(db_key).decode() k = bytes(db_key).decode()
if not k:
invalid_key_result = self._decode_value(value)
continue
result[k] = self._decode_value(value) result[k] = self._decode_value(value)
if invalid_key_result:
logging.info(f"Invalid Key found in namespace '{namespace}', "
f"dropping value: {repr(invalid_key_result)}")
with self.lmdb_env.begin(write=True, buffers=True, db=db) as txn:
txn.delete(b"")
return result return result
def _encode_value(self, value: DBRecord) -> bytes: def _encode_value(self, value: DBRecord) -> bytes: