Fix Limble auth and secure request handling
This commit is contained in:
@@ -29,8 +29,8 @@ class limble_request implements limble_request_i
|
||||
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
|
||||
// Set options to return the response and handle SSL
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
|
||||
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
|
||||
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
|
||||
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
|
||||
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
|
||||
// Execute the request
|
||||
$response = curl_exec($ch);
|
||||
// Check for errors
|
||||
@@ -44,11 +44,7 @@ class limble_request implements limble_request_i
|
||||
// Check if the response is successful
|
||||
if ($httpCode < 200 || $httpCode >= 300) {
|
||||
$slack = new \classes\slack();
|
||||
echo 'Attempting credentials: ' . $url . ' with method: ' . $method . ' and data: ' . json_encode($data) . "\n";
|
||||
echo 'Response: ' . $response . "\n";
|
||||
echo 'HTTP Code: ' . $httpCode . "\n";
|
||||
echo 'Headers: ' . json_encode($headers) . "\n";
|
||||
$slack->send_message('Limble Request Failed: ' . $response, 'Limble Request Error');
|
||||
$slack->send_message('Limble Request Failed with status code: ' . $httpCode, 'Limble Request Error');
|
||||
throw new \Exception('Request failed with status code ' . $httpCode);
|
||||
}
|
||||
// Check if the response is valid JSON
|
||||
@@ -68,4 +64,4 @@ class limble_request implements limble_request_i
|
||||
// Generate the Basic Auth header using the client ID and secret
|
||||
return 'Authorization: Basic ' . base64_encode($client_id . ':' . $client_secret);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,8 +22,7 @@ class moduleLimbleRoute
|
||||
$this->post('/modules/limble/webhook/task', function () {
|
||||
global $response;
|
||||
$slack = new slack();
|
||||
//TODO: Add authentication of some sort here
|
||||
//self::requirePermission('modules_limble_webhooks_task');
|
||||
self::requirePermission('modules_limble_webhooks_task');
|
||||
// Check if the module is enabled
|
||||
$limble = new limble();
|
||||
$limble->requireModuleEnabled();
|
||||
@@ -45,7 +44,7 @@ class moduleLimbleRoute
|
||||
global $response;
|
||||
$slack = new slack();
|
||||
$slack->send_message('Limble Tasks Endpoint Triggered', 'Limble Tasks');
|
||||
//self::requirePermission('modules_limble_tasks');
|
||||
self::requirePermission('modules_limble_tasks');
|
||||
// Check if the module is enabled
|
||||
$limble = new limble();
|
||||
$limble->requireModuleEnabled();
|
||||
@@ -61,4 +60,4 @@ class moduleLimbleRoute
|
||||
]
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user