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

Merge branch 'actualizar-el-cliente-de-ehorus' into 'develop' 

Resolve: "Actualizar el cliente de eHorus"

See merge request artica/pandorafms!1055
This commit is contained in:
vgilc 2017-12-21 10:57:15 +01:00
parent 6325e336c5 47cf03950a
commit d9884fd431
4 changed files with 58 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/setup/setup_ehorus.php
View File

@ -121,8 +121,8 @@ echo '<br />';
echo '<div style="font-family: lato, "Helvetica Neue", Helvetica, Arial, sans-serif; color: #515151;">'; echo '<div style="font-family: lato, "Helvetica Neue", Helvetica, Arial, sans-serif; color: #515151;">';
echo __('Remote Management System'); echo __('Remote Management System');
echo '</div>'; echo '</div>';
echo '<a target="_blank" rel="noopener noreferrer" href="http://ehorus.com">'; echo '<a target="_blank" rel="noopener noreferrer" href="https://ehorus.com">';
echo 'http://ehorus.com'; echo 'https://ehorus.com';
echo '</a>'; echo '</a>';
echo '</div>'; echo '</div>';

2
pandora_console/include/ehorus/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

60
pandora_console/operation/agentes/ehorus.php
View File

@ -56,15 +56,61 @@ $user = $config['ehorus_user'];
$password = io_output_password($config['ehorus_pass']); $password = io_output_password($config['ehorus_pass']);
$curl_timeout = $config['ehorus_req_timeout']; $curl_timeout = $config['ehorus_req_timeout'];
// Get the agent auth token $base_url = 'https://' . $hostname . ':' . $port;
$token_path = '/agents/' . $ehorus_agent_id . '/token';
// Get the login auth token
$login_path = '/api/login';
$body = array(
'user' => $user,
'pass' => $password,
'exp' => 300 // 5 minutes
);
$ch = curl_init(); $ch = curl_init();
curl_setopt($ch, CURLOPT_URL, 'https://' . $hostname . ':' . $port . $token_path); curl_setopt($ch, CURLOPT_URL, $base_url . $login_path);
curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC); curl_setopt($ch, CURLOPT_HTTPHEADER, array('Accept: application/json'));
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $curl_timeout); curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $curl_timeout);
curl_setopt($ch, CURLOPT_USERPWD, $user . ':' . $password); curl_setopt($ch, CURLOPT_HEADER, false);
curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($body));
$result_login = curl_exec($ch);
$http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$error = false;
if ($result_login === false) {
$error = curl_error($ch);
}
curl_close($ch);
if ($error !== false || $http_status !== 200) {
if ($error !== false) {
// echo $error;
ui_print_error_message(__('There was an error retrieving an authorization token'));
}
else {
ui_print_error_message($http_status . ' ' . $result_login);
}
return;
}
$response_auth = array();
try {
$response_auth = json_decode($result_login, true);
}
catch (Exception $e) {
ui_print_error_message(__('There was an error processing the response'));
}
// Get the agent auth token
$token_path = '/api/agents/' . $ehorus_agent_id . '/token';
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $base_url . $token_path);
curl_setopt($ch, CURLOPT_HTTPHEADER, array('Accept: application/json'));
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $curl_timeout);
curl_setopt($ch, CURLOPT_HTTPHEADER, array('Authorization: JWT ' . $response_auth['token']));
$result_token = curl_exec($ch); $result_token = curl_exec($ch);
$http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE); $http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
@ -94,9 +140,9 @@ catch (Exception $e) {
} }
// Get agent info // Get agent info
$agent_path = '/agents/' . $ehorus_agent_id; $agent_path = '/api/agents/' . $ehorus_agent_id;
$ch = curl_init(); $ch = curl_init();
curl_setopt($ch, CURLOPT_URL, 'https://' . $hostname . ':' . $port . $agent_path); curl_setopt($ch, CURLOPT_URL, $base_url . $agent_path);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $curl_timeout); curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $curl_timeout);

4
pandora_console/operation/agentes/ehorus_client.php
View File

@ -19,8 +19,8 @@ if (! isset($_SESSION['id_usuario'])) {
} }
// Global & session management // Global & session management
require_once ('../../include/config.php'); require_once('../../include/config.php');
require_once ($config['homedir'] . '/include/functions.php'); require_once($config['homedir'] . '/include/functions.php');
check_login(); check_login();