Chaospott/spaceapi-api
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

JSON responses; missing var name

Browse Source
This commit is contained in:
Bandie 2021-01-18 21:35:25 +01:00
parent 3fcff9803e
commit c50584018e
Signed by: Bandie
GPG Key ID: 843D7FA93BA46312
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
update.php
View File

@ -38,7 +38,9 @@ function setStatus(&$status, $decoded, $loc){
// Is this a POST? // Is this a POST?
if ($_SERVER['REQUEST_METHOD'] != 'POST') { if ($_SERVER['REQUEST_METHOD'] != 'POST') {
header("HTTP/1.1 405 Method Not Allowed"); header("HTTP/1.1 405 Method Not Allowed");
echo('FAILED - not POST - '. $_SERVER['REQUEST_METHOD']); header("Content-Type: application/json");
echo(json_encode(['status' => 'No POST. Received: '. $_SERVER['REQUEST_METHOD']]));
error_log('No POST.');
exit(); exit();
} }
@ -47,7 +49,9 @@ if ($_SERVER['REQUEST_METHOD'] != 'POST') {
$content_type = isset($_SERVER['CONTENT_TYPE']) ? strtolower(trim($_SERVER['CONTENT_TYPE'])) : ''; $content_type = isset($_SERVER['CONTENT_TYPE']) ? strtolower(trim($_SERVER['CONTENT_TYPE'])) : '';
if ($content_type != 'application/json') { if ($content_type != 'application/json') {
header("HTTP/1.1 403 Forbidden"); header("HTTP/1.1 403 Forbidden");
echo('FAILED - not application/json - '. $content_type); header("Content-Type: application/json");
echo(json_encode(['status' => 'FAILED - not application/json - '. $content_type]));
error_log('No application/json');
exit(); exit();
} }
@ -56,7 +60,9 @@ if ($content_type != 'application/json') {
$payload = trim(file_get_contents("php://input")); $payload = trim(file_get_contents("php://input"));
if (empty($payload)) { if (empty($payload)) {
header("HTTP/1.1 403 Forbidden"); header("HTTP/1.1 403 Forbidden");
echo('FAILED - no payload'); header("Content-Type: application/json");
echo(json_encode(['status' => 'No payload']));
error_log('No payload');
exit(); exit();
} }
@ -65,7 +71,8 @@ $decoded = json_decode($payload, true);
if (json_last_error() !== JSON_ERROR_NONE) { if (json_last_error() !== JSON_ERROR_NONE) {
header("HTTP/1.1 403 Forbidden"); header("HTTP/1.1 403 Forbidden");
header("Content-Type: application/json"); header("Content-Type: application/json");
echo('"FAILED - json decode - '. json_last_error()); echo(json_encode(['status' => 'FAILED - json decode - '. json_last_error()]));
error_log('JSON decode error');
exit(); exit();
} }
@ -73,8 +80,9 @@ if (json_last_error() !== JSON_ERROR_NONE) {
// Is the authorisation aight m8? // Is the authorisation aight m8?
if($decoded['consumer_key'] != $consumer_key || $decoded['consumer_secret'] != $consumer_secret) { if($decoded['consumer_key'] != $consumer_key || $decoded['consumer_secret'] != $consumer_secret) {
header("HTTP/1.1 403 Forbidden"); header("HTTP/1.1 403 Forbidden");
echo("WRONG SECRET"); header("Content-Type: application/json");
error_log('FAILED - wrong secret key'); echo(json_encode(['status' => 'Wrong key/secret.']));
error_log('Wrong key/secret.');
exit(); exit();
} }
@ -82,6 +90,7 @@ if($decoded['consumer_key'] != $consumer_key || $decoded['consumer_secret'] != $
// Is this API even active? // Is this API even active?
if(!$active){ if(!$active){
header("HTTP/1.1 403 Forbidden"); header("HTTP/1.1 403 Forbidden");
header("Content-Type: application/json");
echo(json_encode(["status" => "API deactivated."])); echo(json_encode(["status" => "API deactivated."]));
error_log('API deactivated'); error_log('API deactivated');
exit(); exit();
@ -89,7 +98,7 @@ if(!$active){
// Get me the previous status // Get me the previous status
$status = json_decode(file_get_contents("../status.json"), true); $status = json_decode(file_get_contents($statusJSONFile), true);
// Manipulate the $status variable. If we have an update, update the timestamp. // Manipulate the $status variable. If we have an update, update the timestamp.
if(setStatus($status, $decoded, 'aerie') | setStatus($status, $decoded, 'cellar')){ if(setStatus($status, $decoded, 'aerie') | setStatus($status, $decoded, 'cellar')){