From dcb4d75247d2c279501d0fbb52f72d24d41c6b6b Mon Sep 17 00:00:00 2001
From: timotheyca <tim@ongoteam.yaconnect.com>
Date: Sat, 27 Nov 2021 18:12:14 +0300
Subject: [PATCH] base64->hex + Dockerfile

---
 Dockerfile      | 8 ++++++++
 v6d0auth/app.py | 3 +--
 v6d0auth/cdb.py | 3 +--
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..399eb75
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,8 @@
+# syntax=docker/dockerfile:1
+FROM python:3.9
+WORKDIR /v6
+ENV v6root=/v6data
+COPY requirements.txt requirements.txt
+RUN pip install -r requirements.txt
+COPY v6d0auth v6d0auth
+CMD ["python3", "-m", "v6d0auth.run-server"]
diff --git a/v6d0auth/app.py b/v6d0auth/app.py
index e346f9d..3af287c 100644
--- a/v6d0auth/app.py
+++ b/v6d0auth/app.py
@@ -1,6 +1,5 @@
 import asyncio.futures
 
-from nacl.encoding import URLSafeBase64Encoder
 from aiohttp import web, http_websocket
 from nacl.exceptions import BadSignatureError
 from nacl.signing import VerifyKey
@@ -11,7 +10,7 @@ __all__ = ('get_app',)
 
 
 def define_routes(routes: web.RouteTableDef, loop: asyncio.AbstractEventLoop):
-    print(certs.vkey.encode(URLSafeBase64Encoder).decode())
+    print(certs.vkey.encode().hex())
     mycdb = cdb.CDB(loop)
     loop.create_task(mycdb.job())
 
diff --git a/v6d0auth/cdb.py b/v6d0auth/cdb.py
index cb70c19..96a0d0f 100644
--- a/v6d0auth/cdb.py
+++ b/v6d0auth/cdb.py
@@ -5,7 +5,6 @@ import time
 import weakref
 from typing import MutableMapping, Optional
 
-from nacl.encoding import URLSafeBase64Encoder
 from nacl.signing import VerifyKey
 from nacl.utils import random
 
@@ -74,7 +73,7 @@ class CDB:
         self.requester_mapping[requester] = request
         heapq.heappush(self.heap, request)
         self.handle_mapping[request.handle] = request
-        print('requested', request.handle.hex(), requester.encode(URLSafeBase64Encoder).decode())
+        print('requested', request.handle.hex(), requester.encode().hex())
         return request
 
     def _approve(self, handle: bytes) -> bytes: