From a1ff998b687f41ea70cbf5506eca7c60de133290 Mon Sep 17 00:00:00 2001
From: A B <ab@hexor.cy>
Date: Sat, 26 Oct 2024 12:22:19 +0000
Subject: [PATCH] Fix

---
 mysite/urls.py | 4 ++--
 vpn/models.py  | 4 ++--
 vpn/tasks.py   | 3 ++-
 vpn/views.py   | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mysite/urls.py b/mysite/urls.py
index cc5f523..32a1951 100644
--- a/mysite/urls.py
+++ b/mysite/urls.py
@@ -21,7 +21,7 @@ from vpn.views import shadowsocks
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path('ss/<str:link>', shadowsocks, name='shadowsocks'),
-    path('dynamic/<str:link>', shadowsocks, name='shadowsocks'),
+    path('ss/<path:link>', shadowsocks, name='shadowsocks'),
+    path('dynamic/<path:link>', shadowsocks, name='shadowsocks'),
     path('', RedirectView.as_view(url='/admin/', permanent=False)),
 ]
\ No newline at end of file
diff --git a/vpn/models.py b/vpn/models.py
index a733170..29509fc 100644
--- a/vpn/models.py
+++ b/vpn/models.py
@@ -48,8 +48,8 @@ class ACL(models.Model):
 
 @receiver(post_save, sender=ACL)
 def acl_created_or_updated(sender, instance, created, **kwargs):
-    sync_user.delay_on_commit(instance.user, instance.server.id)
+    sync_user.delay_on_commit(instance.user.id, instance.server.id)
 
 @receiver(pre_delete, sender=ACL)
 def acl_deleted(sender, instance, **kwargs):
-    sync_user.delay_on_commit(instance.user, instance.server.id)
\ No newline at end of file
+    sync_user.delay_on_commit(instance.user.id, instance.server.id)
\ No newline at end of file
diff --git a/vpn/tasks.py b/vpn/tasks.py
index 537235e..efb37f4 100644
--- a/vpn/tasks.py
+++ b/vpn/tasks.py
@@ -47,12 +47,13 @@ def sync_server(id):
     return {"status": Server.objects.get(id=id).sync()}
 
 @shared_task(name="sync_user_on_server")
-def sync_user(user, server_id):
+def sync_user(user_id, server_id):
     from .models import User, ACL
     from vpn.server_plugins import Server
     
     errors = {}
     result = {}
+    user = User.objects.get(id=user_id)
     acls = ACL.objects.filter(user=user)
 
     server = Server.objects.get(id=server_id)
diff --git a/vpn/views.py b/vpn/views.py
index a92c42c..9586be9 100644
--- a/vpn/views.py
+++ b/vpn/views.py
@@ -7,8 +7,8 @@ def shadowsocks(request, link):
     acl = get_object_or_404(ACL, link=link)
     try:
         server_user = acl.server.get_user(acl.user, raw=True)
-    except:
-        return JsonResponse({"error": "Couldn't get credentials from server."})
+    except Exception as e:
+        return JsonResponse({"error": f"Couldn't get credentials from server. {e}"})
 
     config = {
         "info": "Managed by OutFleet_v2 [github.com/house-of-vanity/OutFleet/]",