HevSocks5Server: Add support for set socket mark for user.

heiher · Sep 16, 2023 · 83f446b · 83f446b
1 parent e9918ba
commit 83f446b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -74,7 +74,7 @@ main:
 ### Authentication file
 
 ```
-<USERNAME> <SPACE> <PASSWORD> <LF>
+<USERNAME> <SPACE> <PASSWORD> <SPACE> <MARK> <LF>
 ```
 
 ### Run

diff --git a/conf/auth.txt b/conf/auth.txt
@@ -1,2 +1,2 @@
 tom pass
-jerry pass
+jerry pass 1a
diff --git a/src/hev-socks5-proxy.c b/src/hev-socks5-proxy.c
@@ -23,6 +23,7 @@
 #include "hev-logger.h"
 #include "hev-socks5-worker.h"
 #include "hev-socket-factory.h"
+#include "hev-socks5-user-mark.h"
 
 #include "hev-socks5-proxy.h"
 
@@ -261,10 +262,11 @@ hev_socks5_proxy_load (void)
     hev_object_set_atomic (HEV_OBJECT (auth), 1);
 
     if (!file) {
-        HevSocks5User *user;
+        HevSocks5UserMark *user;
 
-        user = hev_socks5_user_new (name, strlen (name), pass, strlen (pass));
-        hev_socks5_authenticator_add (auth, user);
+        user = hev_socks5_user_mark_new (name, strlen (name), pass,
+                                         strlen (pass), 0);
+        hev_socks5_authenticator_add (auth, HEV_SOCKS5_USER (user));
         hev_object_set_atomic (HEV_OBJECT (user), 1);
     } else {
         char *line = NULL;
@@ -279,24 +281,25 @@ hev_socks5_proxy_load (void)
         }
 
         while ((nread = getline (&line, &len, fp)) != -1) {
-            HevSocks5User *user;
+            HevSocks5UserMark *user;
             unsigned int nlen;
             unsigned int plen;
             char name[256];
             char pass[256];
+            long mark = 0;
             int res;
 
-            res = sscanf (line, "%255s %255s\n", name, pass);
-            if (res != 2) {
+            res = sscanf (line, "%255s %255s %lx\n", name, pass, &mark);
+            if (res < 2) {
                 LOG_E ("socks5 proxy user/pass format");
                 continue;
             }
 
             nlen = strlen (name);
             plen = strlen (pass);
-            user = hev_socks5_user_new (name, nlen, pass, plen);
+            user = hev_socks5_user_mark_new (name, nlen, pass, plen, mark);
             hev_object_set_atomic (HEV_OBJECT (user), 1);
-            res = hev_socks5_authenticator_add (auth, user);
+            res = hev_socks5_authenticator_add (auth, HEV_SOCKS5_USER (user));
             if (res < 0) {
                 LOG_E ("socks5 proxy user conflict");
                 hev_object_unref (HEV_OBJECT (user));

diff --git a/src/hev-socks5-session.c b/src/hev-socks5-session.c
@@ -18,6 +18,7 @@
 #include "hev-misc.h"
 #include "hev-logger.h"
 #include "hev-config.h"
+#include "hev-socks5-user-mark.h"
 
 #include "hev-socks5-session.h"
 
@@ -54,6 +55,7 @@ hev_socks5_session_terminate (HevSocks5Session *self)
 static int
 hev_socks5_session_bind (HevSocks5 *self, int fd, const struct sockaddr *dest)
 {
+    HevSocks5Server *srv = HEV_SOCKS5_SERVER (self);
     const char *saddr;
     const char *iface;
 
@@ -96,6 +98,22 @@ hev_socks5_session_bind (HevSocks5 *self, int fd, const struct sockaddr *dest)
             return -1;
     }
 
+#if defined(__linux__)
+    if (srv->user) {
+        HevSocks5UserMark *user = HEV_SOCKS5_USER_MARK (srv->user);
+
+        if (user->mark) {
+            int mark;
+            int res;
+
+            mark = user->mark;
+            res = setsockopt (fd, SOL_SOCKET, SO_MARK, &mark, sizeof (mark));
+            if (res < 0)
+                return -1;
+        }
+    }
+#endif
+
     return 0;
 }