paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[API] Added proper status codes to API

master
ntimo 2019-10-03 12:48:19 +02:00
parent 0f5c930e48
commit 72f8c0a5bd
No known key found for this signature in database
GPG Key ID: 3AF3627FB0440D55
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
data/web/json_api.php
View File

@ -69,6 +69,7 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
// check for valid json // check for valid json
if ($action != 'get' && $requestDecoded === null) { if ($action != 'get' && $requestDecoded === null) {
http_response_code(400);
echo json_encode(array( echo json_encode(array(
'type' => 'error', 'type' => 'error',
'msg' => 'Request body doesn\'t contain valid json!' 'msg' => 'Request body doesn\'t contain valid json!'
@ -112,9 +113,11 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
'msg' => 'Task completed' 'msg' => 'Task completed'
)); ));
if ($return === false) { if ($return === false) {
http_response_code(200);
echo isset($_SESSION['return']) ? json_encode($_SESSION['return']) : $generic_failure; echo isset($_SESSION['return']) ? json_encode($_SESSION['return']) : $generic_failure;
} }
else { else {
http_response_code(200);
echo isset($_SESSION['return']) ? json_encode($_SESSION['return']) : $generic_success; echo isset($_SESSION['return']) ? json_encode($_SESSION['return']) : $generic_success;
} }
} }
@ -202,6 +205,14 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
function process_get_return($data) { function process_get_return($data) {
echo (!isset($data) || empty($data)) ? '{}' : json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT); echo (!isset($data) || empty($data)) ? '{}' : json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT);
} }
if ($action != 'get' ) {
http_response_code(400);
echo json_encode(array(
'type' => 'error',
'msg' => 'Only GET method is allowed!'
));
exit
}
switch ($category) { switch ($category) {
case "rspamd": case "rspamd":
switch ($object) { switch ($object) {
@ -1042,9 +1053,11 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
'msg' => 'Task completed' 'msg' => 'Task completed'
)); ));
if ($return === false) { if ($return === false) {
http_response_code(200);
echo isset($_SESSION['return']) ? json_encode($_SESSION['return']) : $generic_failure; echo isset($_SESSION['return']) ? json_encode($_SESSION['return']) : $generic_failure;
} }
else { else {
http_response_code(200);
echo isset($_SESSION['return']) ? json_encode($_SESSION['return']) : $generic_success; echo isset($_SESSION['return']) ? json_encode($_SESSION['return']) : $generic_success;
} }
} }
@ -1148,9 +1161,11 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
'msg' => 'Task completed' 'msg' => 'Task completed'
)); ));
if ($return === false) { if ($return === false) {
http_response_code(200);
echo isset($_SESSION['return']) ? json_encode($_SESSION['return']) : $generic_failure; echo isset($_SESSION['return']) ? json_encode($_SESSION['return']) : $generic_failure;
} }
else { else {
http_response_code(200);
echo isset($_SESSION['return']) ? json_encode($_SESSION['return']) : $generic_success; echo isset($_SESSION['return']) ? json_encode($_SESSION['return']) : $generic_success;
} }
} }
@ -1273,6 +1288,14 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
break; break;
} }
break; break;
default;
http_response_code(404);
echo json_encode(array(
'type' => 'error',
'msg' => 'route not found'
));
unset($_POST);
die();
} }
} }
} }