mirror of
https://github.com/WGDashboard/WGDashboard-PRW.git
synced 2026-08-04 06:52:58 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Donald Zou
|
360363141a | ||
|
Donald Zou
|
456484cf7d |
+1
-1
@@ -1,4 +1,4 @@
|
||||
|
||||
.idea/*
|
||||
*.db
|
||||
dist
|
||||
|
||||
|
||||
@@ -8,9 +8,9 @@ from .config_utils import config_utils
|
||||
class config():
|
||||
@staticmethod
|
||||
def filter(config_data: dict, filter_keyword: str) -> tuple[bool, dict]:
|
||||
'''
|
||||
"""
|
||||
Helper function to grab a specific part of the config
|
||||
'''
|
||||
"""
|
||||
lower_filter_keyword = filter_keyword.lower()
|
||||
|
||||
for section_name, section_values in config_data.items():
|
||||
@@ -23,9 +23,9 @@ class config():
|
||||
|
||||
@staticmethod
|
||||
def read() -> tuple[bool, dict]:
|
||||
'''
|
||||
"""
|
||||
check some basic things and then return the dict containing the config data
|
||||
'''
|
||||
"""
|
||||
|
||||
ok, candidate_path = config_utils.search_known_paths()
|
||||
if not ok:
|
||||
@@ -46,7 +46,7 @@ class config():
|
||||
|
||||
ok, config_data = config.read()
|
||||
if not ok:
|
||||
log.error("failed to read the config succesfully")
|
||||
log.error("failed to read the config successfully")
|
||||
return False
|
||||
|
||||
if not config_utils.find_section(config_data, lower_target_section):
|
||||
|
||||
@@ -8,9 +8,9 @@ import os
|
||||
class config_utils():
|
||||
@staticmethod
|
||||
def search_known_paths() -> tuple[bool, str]:
|
||||
'''
|
||||
"""
|
||||
Look at predefined paths on the filesystem for a config file
|
||||
'''
|
||||
"""
|
||||
|
||||
possible_config_locations = [
|
||||
"./config.ini",
|
||||
|
||||
@@ -40,7 +40,7 @@ class localeman:
|
||||
return json.load(lang_file)
|
||||
return None
|
||||
|
||||
def get_available_languages():
|
||||
def get_available_languages(self):
|
||||
available_languages_path = "./static/locales/supported_locales.json"
|
||||
|
||||
with open(os.path.join(available_languages_path), "r") as f:
|
||||
|
||||
@@ -29,8 +29,9 @@ white_list = [
|
||||
"/static/",
|
||||
"/api/auth",
|
||||
"/api/auth/validate",
|
||||
"/api/auth/totp", # Need a GET to see if TOTP is enabled
|
||||
"/api/dashboard/locale",
|
||||
"/api/dashboard/configuration",
|
||||
# "/api/dashboard/configuration",
|
||||
"/api/dashboard/theme",
|
||||
"/api/dashboard/version",
|
||||
"/api/dashboard/totp",
|
||||
@@ -49,6 +50,7 @@ def authentication_required():
|
||||
|
||||
auth_required_flag = config_server.get('auth_req', True)
|
||||
api_key_enabled = config_server.get("wgdashboard_apikey", False)
|
||||
app_prefix = config_server.get("app_prefix", "")
|
||||
|
||||
if not auth_required_flag:
|
||||
return
|
||||
@@ -64,7 +66,11 @@ def authentication_required():
|
||||
|
||||
if flask.session.get("role") == "admin":
|
||||
return
|
||||
|
||||
|
||||
# Handle Client Dashboard Path
|
||||
if path.startswith(f'{app_prefix}/client'):
|
||||
return
|
||||
|
||||
if routes_utils.is_path_allowed(path, white_list, flask.session):
|
||||
return
|
||||
|
||||
|
||||
Generated
+27
-27
@@ -22,7 +22,7 @@
|
||||
"devDependencies": {
|
||||
"@vitejs/plugin-vue": "^6.0.5",
|
||||
"vite": "^8.0.3",
|
||||
"vite-plugin-vue-devtools": "^8.1.1"
|
||||
"vite-plugin-vue-devtools": "^8.0.7"
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/code-frame": {
|
||||
@@ -1038,36 +1038,36 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@vue/devtools-core": {
|
||||
"version": "8.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-8.1.1.tgz",
|
||||
"integrity": "sha512-bCCsSABp1/ot4j8xJEycM6Mtt2wbuucfByr6hMgjbYhrtlscOJypZKvy8f1FyWLYrLTchB5Qz216Lm92wfbq0A==",
|
||||
"version": "8.0.7",
|
||||
"resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-8.0.7.tgz",
|
||||
"integrity": "sha512-PmpiPxvg3Of80ODHVvyckxwEW1Z02VIAvARIZS1xegINn3VuNQLm9iHUmKD+o6cLkMNWV8OG8x7zo0kgydZgdg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@vue/devtools-kit": "^8.1.1",
|
||||
"@vue/devtools-shared": "^8.1.1"
|
||||
"@vue/devtools-kit": "^8.0.7",
|
||||
"@vue/devtools-shared": "^8.0.7"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"vue": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@vue/devtools-core/node_modules/@vue/devtools-kit": {
|
||||
"version": "8.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-8.1.1.tgz",
|
||||
"integrity": "sha512-gVBaBv++i+adg4JpH71k9ppl4soyR7Y2McEqO5YNgv0BI1kMZ7BDX5gnwkZ5COYgiCyhejZG+yGNrBAjj6Coqg==",
|
||||
"version": "8.0.7",
|
||||
"resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-8.0.7.tgz",
|
||||
"integrity": "sha512-H6esJGHGl5q0E9iV3m2EoBQHJ+V83WMW83A0/+Fn95eZ2iIvdsq4+UCS6yT/Fdd4cGZSchx/MdWDreM3WqMsDw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@vue/devtools-shared": "^8.1.1",
|
||||
"@vue/devtools-shared": "^8.0.7",
|
||||
"birpc": "^2.6.1",
|
||||
"hookable": "^5.5.3",
|
||||
"perfect-debounce": "^2.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@vue/devtools-core/node_modules/@vue/devtools-shared": {
|
||||
"version": "8.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-8.1.1.tgz",
|
||||
"integrity": "sha512-+h4ttmJYl/txpxHKaoZcaKpC+pvckgLzIDiSQlaQ7kKthKh8KuwoLW2D8hPJEnqKzXOvu15UHEoGyngAXCz0EQ==",
|
||||
"version": "8.0.7",
|
||||
"resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-8.0.7.tgz",
|
||||
"integrity": "sha512-CgAb9oJH5NUmbQRdYDj/1zMiaICYSLtm+B1kxcP72LBrifGAjUmt8bx52dDH1gWRPlQgxGPqpAMKavzVirAEhA==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
@@ -3061,15 +3061,15 @@
|
||||
}
|
||||
},
|
||||
"node_modules/vite-plugin-vue-devtools": {
|
||||
"version": "8.1.1",
|
||||
"resolved": "https://registry.npmjs.org/vite-plugin-vue-devtools/-/vite-plugin-vue-devtools-8.1.1.tgz",
|
||||
"integrity": "sha512-9qTpOmZ2vHpvlI9hdVXAQ1Ry4I8GcBArU7aPi0qfIaV7fQIXy0L1nb6X4mFY2Gw0dYshHuLbIl0Ulb572SCjsQ==",
|
||||
"version": "8.0.7",
|
||||
"resolved": "https://registry.npmjs.org/vite-plugin-vue-devtools/-/vite-plugin-vue-devtools-8.0.7.tgz",
|
||||
"integrity": "sha512-BWj/ykGpqVAJVdPyHmSTUm44buz3jPv+6jnvuFdQSRH0kAgP1cEIE4doHiFyqHXOmuB5EQVR/nh2g9YRiRNs9g==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@vue/devtools-core": "^8.1.1",
|
||||
"@vue/devtools-kit": "^8.1.1",
|
||||
"@vue/devtools-shared": "^8.1.1",
|
||||
"@vue/devtools-core": "^8.0.7",
|
||||
"@vue/devtools-kit": "^8.0.7",
|
||||
"@vue/devtools-shared": "^8.0.7",
|
||||
"sirv": "^3.0.2",
|
||||
"vite-plugin-inspect": "^11.3.3",
|
||||
"vite-plugin-vue-inspector": "^5.3.2"
|
||||
@@ -3078,26 +3078,26 @@
|
||||
"node": ">=v14.21.3"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
|
||||
"vite": "^6.0.0 || ^7.0.0-0 || ^8.0.0-0"
|
||||
}
|
||||
},
|
||||
"node_modules/vite-plugin-vue-devtools/node_modules/@vue/devtools-kit": {
|
||||
"version": "8.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-8.1.1.tgz",
|
||||
"integrity": "sha512-gVBaBv++i+adg4JpH71k9ppl4soyR7Y2McEqO5YNgv0BI1kMZ7BDX5gnwkZ5COYgiCyhejZG+yGNrBAjj6Coqg==",
|
||||
"version": "8.0.7",
|
||||
"resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-8.0.7.tgz",
|
||||
"integrity": "sha512-H6esJGHGl5q0E9iV3m2EoBQHJ+V83WMW83A0/+Fn95eZ2iIvdsq4+UCS6yT/Fdd4cGZSchx/MdWDreM3WqMsDw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@vue/devtools-shared": "^8.1.1",
|
||||
"@vue/devtools-shared": "^8.0.7",
|
||||
"birpc": "^2.6.1",
|
||||
"hookable": "^5.5.3",
|
||||
"perfect-debounce": "^2.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/vite-plugin-vue-devtools/node_modules/@vue/devtools-shared": {
|
||||
"version": "8.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-8.1.1.tgz",
|
||||
"integrity": "sha512-+h4ttmJYl/txpxHKaoZcaKpC+pvckgLzIDiSQlaQ7kKthKh8KuwoLW2D8hPJEnqKzXOvu15UHEoGyngAXCz0EQ==",
|
||||
"version": "8.0.7",
|
||||
"resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-8.0.7.tgz",
|
||||
"integrity": "sha512-CgAb9oJH5NUmbQRdYDj/1zMiaICYSLtm+B1kxcP72LBrifGAjUmt8bx52dDH1gWRPlQgxGPqpAMKavzVirAEhA==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
|
||||
@@ -23,6 +23,6 @@
|
||||
"devDependencies": {
|
||||
"@vitejs/plugin-vue": "^6.0.5",
|
||||
"vite": "^8.0.3",
|
||||
"vite-plugin-vue-devtools": "^8.1.1"
|
||||
"vite-plugin-vue-devtools": "^8.0.7"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user