Merge branch 'develop'

Dockerfile

@@ -15,7 +15,6 @@ COPY dbutils.py dbutils.py
 COPY read.py read.py
 ADD core core
 ADD titles titles
-ADD config config
 ADD logs logs
 ADD cert cert
 

changelog.md

@@ -1,6 +1,13 @@
 # Changelog
 Documenting updates to ARTEMiS, to be updated every time the master branch is pushed to.
 
+## 20240109
+### System
++ Removed `ADD config config` from dockerfile
+
+### Aimedb
++ Fixed an error that resulted from trying to scan a banned or locked card
+
 ## 20240108
 ### System
 + Change how the underlying system handles URLs

core/aimedb.py

@@ -149,13 +149,13 @@ class AimedbProtocol(Protocol):
         is_banned = self.data.card.get_card_banned(req.access_code)
         is_locked = self.data.card.get_card_locked(req.access_code)
 
+        ret = ADBLookupResponse.from_req(req.head, user_id)
         if is_banned and is_locked:
             ret.head.status = ADBStatus.BAN_SYS_USER
         elif is_banned:
             ret.head.status = ADBStatus.BAN_SYS
         elif is_locked:
             ret.head.status = ADBStatus.LOCK_USER
-        ret = ADBLookupResponse.from_req(req.head, user_id)
         
         self.logger.info(
             f"access_code {req.access_code} -> user_id {ret.user_id}"