فهرست منبع

임시로 Auth에서도 차단 가능하도록

잉여개발기 (SPDV) 2 سال پیش
والد
کامیت
4c17d300a3
4فایلهای تغییر یافته به همراه8 افزوده شده و 2 حذف شده
  1. 1 1
      route/api_user_info.py
  2. 1 0
      route/give_auth.py
  3. 5 0
      route/tool/func.py
  4. 1 1
      version.json

+ 1 - 1
route/api_user_info.py

@@ -24,7 +24,7 @@ def api_user_info(name = ''):
                 if db_data:
                     if db_data[0][0] != 'user':
                         curs.execute(db_change("select name from alist where name = ?"), [db_data[0][0]])
-                        if curs.fetchall():
+                        if curs.fetchall() or db_data[0][0] in get_default_admin_group():
                             data_result[user_name]['auth'] = db_data[0][0]
                         else:
                             data_result[user_name]['auth'] = '1'

+ 1 - 0
route/give_auth.py

@@ -51,6 +51,7 @@ def give_auth(name):
                 return re_error('/error/3')
 
             div = '<option value="X">' + load_lang('normal') + '</option>'
+            div += '<option value="ban">' + load_lang('ban') + '</option>'
 
             curs.execute(db_change('select distinct name from alist order by name asc'))
             for data in curs.fetchall():

+ 5 - 0
route/tool/func.py

@@ -2058,6 +2058,11 @@ def ban_check(ip = None, tool = ''):
             else:
                 return 1
 
+        curs.execute(db_change("select data from user_set where id = ? and name = 'acl'"), [ip])
+        db_data = curs.fetchall()
+        if db_data and db_data[0][0] == 'ban':
+            return 1
+
         return 0
 
 def ip_pas(raw_ip, type_data = 0):

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC5-dev73",
+        "r_ver" : "v3.4.6-RC5-dev74",
         "c_ver" : "3500373",
         "s_ver" : "3500112"
     }