From 4539792cdcb871aab1dc337dd15e1ff14510d118 Mon Sep 17 00:00:00 2001 From: j Date: Tue, 1 Jan 2019 01:44:33 +0100 Subject: [PATCH] fix resolv loop --- oml/localnodes.py | 2 +- oml/node/server.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/oml/localnodes.py b/oml/localnodes.py index f1a890f..5e7129b 100644 --- a/oml/localnodes.py +++ b/oml/localnodes.py @@ -155,4 +155,4 @@ class LocalNodes(dict): def get(self, user_id): if user_id in self and can_connect(self[user_id]): - return self.get(user_id) + return self[user_id] if user_id in self else None diff --git a/oml/node/server.py b/oml/node/server.py index ee7a5b9..73b2e45 100644 --- a/oml/node/server.py +++ b/oml/node/server.py @@ -112,6 +112,8 @@ class Handler(http.server.SimpleHTTPRequestHandler): return self.do_GET() def do_GET(self): + #x509 = self.connection.get_peer_certificate() + #user_id = get_service_id(x509.get_pubkey()) if x509 else None import item.models parts = self.path.split('/') if len(parts) == 3 and parts[1] in ('get', 'preview'): @@ -190,8 +192,7 @@ class Handler(http.server.SimpleHTTPRequestHandler): if not u: return self._denied() if u.pending: - logger.debug('ignore request from pending peer[%s] %s (%s)', - user_id, action, args) + logger.debug('ignore request from pending peer[%s]', user_id) return self._denied() if not u.peered and u.pending == 'sent': u.update_peering(True)