midoks/mdserver-web
1
0
Fork 0
mirror of https://github.com/midoks/mdserver-web synced 2026-11-04 18:35:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #965 from midoks/dev

Browse Source 
常规更新
This commit is contained in:
Mr Chen
2026-11-04 15:52:18 +08:00
committed by GitHub
parent 096c736c28 7ff1530684
commit e6060847ef
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/mariadb/index.py
View File

@@ -1545,12 +1545,15 @@ def getDbUserAccessDiff(db_access, input_access):
host_var = 'localhost'
local_ipvar = '127.0.0.1'
local_ip6var = '::1'
for ac in input_access:
if ac == host_var:
continue
if ac == local_ipvar:
continue
if ac == local_ip6var:
continue
if mw.inArray(db_access,ac):
continue
add.append(ac)
@@ -1558,17 +1561,24 @@ def getDbUserAccessDiff(db_access, input_access):
if not mw.inArray(db_access, local_ipvar) and not mw.inArray(add, local_ipvar):
add.append(local_ipvar)
if not mw.inArray(db_access, local_ip6var) and not mw.inArray(add, local_ip6var):
add.append(local_ip6var)
for ac in db_access:
if ac == host_var:
continue
if ac == local_ipvar:
continue
if ac == local_ip6var:
continue
if mw.inArray(input_access,ac):
continue
delete.append(ac)
if mw.inArray(delete, local_ipvar):
delete.remove(local_ipvar)
if mw.inArray(delete, local_ip6var):
delete.remove(local_ip6var)
return {"add":add,"delete":delete}
@@ -1585,6 +1595,8 @@ def getDbAccess():
userStr = ','.join(users)
if userStr == '127.0.0.1,localhost':
return mw.returnJson(True, 'localhost')
if userStr == '127.0.0.1,::1,localhost':
return mw.returnJson(True, 'localhost')
return mw.returnJson(True, userStr)

12
plugins/mysql-community/index.py
View File

@@ -1712,12 +1712,15 @@ def getDbUserAccessDiff(db_access, input_access):
host_var = 'localhost'
local_ipvar = '127.0.0.1'
local_ip6var = '::1'
for ac in input_access:
if ac == host_var:
continue
if ac == local_ipvar:
continue
if ac == local_ip6var:
continue
if mw.inArray(db_access,ac):
continue
add.append(ac)
@@ -1725,17 +1728,24 @@ def getDbUserAccessDiff(db_access, input_access):
if not mw.inArray(db_access, local_ipvar) and not mw.inArray(add, local_ipvar):
add.append(local_ipvar)
if not mw.inArray(db_access, local_ip6var) and not mw.inArray(add, local_ip6var):
add.append(local_ip6var)
for ac in db_access:
if ac == host_var:
continue
if ac == local_ipvar:
continue
if ac == local_ip6var:
continue
if mw.inArray(input_access,ac):
continue
delete.append(ac)
if mw.inArray(delete, local_ipvar):
delete.remove(local_ipvar)
if mw.inArray(delete, local_ip6var):
delete.remove(local_ip6var)
return {"add":add,"delete":delete}
@@ -1752,6 +1762,8 @@ def getDbAccess():
userStr = ','.join(users)
if userStr == '127.0.0.1,localhost':
return mw.returnJson(True, 'localhost')
if userStr == '127.0.0.1,::1,localhost':
return mw.returnJson(True, 'localhost')
return mw.returnJson(True, userStr)

12
plugins/mysql/index.py
View File

@@ -1919,12 +1919,15 @@ def getDbUserAccessDiff(db_access, input_access):
host_var = 'localhost'
local_ipvar = '127.0.0.1'
local_ip6var = '::1'
for ac in input_access:
if ac == host_var:
continue
if ac == local_ipvar:
continue
if ac == local_ip6var:
continue
if mw.inArray(db_access,ac):
continue
add.append(ac)
@@ -1932,17 +1935,24 @@ def getDbUserAccessDiff(db_access, input_access):
if not mw.inArray(db_access, local_ipvar) and not mw.inArray(add, local_ipvar):
add.append(local_ipvar)
if not mw.inArray(db_access, local_ip6var) and not mw.inArray(add, local_ip6var):
add.append(local_ip6var)
for ac in db_access:
if ac == host_var:
continue
if ac == local_ipvar:
continue
if ac == local_ip6var:
continue
if mw.inArray(input_access,ac):
continue
delete.append(ac)
if mw.inArray(delete, local_ipvar):
delete.remove(local_ipvar)
if mw.inArray(delete, local_ip6var):
delete.remove(local_ip6var)
return {"add":add,"delete":delete}
@@ -1959,6 +1969,8 @@ def getDbAccess():
userStr = ','.join(users)
if userStr == '127.0.0.1,localhost':
return mw.returnJson(True, 'localhost')
if userStr == '127.0.0.1,::1,localhost':
return mw.returnJson(True, 'localhost')
return mw.returnJson(True, userStr)