Przeglądaj źródła

아이피 로드 방식 좀 변경

잉여개발기 (SPDV) 5 lat temu
rodzic
commit
7d054611b5
2 zmienionych plików z 12 dodań i 14 usunięć
  1. 11 13
      route/tool/set_mark/tool.py
  2. 1 1
      version.json

+ 11 - 13
route/tool/set_mark/tool.py

@@ -23,19 +23,17 @@ def ip_check(d_type = 0):
     ip = ''
     if d_type == 0 and (flask.session and 'id' in flask.session):
         ip = flask.session['id']
-    
-    if ip == '':
-        try:
-            ip = flask.request.environ.get('HTTP_X_REAL_IP', flask.request.environ.get('HTTP_X_FORWARDED_FOR', flask.request.remote_addr))
-            ip = ip[0] if type(ip) == type([]) else ip
-
-            if ip == '::1' or ip == '127.0.0.1':
-                ip = flask.request.environ.get('HTTP_X_FORWARDED_FOR', flask.request.remote_addr)
-                ip = ip[0] if type(ip) == type([]) else ip
-        except:
-            ip = 'error:ip'
-
-    return str(ip)
+    else:
+        ip_list = [
+            flask.request.environ.get('HTTP_X_REAL_IP', '::1'),
+            flask.request.environ.get('HTTP_X_FORWARDED_FOR', '::1'),
+            flask.request.environ.get('REMOTE_ADDR', '::1')
+        ]
+        for ip in ip_list:
+            if not (ip == '::1' or ip == '127.0.0.1'):
+                ip = ip[0] if type(ip) == type([]) else ip.split(',')[0]
+
+    return ip
 
 def url_pas(data):
     return urllib.parse.quote(data).replace('/','%2F')

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.2.0-beta-27 (v3.2.0-dev-2020-08-24-02)",
+        "r_ver" : "v3.2.0-beta-28 (v3.2.0-dev-2020-08-24-03)",
         "c_ver" : "3202600",
         "s_ver" : "9"
     }