aljaz/python-teos
1
0
Fork 0
mirror of https://github.com/aljazceru/python-teos.git synced 2025-12-17 14:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes API return HTTP return types and messages

Browse Source
This commit is contained in:
Sergi Delgado Segura
2020-03-27 12:07:26 +01:00
parent 2fcdc7eacc
commit 9e798916d1
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/constants.py
View File

@@ -5,6 +5,7 @@ LOCATOR_LEN_BYTES = LOCATOR_LEN_HEX // 2
# HTTP # HTTP
HTTP_OK = 200 HTTP_OK = 200
HTTP_BAD_REQUEST = 400 HTTP_BAD_REQUEST = 400
HTTP_NOT_FOUND = 404
HTTP_SERVICE_UNAVAILABLE = 503 HTTP_SERVICE_UNAVAILABLE = 503
# Temporary constants, may be changed # Temporary constants, may be changed

20
teos/api.py
View File

@@ -10,7 +10,13 @@ from teos.gatekeeper import NotEnoughSlots, IdentificationFailure
from common.logger import Logger from common.logger import Logger
from common.cryptographer import hash_160 from common.cryptographer import hash_160
from common.constants import HTTP_OK, HTTP_BAD_REQUEST, HTTP_SERVICE_UNAVAILABLE, ENCRYPTED_BLOB_MAX_SIZE_HEX from common.constants import (
HTTP_OK,
HTTP_BAD_REQUEST,
HTTP_SERVICE_UNAVAILABLE,
HTTP_NOT_FOUND,
ENCRYPTED_BLOB_MAX_SIZE_HEX,
)
# ToDo: #5-add-async-to-api # ToDo: #5-add-async-to-api
@@ -162,11 +168,11 @@ class API:
error = "appointment rejected. Error {}: {}".format(e.erno, e.reason) error = "appointment rejected. Error {}: {}".format(e.erno, e.reason)
response = {"error": error} response = {"error": error}
except (IdentificationFailure, NotEnoughSlots) as e: except (IdentificationFailure, NotEnoughSlots):
rcode = HTTP_BAD_REQUEST rcode = HTTP_BAD_REQUEST
error = "appointment rejected. Error {}: {}".format( error = "appointment rejected. Error {}: {}".format(
errors.APPOINTMENT_INVALID_SIGNATURE_OR_INSUFFICIENT_SLOTS, errors.APPOINTMENT_INVALID_SIGNATURE_OR_INSUFFICIENT_SLOTS,
"Invalid signature or the user does not have enough slots available", "Invalid signature or user does not have enough slots available",
) )
response = {"error": error} response = {"error": error}
@@ -219,24 +225,26 @@ class API:
if uuid in triggered_appointments: if uuid in triggered_appointments:
response = self.watcher.db_manager.load_responder_tracker(uuid) response = self.watcher.db_manager.load_responder_tracker(uuid)
if response: if response:
rcode = HTTP_OK
response["status"] = "dispute_responded" response["status"] = "dispute_responded"
else: else:
rcode = HTTP_NOT_FOUND
response = {"locator": locator, "status": "not_found"} response = {"locator": locator, "status": "not_found"}
# Otherwise it should be either in the watcher, or not in the system. # Otherwise it should be either in the watcher, or not in the system.
else: else:
response = self.watcher.db_manager.load_watcher_appointment(uuid) response = self.watcher.db_manager.load_watcher_appointment(uuid)
if response: if response:
rcode = HTTP_OK
response["status"] = "being_watched" response["status"] = "being_watched"
else: else:
rcode = HTTP_NOT_FOUND
response = {"locator": locator, "status": "not_found"} response = {"locator": locator, "status": "not_found"}
except (InspectionFailed, IdentificationFailure): except (InspectionFailed, IdentificationFailure):
rcode = HTTP_NOT_FOUND
response = {"locator": locator, "status": "not_found"} response = {"locator": locator, "status": "not_found"}
finally:
rcode = HTTP_OK
else: else:
rcode = HTTP_BAD_REQUEST rcode = HTTP_BAD_REQUEST
error = "appointment rejected. Request is not json encoded" error = "appointment rejected. Request is not json encoded"