mirror of
https://github.com/jokob-sk/NetAlertX.git
synced 2026-03-31 07:12:23 -07:00
BE+FE: legacy sync endpoint removal - see release notes
Signed-off-by: jokob-sk <jokob.sk@gmail.com>
This commit is contained in:
@@ -27,11 +27,8 @@ function initOnlineHistoryGraph() {
|
|||||||
var archivedCounts = [];
|
var archivedCounts = [];
|
||||||
|
|
||||||
res.data.forEach(function(entry) {
|
res.data.forEach(function(entry) {
|
||||||
console.log(entry.Scan_Date);
|
|
||||||
|
|
||||||
// var dateObj = new Date(entry.Scan_Date);
|
|
||||||
var formattedTime = localizeTimestamp(entry.Scan_Date).slice(11, 17);
|
var formattedTime = localizeTimestamp(entry.Scan_Date).slice(11, 17);
|
||||||
// dateObj.toLocaleTimeString([], {hour: '2-digit', minute: '2-digit', hour12: false});
|
|
||||||
|
|
||||||
timeStamps.push(formattedTime);
|
timeStamps.push(formattedTime);
|
||||||
onlineCounts.push(entry.Online_Devices);
|
onlineCounts.push(entry.Online_Devices);
|
||||||
|
|||||||
@@ -1,103 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
// External files
|
|
||||||
require '/app/front/php/server/init.php';
|
|
||||||
|
|
||||||
$method = $_SERVER['REQUEST_METHOD'];
|
|
||||||
|
|
||||||
// ----------------------------------------------
|
|
||||||
// Method to check authorization
|
|
||||||
function checkAuthorization($method) {
|
|
||||||
// Retrieve the authorization header
|
|
||||||
$headers = apache_request_headers();
|
|
||||||
$auth_header = $headers['Authorization'] ?? '';
|
|
||||||
$expected_token = 'Bearer ' . getSettingValue('API_TOKEN');
|
|
||||||
|
|
||||||
// Verify the authorization token
|
|
||||||
if ($auth_header !== $expected_token) {
|
|
||||||
http_response_code(403);
|
|
||||||
echo 'Forbidden';
|
|
||||||
displayInAppNoti("[Plugin: SYNC] Incoming data: Incorrect API Token (".$method.")", "error");
|
|
||||||
exit;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ----------------------------------------------
|
|
||||||
// Function to return JSON response
|
|
||||||
function jsonResponse($status, $data = '', $message = '') {
|
|
||||||
http_response_code($status);
|
|
||||||
header('Content-Type: application/json');
|
|
||||||
echo json_encode([
|
|
||||||
'node_name' => getSettingValue('SYNC_node_name'),
|
|
||||||
'status' => $status,
|
|
||||||
'message' => $message,
|
|
||||||
'data_base64' => $data,
|
|
||||||
'timestamp' => date('Y-m-d H:i:s')
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ----------------------------------------------
|
|
||||||
// MAIN
|
|
||||||
// ----------------------------------------------
|
|
||||||
|
|
||||||
|
|
||||||
// requesting data (this is a NODE)
|
|
||||||
if ($method === 'GET') {
|
|
||||||
checkAuthorization($method);
|
|
||||||
|
|
||||||
$apiRoot = getenv('NETALERTX_API') ?: '/tmp/api';
|
|
||||||
$file_path = rtrim($apiRoot, '/') . '/table_devices.json';
|
|
||||||
|
|
||||||
$data = file_get_contents($file_path);
|
|
||||||
|
|
||||||
// Prepare the data to return as a JSON response
|
|
||||||
$response_data = base64_encode($data);
|
|
||||||
|
|
||||||
// Return JSON response
|
|
||||||
jsonResponse(200, $response_data, 'OK');
|
|
||||||
|
|
||||||
displayInAppNoti("[Plugin: SYNC] Data sent", "info");
|
|
||||||
|
|
||||||
}
|
|
||||||
// receiving data (this is a HUB)
|
|
||||||
else if ($method === 'POST') {
|
|
||||||
checkAuthorization($method);
|
|
||||||
|
|
||||||
// Retrieve and decode the data from the POST request
|
|
||||||
$data = $_POST['data'] ?? '';
|
|
||||||
$file_path = $_POST['file_path'] ?? '';
|
|
||||||
$node_name = $_POST['node_name'] ?? '';
|
|
||||||
$plugin = $_POST['plugin'] ?? '';
|
|
||||||
|
|
||||||
$logRoot = getenv('NETALERTX_PLUGINS_LOG') ?: (rtrim(getenv('NETALERTX_LOG') ?: '/tmp/log', '/') . '/plugins');
|
|
||||||
$storage_path = rtrim($logRoot, '/');
|
|
||||||
|
|
||||||
// // check location
|
|
||||||
// if (!is_dir($storage_path)) {
|
|
||||||
// echo "Could not open folder: {$storage_path}";
|
|
||||||
// write_notification("[Plugin: SYNC] Could not open folder: {$storage_path}", "alert");
|
|
||||||
// http_response_code(500);
|
|
||||||
// exit;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// Generate a unique file path to avoid overwriting existing files
|
|
||||||
$encoded_files = glob("{$storage_path}/last_result.{$plugin}.encoded.{$node_name}.*.log");
|
|
||||||
$decoded_files = glob("{$storage_path}/last_result.{$plugin}.decoded.{$node_name}.*.log");
|
|
||||||
|
|
||||||
$files = array_merge($encoded_files, $decoded_files);
|
|
||||||
$file_count = count($files) + 1;
|
|
||||||
|
|
||||||
$file_path_new = "{$storage_path}/last_result.{$plugin}.encoded.{$node_name}.{$file_count}.log";
|
|
||||||
|
|
||||||
// Save the decoded data to the file
|
|
||||||
file_put_contents($file_path_new, $data);
|
|
||||||
http_response_code(200);
|
|
||||||
echo 'Data received and stored successfully';
|
|
||||||
displayInAppNoti("[Plugin: SYNC] Data received ({$file_path_new})", "info");
|
|
||||||
|
|
||||||
} else {
|
|
||||||
http_response_code(405);
|
|
||||||
echo 'Method Not Allowed';
|
|
||||||
displayInAppNoti("[Plugin: SYNC] Method Not Allowed", "error");
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
@@ -269,7 +269,6 @@ def main():
|
|||||||
# Data retrieval methods
|
# Data retrieval methods
|
||||||
api_endpoints = [
|
api_endpoints = [
|
||||||
"/sync", # New Python-based endpoint
|
"/sync", # New Python-based endpoint
|
||||||
"/plugins/sync/hub.php" # Legacy PHP endpoint
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user