FGO/artemis
3
2
Fork 0
forked from Dniel97/artemis
Code Pull Requests Activity

billing: fixes

Browse Source
This commit is contained in:
Hay1tsme 2023-12-02 21:01:33 -05:00
parent ed2d306dee
commit d024b2eeb8
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
core/allnet.py
View File

@ -432,16 +432,17 @@ class AllnetServlet:
signer = PKCS1_v1_5.new(rsa) signer = PKCS1_v1_5.new(rsa)
digest = SHA.new() digest = SHA.new()
traces: List[TraceData] = [] traces: List[TraceData] = []
try: try:
for x in range(len(req_dict)): req = BillingInfo(req_dict[0])
if not req_dict[x]: except KeyError as e:
continue self.logger.error(f"Billing request failed to parse: {e}")
return f"result=5&linelimit=&message=field is missing or formatting is incorrect\r\n".encode()
if x == 0:
req = BillingInfo(req_dict[x])
continue
for x in range(1, len(req_dict)):
if not req_dict[x]:
continue
try:
tmp = TraceData(req_dict[x]) tmp = TraceData(req_dict[x])
if tmp.trace_type == TraceDataType.CHARGE: if tmp.trace_type == TraceDataType.CHARGE:
tmp = TraceDataCharge(req_dict[x]) tmp = TraceDataCharge(req_dict[x])
@ -451,12 +452,12 @@ class AllnetServlet:
tmp = TraceDataCredit(req_dict[x]) tmp = TraceDataCredit(req_dict[x])
traces.append(tmp) traces.append(tmp)
except KeyError as e:
self.logger.warn(f"Tracelog failed to parse: {e}")
kc_serial_bytes = req.keychipid.encode() kc_serial_bytes = req.keychipid.encode()
except KeyError as e:
self.logger.error(f"Billing request failed to parse: {e}")
return f"result=5&linelimit=&message=field is missing or formatting is incorrect\r\n".encode()
machine = self.data.arcade.get_machine(req.keychipid) machine = self.data.arcade.get_machine(req.keychipid)
if machine is None and not self.config.server.allow_unregistered_serials: if machine is None and not self.config.server.allow_unregistered_serials:
@ -693,9 +694,17 @@ class TraceData:
self.seq_number = int(data.get("sn", None)) self.seq_number = int(data.get("sn", None))
self.trace_type = TraceDataType(int(data.get("tt", None))) self.trace_type = TraceDataType(int(data.get("tt", None)))
self.date_sync_flg = bool(data.get("ds", None)) self.date_sync_flg = bool(data.get("ds", None))
self.date = datetime.strptime(data.get("dt", None), BILLING_DT_FORMAT)
dt = data.get("dt", None)
if dt is None:
raise KeyError("dt not present")
if dt == "20000000000000": # Not sure what causes it to send like this...
self.date = datetime(2000, 1, 1, 0, 0, 0, 0)
else:
self.date = datetime.strptime(data.get("dt", None), BILLING_DT_FORMAT)
self.keychip = str(data.get("kn", None)) self.keychip = str(data.get("kn", None))
self.lib_ver = float(data.get("alib", None)) self.lib_ver = float(data.get("alib", 0))
except Exception as e: except Exception as e:
raise KeyError(e) raise KeyError(e)
@ -703,8 +712,8 @@ class TraceDataCharge(TraceData):
def __init__(self, data: Dict) -> None: def __init__(self, data: Dict) -> None:
super().__init__(data) super().__init__(data)
try: try:
self.game_id = str(data.get("gi", None)) self.game_id = str(data.get("gi", None)) # these seem optional...?
self.game_version = float(data.get("gv", None)) self.game_version = float(data.get("gv", 0))
self.board_serial = str(data.get("bn", None)) self.board_serial = str(data.get("bn", None))
self.shop_ip = str(data.get("ti", None)) self.shop_ip = str(data.get("ti", None))
self.play_count = int(data.get("pc", None)) self.play_count = int(data.get("pc", None))