Hay1tsme
/
artemis
20
39
Fork 30
Code Issues 12 Pull Requests 3 Packages Projects Releases Wiki Activity

Merge branch 'develop'

This commit is contained in:
Hay1tsme 2024-01-09 10:34:27 -05:00
parent add85aeab7 0c3924a8f0
commit d09f3e9907
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

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

7
changelog.md
View File

@ -1,6 +1,13 @@
# Changelog # Changelog
Documenting updates to ARTEMiS, to be updated every time the master branch is pushed to. 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 ## 20240108
### System ### System
+ Change how the underlying system handles URLs + Change how the underlying system handles URLs

2
core/aimedb.py
View File

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