tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Api auth bearer token

This commit is contained in:
Calvo 2022-12-30 15:55:46 +01:00
parent 38838cd4e0
commit c608ef6fcf
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/include/api.php
View File

@ -69,9 +69,6 @@ $id2 = get_parameter('id2');
$otherSerialize = get_parameter('other');
$otherMode = get_parameter('other_mode', 'url_encode');
$returnType = get_parameter('return_type', 'string');
$api_password = get_parameter('apipass', '');
$password = get_parameter('pass', '');
$user = get_parameter('user', '');
$info = get_parameter('info', '');
$raw_decode = (bool) get_parameter('raw_decode', false);
@ -84,14 +81,16 @@ $apiPassword = io_output_password(
)
);
$apiTokenValid = false;
// Try getting bearer token from header.
// TODO. Getting token from url will be removed.
$apiToken = (string) getBearerToken();
if ($apiToken === false) {
// Legacy token in GET.
if (empty($apiToken) === true) {
// Legacy user/pass token.
// TODO. Revome in future.
$apiToken = (string) get_parameter('token');
$apiTokenValid = (isset($_GET['token']) === true && (bool) api_token_check($apiToken));
$api_password = get_parameter('apipass', '');
$user = get_parameter('user', '');
$password = get_parameter('pass', '');
} else {
$apiTokenValid = (bool) api_token_check($apiToken);
}