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

Applies new uuid apporach to the Watcher

Browse Source
This commit is contained in:
Sergi Delgado Segura
2020-03-26 17:42:10 +01:00
parent 460a98d42f
commit 3d8c0a9498
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
teos/watcher.py
View File

@@ -1,4 +1,3 @@
from uuid import uuid4
from queue import Queue from queue import Queue
from threading import Thread from threading import Thread
@@ -6,7 +5,7 @@ import common.cryptographer
from common.logger import Logger from common.logger import Logger
from common.tools import compute_locator from common.tools import compute_locator
from common.appointment import Appointment from common.appointment import Appointment
from common.cryptographer import Cryptographer from common.cryptographer import Cryptographer, hash_160
from teos import LOG_PREFIX from teos import LOG_PREFIX
from teos.cleaner import Cleaner from teos.cleaner import Cleaner
@@ -77,7 +76,7 @@ class Watcher:
return watcher_thread return watcher_thread
def add_appointment(self, appointment): def add_appointment(self, appointment, user_pk):
""" """
Adds a new appointment to the ``appointments`` dictionary if ``max_appointments`` has not been reached. Adds a new appointment to the ``appointments`` dictionary if ``max_appointments`` has not been reached.
@@ -96,6 +95,7 @@ class Watcher:
Args: Args:
appointment (:obj:`Appointment <teos.appointment.Appointment>`): the appointment to be added to the appointment (:obj:`Appointment <teos.appointment.Appointment>`): the appointment to be added to the
:obj:`Watcher`. :obj:`Watcher`.
user_pk(:obj:`str`): the public key that identifies the user who sent the appointment (33-bytes hex str).
Returns: Returns:
:obj:`tuple`: A tuple signaling if the appointment has been added or not (based on ``max_appointments``). :obj:`tuple`: A tuple signaling if the appointment has been added or not (based on ``max_appointments``).
@@ -108,7 +108,10 @@ class Watcher:
if len(self.appointments) < self.max_appointments: if len(self.appointments) < self.max_appointments:
uuid = uuid4().hex # The uuids are generated as the RIPMED160(locator||user_pubkey), that way the tower does not need to know
# anything about the user from this point on (no need to store user_pk in the database).
# If an appointment is requested by the user the uuid can be recomputed and queried straightaway (no maps).
uuid = hash_160("{}{}".format(appointment.locator, user_pk))
self.appointments[uuid] = {"locator": appointment.locator, "end_time": appointment.end_time} self.appointments[uuid] = {"locator": appointment.locator, "end_time": appointment.end_time}
if appointment.locator in self.locator_uuid_map: if appointment.locator in self.locator_uuid_map: