From 2466f2d5231e7548021b3d9c61d531134173264d Mon Sep 17 00:00:00 2001 From: root Date: Fri, 30 Aug 2024 11:02:35 +0200 Subject: [PATCH 1/5] generated fields --- scan.php | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/scan.php b/scan.php index d819dbf..50fb675 100644 --- a/scan.php +++ b/scan.php @@ -117,9 +117,14 @@ switch ($_GET["op"]) { $template = json_decode(base64_decode($data["TEMPLATE"])); echo "

"; foreach ($template->fields as $field) { + if (isset($field->generated)) { + echo "generated}\" name=\"{$field->key}\" id=\"{$field->key}\" class=\"additional_field\">"; + } + else { echo "
required=="true" ? "required" : "")." type=\"text\" value=\"{$field->value}\" name=\"{$field->key}\" id=\"{$field->key}\" class=\"additional_field\">
"; + } } echo "
@@ -155,6 +160,24 @@ switch ($_GET["op"]) { $fields = $_GET; unset($fields["op"]); unset($fields["additional"]); + $algos = hash_algos(); + foreach ($fields as $field_key => $field_value) { + $field_arr = explode(":",$field_value); + if ($field_arr[0]=="generated") { + if (intval($field_arr[3])==0) $len = 10; // default length + else $len = $field_arr[3]; + + if ($field_arr[1]=="random") $base = rand(100000,999999); + elseif ($field_arr[1]=="time") $base = time(); + elseif ($field_arr[1]!="") $base = $field_arr[1]; // fix string + else $base = rand(100000,999999); // default + + if (in_array($field_arr[2],$algos)) $base = hash($field_arr[2],$base); + else $base = hash("md5",$base); // default alg + + $base = substr($base,0,$len); + } + } $payload = base64_encode(json_encode($fields, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT)); $arr = array("NAME" => $_GET["additional"], "ACTION" => "deploy", "PAYLOAD" => $payload); $json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT); From fdeb1dd40f45b997f8493445d13240a64f33042b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 30 Aug 2024 11:12:59 +0200 Subject: [PATCH 2/5] generated fields --- scan.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scan.php b/scan.php index 50fb675..ebf6e9e 100644 --- a/scan.php +++ b/scan.php @@ -175,14 +175,14 @@ switch ($_GET["op"]) { if (in_array($field_arr[2],$algos)) $base = hash($field_arr[2],$base); else $base = hash("md5",$base); // default alg - $base = substr($base,0,$len); + $fields["$field_key"] = substr($base,0,$len); } } $payload = base64_encode(json_encode($fields, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT)); $arr = array("NAME" => $_GET["additional"], "ACTION" => "deploy", "PAYLOAD" => $payload); $json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT); $op = "deployment"; - redis_set($op,$json); + //redis_set($op,$json); } echo $text; break; From b855ccae5277c7d11d50f3e43cd4e6def5b6bc6b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 30 Aug 2024 11:14:41 +0200 Subject: [PATCH 3/5] generated fields --- scan.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scan.php b/scan.php index ebf6e9e..054102e 100644 --- a/scan.php +++ b/scan.php @@ -182,7 +182,7 @@ switch ($_GET["op"]) { $arr = array("NAME" => $_GET["additional"], "ACTION" => "deploy", "PAYLOAD" => $payload); $json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT); $op = "deployment"; - //redis_set($op,$json); + redis_set($op,$json); } echo $text; break; From 96ec74529e5b0069e872741e27449e941b573e6c Mon Sep 17 00:00:00 2001 From: root Date: Fri, 30 Aug 2024 11:36:42 +0200 Subject: [PATCH 4/5] installed --- scan.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scan.php b/scan.php index 054102e..7023fd3 100644 --- a/scan.php +++ b/scan.php @@ -76,7 +76,7 @@ switch ($_GET["op"]) { else { foreach ($data["DEPLOYMENTS"] as $service_name => $content) { //echo base64_decode($content); - echo '
'.$service_name.' - '.$content.'
'; + echo '
'.$service_name.' - '.$content.(array_key_exists($service_name,$data["INSTALLED_SERVICES"]) ? " - INSTALLED" : "").'
'; echo '
'; } } @@ -84,6 +84,7 @@ switch ($_GET["op"]) { else echo "There are no deployments.
"; if (count($data["INSTALLED_SERVICES"])) { + echo "
Installed services:
"; if ($data["INSTALLED_SERVICES"]["services"]=="NONE") echo "There are no installed services.
"; else { foreach ($data["INSTALLED_SERVICES"] as $service_name => $content) { From 4f06786d85d61f34a2b64aee050546b9ac073369 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 30 Aug 2024 11:58:53 +0200 Subject: [PATCH 5/5] recheck redis server --- index.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/index.html b/index.html index 3c6f02a..65f1e94 100644 --- a/index.html +++ b/index.html @@ -82,16 +82,23 @@ function check_system() { }); } +function check_redis() { + var url = 'scan.php?op=redis'; $.get(url, function(data){ + console.log(data); if (data=='OK') { $("#redis").html('Redis server - OK'); start_system(); } else { $("#redis").html('Redis server is not available...'); + setTimeout(check_redis, 1000); } }); +} + + check_redis(); //setTimeout(redirectToManage, 10000);