From 390b802c1f7be367b5fd23c4ddbf93d26580b64e Mon Sep 17 00:00:00 2001
From: Christoph Schulthess
Date: Thu, 23 Feb 2017 14:39:26 +0100
Subject: debugrequest updated, using default SSL Relay Task

---
 apis/debugrequest.inc.php | 24 ++++++++++++++++++++++++
 apis/debugrequest.php     | 27 ---------------------------
 apis/debugrequest_TLS.php | 27 ---------------------------
 3 files changed, 24 insertions(+), 54 deletions(-)
 create mode 100644 apis/debugrequest.inc.php
 delete mode 100644 apis/debugrequest.php
 delete mode 100644 apis/debugrequest_TLS.php

diff --git a/apis/debugrequest.inc.php b/apis/debugrequest.inc.php
new file mode 100644
index 00000000..0d423bec
--- /dev/null
+++ b/apis/debugrequest.inc.php
@@ -0,0 +1,24 @@
+<?php
+$debug_settings = Property::getRemoteDebugConfig();
+if ($debug_settings["enabled"] !== true) {
+  http_response_code(403);
+  exit;
+}
+
+$debug_request = explode(":", file_get_contents("php://input"), 2);
+
+$uuid = $debug_request[0];
+$port = 5900 + $debug_request[1];
+
+$validclient = Database::queryFirst("SELECT machineuuid, clientip FROM machine WHERE machineuuid = :uuid AND clientip = :ip", array(":uuid" => "$debug_request[0]", ":ip" => $_SERVER["REMOTE_ADDR"]));
+
+if ($validclient == false) {
+  http_response_code(400);
+} else {
+  http_response_code(200);
+  $data = array("hosts" => array($_SERVER["REMOTE_ADDR"], $debug_settings["debugServer"]), 
+	"ports" => array($port, intval($debug_settings["port"])), "descs" => array("bwlpclient", "debugserver"));
+  $taskstruct = Taskmanager::submit('DispatchRelay', $data);
+  Property::setDebugTaskStruct($taskstruct);
+}
+
diff --git a/apis/debugrequest.php b/apis/debugrequest.php
deleted file mode 100644
index 2396da78..00000000
--- a/apis/debugrequest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$debug_settings = Property::getRemoteDebugConfig();
-if ($debug_settings["enabled"] !== true) {
-  http_response_code(403);
-  exit;
-}
-
-$debug_request = explode(":", file_get_contents("php://input"), 2);
-
-$uuid = $debug_request[0];
-$port = 5900 + $debug_request[1];
-
-$validclient = Database::queryFirst("SELECT machineuuid, clientip FROM machine WHERE machineuuid = :uuid AND clientip = :ip", array(":uuid" => "$debug_request[0]", ":ip" => $_SERVER["REMOTE_ADDR"]));
-
-if ($validclient == false) {
-  http_response_code(400);
-} else {
-  http_response_code(200);
-  $data = array("hosts" => array($_SERVER["REMOTE_ADDR"], $debug_settings["debugServer"]), 
-	"ports" => array($port, intval($debug_settings["port"])), "descs" => array("bwlpclient", "debugserver"));
-  $taskstruct = Taskmanager::submit('DispatchRelay', $data);
-  //$taskstruct = Taskmanager::submit('FantasyTask');
-  //$taskstruct = Taskmanager::submit('DummyTask');
-  error_log(print_r($taskstruct, true));
-  Property::setDebugTaskStruct($taskstruct);
-}
-
diff --git a/apis/debugrequest_TLS.php b/apis/debugrequest_TLS.php
deleted file mode 100644
index 4af386f4..00000000
--- a/apis/debugrequest_TLS.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$debug_settings = Property::getRemoteDebugConfig();
-if ($debug_settings["enabled"] !== true) {
-  http_response_code(403);
-  exit;
-}
-
-$debug_request = explode(":", file_get_contents("php://input"), 2);
-
-$uuid = $debug_request[0];
-$port = 5900 + $debug_request[1];
-
-$validclient = Database::queryFirst("SELECT machineuuid, clientip FROM machine WHERE machineuuid = :uuid AND clientip = :ip", array(":uuid" => "$debug_request[0]", ":ip" => $_SERVER["REMOTE_ADDR"]));
-
-if ($validclient == false) {
-  http_response_code(400);
-} else {
-  http_response_code(200);
-  $data = array("hosts" => array($_SERVER["REMOTE_ADDR"], $debug_settings["debugServer"]), 
-	"ports" => array($port, intval($debug_settings["port"])), "descs" => array("bwlpclient", "debugserver"));
-  $taskstruct = Taskmanager::submit('DispatchSSLRelay', $data);
-  //$taskstruct = Taskmanager::submit('FantasyTask');
-  //$taskstruct = Taskmanager::submit('DummyTask');
-  error_log(print_r($taskstruct, true));
-  Property::setDebugTaskStruct($taskstruct);
-}
-
-- 
cgit v1.2.3-55-g7522