From 43c86e2075f33a348077745a048f5ccecb77990a Mon Sep 17 00:00:00 2001
From: Ultradesu <ultradesu@hexor.cy>
Date: Thu, 13 Mar 2025 01:43:33 +0200
Subject: [PATCH] Fix key ids

---
 Dockerfile                    |  4 ++--
 docker-compose.yaml           |  6 ++----
 vpn/server_plugins/outline.py | 21 ++++++++++++---------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ce34165..9d8ec1e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,9 +2,9 @@ FROM python:3.12.3
 
 WORKDIR /app
 
-#COPY requirements.txt ./
-COPY . .
+COPY ./requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
+COPY . .
 RUN python manage.py collectstatic --noinput
 
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 643b9a8..fcd2534 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,8 +3,6 @@ services:
     #image: ultradesu/outfleet:v2
     image: outfleet:local
     container_name: outfleet-web
-#    volumes:
-#      - .:/app
     build:
       context: .
     ports:
@@ -27,7 +25,7 @@ services:
              python manage.py create_admin &&
              python manage.py runserver 0.0.0.0:8000"
   worker:
-    image: ultradesu/outfleet:v2
+    image: outfleet:local
     container_name: outfleet-worker
 #    volumes:
 #      - .:/app
@@ -46,7 +44,7 @@ services:
     command: >
       sh -c "sleep 3 && celery -A mysite worker"
   beat:
-    image: ultradesu/outfleet:v2
+    image: outfleet:local
     container_name: outfleet-beat
 #    volumes:
 #      - .:/app
diff --git a/vpn/server_plugins/outline.py b/vpn/server_plugins/outline.py
index fde5a61..cdbbe62 100644
--- a/vpn/server_plugins/outline.py
+++ b/vpn/server_plugins/outline.py
@@ -67,6 +67,9 @@ class OutlineServer(Server):
     
     def get_server_status(self, raw=False):
         status = {}
+
+        for key in self.client.get_keys():
+            c.delete_key(key.key_id)
         try:
             info = self.client.get_server_information()
             if raw:
@@ -115,7 +118,10 @@ class OutlineServer(Server):
             raise OutlineConnectionError("Client error. Can't connect.", original_exception=e)
 
     def _get_key(self, user):
-        return self.client.get_key(user.hash)
+        logger.error(f"Asking for key for user {user.username}")
+        result = self.client.get_key(str(user.username))
+        logger.error(f"Got key for user {user.username} - {result}")
+        return result
 
     def get_user(self, user, raw=False):
         user_info = self._get_key(user)
@@ -150,9 +156,8 @@ class OutlineServer(Server):
             self.client.delete_key(user.hash):
 
                 self.delete_user(user)
-                key_id = f"{user.username}-{user.hash}"
                 key = self.client.create_key(
-                    key_id=key_id,
+                    key_id=user.username,
                     name=user.username,
                     method=server_user.method,
                     password=user.hash,
@@ -162,9 +167,8 @@ class OutlineServer(Server):
                 logger.debug(f"[{self.name}] User {user.username} updated")
         else:
             try:
-                key_id = f"{user.username}-{user.hash}"
                 key = self.client.create_key(
-                    key_id=key_id,
+                    key_id=user.username,
                     name=user.username,
                     method="chacha20-ietf-poly1305",
                     password=user.hash,
@@ -177,10 +181,9 @@ class OutlineServer(Server):
                 if "code\":\"Conflict" in error_message:
                     logger.warning(f"[{self.name}] Conflict for User {user.username}, trying to force sync. {error_message}")
                     for key in self.client.get_keys():
-                        logger.warning(f"[{self.name}] hash: {user.hash}, password: {key.password}")
+                        logger.warning(f"[{self.name}] checking user: {key.name} passowrd: {key.password}")
                         if key.password == user.hash:
-                            self.client.delete_key(key.key_id)
-                            logger.warning(f"[{self.name}] Removed orphan key{str(key)}")
+                            self.delete_user(user)
                     return self.add_user(user)
                 else:
                     raise OutlineConnectionError("API Error", original_exception=e)
@@ -203,7 +206,7 @@ class OutlineServer(Server):
             return {"status": "User not found on server. Nothing to do."}
 
         if server_user:
-            self.logger.info(f"[{self.name}] TEST")
+            self.logger.info(f"Deleting key with key_id: {server_user.key_id}")
             self.client.delete_key(server_user.key_id)
             result = {"status": "User was deleted"}
             self.logger.info(f"[{self.name}] User deleted: {user.username} on server {self.name}")