vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GraphQl 0.11.18.1 - better api_token initialization + menu fixes
Some checks are pending
docker / docker_dev (push) Waiting to run
Details

Browse Source
This commit is contained in:
jokob-sk
2024-11-18 12:16:49 +11:00
parent 76d1ec46a6
commit 69d41f2ed4
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
front/php/templates/header.php
View File

@@ -255,25 +255,25 @@
</a> </a>
<ul class="treeview-menu" style="display: <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('devices.php', 'deviceDetails.php') ) ){ echo 'block'; } else {echo 'none';} ?>;"> <ul class="treeview-menu" style="display: <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('devices.php', 'deviceDetails.php') ) ){ echo 'block'; } else {echo 'none';} ?>;">
<li> <li>
<a href="#" onclick="forceLoadUrl('/devices.php#my_devices')" > <?= lang("Device_Shortcut_AllDevices");?> </a> <a href="/devices.php#my_devices" onclick="forceLoadUrl('/devices.php#my_devices')" > <?= lang("Device_Shortcut_AllDevices");?> </a>
</li> </li>
<li> <li>
<a href="#" onclick="forceLoadUrl('/devices.php#connected')" > <?= lang("Device_Shortcut_Connected");?> </a> <a href="/devices.php#connected" onclick="forceLoadUrl('/devices.php#connected')" > <?= lang("Device_Shortcut_Connected");?> </a>
</li> </li>
<li> <li>
<a href="#" onclick="forceLoadUrl('/devices.php#favorites')" > <?= lang("Device_Shortcut_Favorites");?> </a> <a href="/devices.php#favorites" onclick="forceLoadUrl('/devices.php#favorites')" > <?= lang("Device_Shortcut_Favorites");?> </a>
</li> </li>
<li> <li>
<a href="#" onclick="forceLoadUrl('/devices.php#new')" > <?= lang("Device_Shortcut_NewDevices");?> </a> <a href="/devices.php#new" onclick="forceLoadUrl('/devices.php#new')" > <?= lang("Device_Shortcut_NewDevices");?> </a>
</li> </li>
<li> <li>
<a href="#" onclick="forceLoadUrl('/devices.php#down')" > <?= lang("Device_Shortcut_DownOnly");?> </a> <a href="/devices.php#down" onclick="forceLoadUrl('/devices.php#down')" > <?= lang("Device_Shortcut_DownOnly");?> </a>
</li> </li>
<li> <li>
<a href="#" onclick="forceLoadUrl('/devices.php#offline')" > <?= lang("Gen_Offline");?> </a> <a href="/devices.php#offline" onclick="forceLoadUrl('/devices.php#offline')" > <?= lang("Gen_Offline");?> </a>
</li> </li>
<li> <li>
<a href="#" onclick="forceLoadUrl('/devices.php#archived')" > <?= lang("Device_Shortcut_Archived");?> </a> <a href="/devices.php#archived" onclick="forceLoadUrl('/devices.php#archived')" > <?= lang("Device_Shortcut_Archived");?> </a>
</li> </li>
</ul> </ul>

8
server/graphql_server/graphql_server_start.py
View File

@@ -17,14 +17,16 @@ app = Flask(__name__)
# Retrieve API token and port # Retrieve API token and port
graphql_port_value = get_setting_value("GRAPHQL_PORT") graphql_port_value = get_setting_value("GRAPHQL_PORT")
api_token_value = get_setting_value("API_TOKEN")
# Endpoint for GraphQL queries # Endpoint for GraphQL queries
@app.route("/graphql", methods=["POST"]) @app.route("/graphql", methods=["POST"])
def graphql_endpoint(): def graphql_endpoint():
# Check for API token in headers # Check for API token in headers
token = request.headers.get("Authorization") incoming_header_token = request.headers.get("Authorization")
if token != f"Bearer {api_token_value}": api_token_value = get_setting_value("API_TOKEN")
if incoming_header_token != f"Bearer {api_token_value}":
mylog('verbose', [f'[graphql_server] Unauthorized access attempt']) mylog('verbose', [f'[graphql_server] Unauthorized access attempt'])
return jsonify({"error": "Unauthorized"}), 401 return jsonify({"error": "Unauthorized"}), 401