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

Merge branch 'ent-8435-11626-Vulnerabilidad-JQuery' into 'develop' 

Ent 8435 11626 vulnerabilidad j query

See merge request artica/pandorafms!4683
This commit is contained in:
Daniel Rodriguez 2022-02-10 11:05:53 +00:00
parent 1d86c1ea48 816bbf4d00
commit 8f59f4158f
21 changed files with 30930 additions and 25019 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/extras/delete_files/delete_files.txt
View File

@ -117,4 +117,6 @@ mobile/include/style/jquery.mobile-1.3.1.css
godmode/alerts/configure_alert_special_days.php
godmode/admin_access_logs.php
enterprise/extensions/backup/main.php
enterprise/extensions/backup.php
enterprise/extensions/backup.php
mobile/include/javascript/jquery.mobile-1.4.5.js
mobile/include/style/jquery.mobile-1.4.5.css

2
pandora_console/include/graphs/functions_flot.php
View File

@ -33,7 +33,7 @@ function include_javascript_dependencies_flot_graph($return=false, $mobile=false
if ($mobile === true) {
$output .= '
<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/mobile/include/javascript/jquery.js').'"></script>
<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/mobile/include/javascript/jquery.mobile-1.4.5.js').'"></script>';
<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/mobile/include/javascript/jquery.mobile-1.5.0-rc1.js').'"></script>';
}
// NOTE: jquery.flot.threshold is not te original file. Is patched to allow multiple thresholds and filled area

16520
pandora_console/mobile/include/javascript/jquery.js vendored
View File

File diff suppressed because it is too large Load Diff

15454
pandora_console/mobile/include/javascript/jquery.mobile-1.4.5.js
View File

File diff suppressed because it is too large Load Diff

20627
pandora_console/mobile/include/javascript/jquery.mobile-1.5.0-rc1.js Normal file
View File

File diff suppressed because it is too large Load Diff

2786
pandora_console/mobile/include/style/jquery.mobile-1.4.5.css → pandora_console/mobile/include/style/jquery.mobile-1.5.0-rc1.min.css vendored
View File

File diff suppressed because it is too large Load Diff

110
pandora_console/mobile/include/style/main.css
View File

@ -63,6 +63,15 @@ body {
.ui-header .ui-title {
font-size: 14px !important;
min-height: 1.1em;
text-align: center;
display: block;
margin: 0 30%;
padding: 0.7em 0;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
outline: 0 !important;
}
.ui-btn-inner {
@ -1094,6 +1103,15 @@ li.ui-btn {
.ui-header .ui-title {
font-size: 18px !important;
min-height: 1.1em;
text-align: center;
display: block;
margin: 0 30%;
padding: 0.7em 0;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
outline: 0 !important;
}
* {
@ -1165,59 +1183,58 @@ table.tactical_bars {
/*INIT-----------Icons styles--------------------------------------- 1.3.1*/
.ui-icon-tactical_view:after {
.ui-icon-tactical_view {
background-image: url(../../../images/op_monitoring.menu.png) !important;
background-position: unset !important;
background-color: #333 !important;
background-size: 21px 21px !important;
background-size: 18px 18px !important;
}
.ui-icon-events:after {
.ui-icon-events {
background-image: url(../../../images/op_events.menu.png) !important;
background-position: unset !important;
background-color: #333 !important;
background-size: 18px 18px !important;
}
.ui-icon-groups:after {
.ui-icon-groups {
background-image: url(../../../images/group.menu.png) !important;
background-color: #333 !important;
background-size: 20px 20px !important;
background-size: 18px 18px !important;
}
.ui-icon-alerts:after {
.ui-icon-alerts {
background-image: url(../../../images/op_alerts.menu.png) !important;
background-position: unset !important;
background-color: #333 !important;
background-size: 18px 18px !important;
}
.ui-icon-agents:after {
.ui-icon-agents {
background-image: url(../../../images/agent_mc.menu.png) !important;
background-position: unset !important;
background-color: #333 !important;
background-size: 18px 18px !important;
}
.ui-icon-modules:after {
.ui-icon-modules {
background-image: url(../../../images/brick.menu.png) !important;
background-color: #333 !important;
background-size: 20px 20px !important;
background-size: 18px 18px !important;
}
.ui-icon-network_maps:after {
.ui-icon-network_maps {
background-image: url(../../../images/op_network.menu.png) !important;
background-position: unset !important;
background-color: #333 !important;
background-size: 18px 18px !important;
}
.ui-icon-visual_console:after {
.ui-icon-visual_console {
background-image: url(../../../images/visual_console.menu.png) !important;
background-color: #333 !important;
background-size: 20px 20px !important;
background-size: 18px 18px !important;
}
.ui-icon-dashboard:after {
.ui-icon-dashboard {
background-image: url(../../../images/dashboard.menu.png) !important;
background-position: unset !important;
background-color: #333 !important;
background-size: 18px 18px !important;
}
.ui-icon-tactical_view,
@ -1260,7 +1277,8 @@ table.tactical_bars {
.ui-icon-network_maps,
.ui-icon-visual_console,
.ui-icon-dashboard {
height: 28px !important;
height: 18px !important;
width: 18px !important;
margin-top: 0px !important;
}
}
@ -1275,7 +1293,8 @@ table.tactical_bars {
.ui-icon-network_maps,
.ui-icon-visual_console,
.ui-icon-dashboard {
height: 32px !important;
height: 18px !important;
width: 18px !important;
}
}
@ -1423,3 +1442,52 @@ div.nodata_container {
.ui-listview > li > a.ui-btn {
border-width: 0 !important;
}
.ui-page-active {
padding-top: 2.8em !important;
}
.ui-header-fixed {
top: -1px;
padding-top: 1px;
left: 0;
right: 0;
width: 100%;
position: fixed;
z-index: 1000;
}
.header-button-left {
position: absolute !important;
top: 0em;
font-size: 12.5px !important;
margin: 0 !important;
margin-top: 1px !important;
left: 0.4em;
font-family: sans-serif !important;
padding: 0.5em 1em !important;
}
.header-button-right {
position: absolute !important;
top: 0em;
font-size: 12.5px !important;
margin: 0 !important;
margin-top: 1px !important;
right: 0.4em;
font-family: sans-serif !important;
padding: 0.5em 1em !important;
}
.ui-textinput-search {
border-radius: 0.6em 0.6em 0.6em 0.6em !important;
}
.ui-textinput-search input {
line-height: normal !important;
}
.ui-controlgroup {
padding: 0;
margin: 0.5em 0 !important;
}

271
pandora_console/mobile/include/style/main.css.old
View File

@ -1,271 +0,0 @@
* {
margin: 0;
padding: 0;
border: 0;
font-size: 12px;
font-family: Arial;
}
a:hover {
text-decoration: none;
}
body {
}
input {
border: 1px solid;
}
.tactical_link {
text-decoration: none;
}
.tactical_link:hover {
text-decoration: underline;
}
.orange {
color: #ffa300;
}
.green {
color: #5a8629;
}
.yellow {
color: #F3C500;
}
.greenb {
color: #00aa00;
}
.grey {
color: #808080;
font-weight: bold;
}
select {
border: #CCCCCC 1px solid;
}
.button_filter {
background: url("../../images/zoom.png") no-repeat scroll center center;
margin-left: 5px;
width: 20px;
height: 20px;
}
input {
border: #CCCCCC 1px solid;
}
.title_h3, .title_h3 * {
border-top: 1px solid #CCCCCC;
margin: 5px;
color: #3F4E2F;
}
.title_h3_server {
border-top: 1px solid #CCCCCC;
border-bottom: 1px solid #CCCCCC;
margin: 5px;
color: #3F4E2F;
}
tr.rowPair {
background-color: #fff;
}
tr.rowOdd {
background-color: #EEEEEE;
}
tr.rowPair:hover {
background-color: #E0E0E0;
}
tr.rowOdd:hover {
background-color: #E0E0E0
}
#footer {
background: #000;
height: 30px;
color: #fff;
text-align: center;
margin-top: 20px;
font-size: 10px;
}
/*----------------INI-LOGIN---------------------------------------------------*/
#center_div {
display: block;
position: absolute;
top: 30px;
left: 50%;
}
#negative_position_div {
display: block;
position: absolute;
left: -335px;
}
#style_div #shadow {
display: block;
border: 0px;
position: absolute;
top: 15px;
left: 235px;
background: #036A3A;
width: 200px;
height: 120px;
color: #fff;
}
#style_div #shadow p {
position: absolute;
bottom: 0px;
right: 2px;
}
#style_div #shadow * {
font-size: 9px;
}
#style_div #version {
color: #036A3A;
}
#style_div #login_box {
background: url("../../../images/pandora_logo.png") bottom left no-repeat #fff;
display: block;
border: 2px solid #6DC62D;
position: absolute;
top: 0px;
left: 220px;
width: 200px;
height: 120px;
}
#style_div #text-user {
width: 60px;
height: 15px;
position: absolute;
left: 20px;
top: 20px;
}
#style_div #password-password {
width: 60px;
height: 15px;
position: absolute;
left: 20px;
top: 45px;
}
#style_div .login_button {
width: 70px;
height: 70px;
background: url('../../images/key.gif') #fff center no-repeat;
border: outset 5px #A3A3A3;
position: absolute;
left: 120px;
top: 10px;
}
#style_div .login_button:hover {
border: outset 5px #E9E9E9;
}
/*STYLE FOR IEXPLOTER MOBILE, MAY BE ANY DAY ERASE THIS LINES*/
#form_table td {
background: url('../../images/transparent_pixel.gif');
}
#table_version #text-user {
width: 60px;
height: 15px;
}
#table_version #password-password {
width: 60px;
height: 15px;
}
#table_version .login_button {
width: 70px;
height: 70px;
background: url('../../images/key.gif') #fff center no-repeat;
border: outset 5px #A3A3A3;
}
#table_version_negative_position_div {
/*margin-left: -120px;*/
}
/*----------------END-LOGIN---------------------------------------------------*/
/*----------------INI-MENU----------------------------------------------------*/
#top_menu {
background: #3F4E2F;
overflow: hidden;
position: absolute;
z-index: 2;
}
#margin_bottom_menu {
/*margin-bottom: 17px;*/
}
#menu {
display: none;
}
#down_button {
height: 20px;
background: #fff;
}
#down_button img {
background: #3F4E2F;
padding-left: 10px;
padding-right: 10px;
}
.icon_menu {
width: 30px;
height: 30px;
}
/*----------------END-MENU----------------------------------------------------*/
/*----------------INI-EVENTS ROW BACKGROUND-----------------------------------*/
.datos_green, .datos_greenf9 {
background-color: #BBFFA4;
}
.datos_red, .datos_redf9 {
background-color: #FFC0B5;
}
.datos_yellow, .datos_yellowf9 {
background-color: #F4FFBF;
}
.datos_blue, .datos_bluef9 {
background-color: #CDE2EA;
}
.datos_grey, .datos_greyf9 {
background-color: #E4E4E4;
}
/*----------------END-EVENTS ROW BACKGROUND-----------------------------------*/
/*----------------INI-TABLE---------------------------------------------------*/
th {
background-color:#9EAC8B;
color:#FFFFFF;
text-align:center;
}
.databox {
border: 1px solid #f2f2f2;
background-color: #fafafa;
}
/*----------------END-TABLE---------------------------------------------------*/

35
pandora_console/mobile/include/ui.class.php
View File

@ -220,10 +220,11 @@ class Ui
if ($left_button === false) {
$left_button = $this->createHeaderButton(
[
'icon' => 'back',
'pos' => 'left',
'text' => __('Logout'),
'href' => 'index.php?action=logout',
'icon' => 'ui-icon-back',
'pos' => 'left',
'text' => __('Logout'),
'href' => 'index.php?action=logout',
'class' => 'header-button-left',
]
);
}
@ -233,10 +234,11 @@ class Ui
$left_button,
$this->createHeaderButton(
[
'icon' => 'home',
'pos' => 'right',
'text' => __('Home'),
'href' => 'index.php?page=home',
'icon' => 'ui-icon-home',
'pos' => 'right',
'text' => __('Home'),
'href' => 'index.php?page=home',
'class' => 'header-button-right',
]
)
);
@ -265,6 +267,10 @@ class Ui
$return .= 'href="#" ';
}
if (isset($options['class'])) {
$return .= 'class="'.$options['class'].'" ';
}
$return .= ' data-ajax="false">';
if (isset($options['text'])) {
@ -785,9 +791,12 @@ class Ui
echo " <meta charset='UTF-8' />\n";
echo " <meta name='viewport' content='width=device-width, initial-scale=1'>\n";
echo " <link rel='stylesheet' href='include/style/main.css' />\n";
echo " <link rel='stylesheet' href='include/style/jquery.mobile-1.4.5.css' />\n";
// echo " <link rel='stylesheet' href='include/style/jquery.mobile-1.4.5.css' />\n";
echo " <link rel='stylesheet' href='include/style/jquery.mobile-1.5.0-rc1.min.css' />\n";
// echo " <script src='include/javascript/jquery.js.bakc'></script>\n";
echo " <script src='include/javascript/jquery.js'></script>\n";
echo " <script src='include/javascript/jquery.mobile-1.4.5.js'></script>\n";
// echo " <script src='include/javascript/jquery.mobile-1.4.5.js'></script>\n";
echo " <script src='include/javascript/jquery.mobile-1.5.0-rc1.js'></script>\n";
echo " <script src='../include/javascript/pandora.js'></script>\n";
echo " <script src='../include/javascript/pandora_ui.js'></script>\n";
@ -828,12 +837,12 @@ class Ui
}
echo " <div data-dom-cache='false' data-role='page' id='".$this->page_name."'>\n";
echo " <div data-role='header' data-position='fixed' >\n";
echo ' <h1>'.$this->header['title']."</h1>\n";
echo " <div data-role='header' data-position='fixed' class='ui-header ui-bar-inherit ui-header-fixed slidedown'>\n";
echo ' <h1 class="ui-title">'.$this->header['title']."</h1>\n";
echo ' '.$this->header['button_left']."\n";
echo ' '.$this->header['button_right']."\n";
echo " </div>\n";
echo " <div data-role='content'>\n";
echo " <div data-role='content' class='ui-content'>\n";
foreach ($this->content as $content) {
echo ' '.$content."\n";
}

9
pandora_console/mobile/include/user.class.php
View File

@ -397,10 +397,11 @@ class User
$left_button = $ui->createHeaderButton(
[
'icon' => 'back',
'pos' => 'left',
'text' => __('Logout'),
'href' => 'index.php?action=logout',
'icon' => 'ui-icon-back',
'pos' => 'left',
'text' => __('Logout'),
'href' => 'index.php?action=logout',
'class' => 'header-button-left ui-icon-back',
]
);
$ui->createHeader('', $left_button);

9
pandora_console/mobile/operation/agent.php
View File

@ -125,10 +125,11 @@ class Agent
sprintf('%s', $agent_alias),
$ui->createHeaderButton(
[
'icon' => 'back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=agents'.$agents_filter_q_param,
'icon' => 'ui-icon-back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=agents'.$agents_filter_q_param,
'class' => 'header-button-left',
]
)
);

9
pandora_console/mobile/operation/agents.php
View File

@ -186,10 +186,11 @@ class Agents
__('Agents'),
$ui->createHeaderButton(
[
'icon' => 'back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=home',
'icon' => 'ui-icon-back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=home',
'class' => 'header-button-left',
]
)
);

9
pandora_console/mobile/operation/alerts.php
View File

@ -176,10 +176,11 @@ class Alerts
__('Alerts'),
$ui->createHeaderButton(
[
'icon' => 'back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=home',
'icon' => 'ui-icon-back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=home',
'class' => 'header-button-left',
]
)
);

9
pandora_console/mobile/operation/events.php
View File

@ -609,10 +609,11 @@ class Events
__('Events'),
$ui->createHeaderButton(
[
'icon' => 'back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=home',
'icon' => 'ui-icon-back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=home',
'class' => 'header-button-left',
]
)
);

9
pandora_console/mobile/operation/groups.php
View File

@ -77,10 +77,11 @@ class Groups
__('Groups'),
$ui->createHeaderButton(
[
'icon' => 'back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=home',
'icon' => 'ui-icon-back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=home',
'class' => 'header-button-left',
]
)
);

32
pandora_console/mobile/operation/home.php
View File

@ -45,19 +45,19 @@ class Home
'name' => __('Tactical view'),
'filename' => 'tactical.php',
'menu_item' => true,
'icon' => 'tactical_view',
'icon' => 'ui-icon-tactical_view ui-widget-icon-floatbeginning',
];
$items['events'] = [
'name' => __('Events'),
'filename' => 'events.php',
'menu_item' => true,
'icon' => 'events',
'icon' => 'ui-icon-events ui-widget-icon-floatbeginning',
];
$items['groups'] = [
'name' => __('Groups'),
'filename' => 'groups.php',
'menu_item' => true,
'icon' => 'groups',
'icon' => 'ui-icon-groups ui-widget-icon-floatbeginning',
];
if ((bool) $system->getConfig('legacy_vc', false) === false) {
@ -66,7 +66,7 @@ class Home
'name' => __('Visual consoles'),
'filename' => 'visualmaps.php',
'menu_item' => true,
'icon' => 'visual_console',
'icon' => 'ui-icon-visual_console ui-widget-icon-floatbeginning',
];
}
@ -74,21 +74,21 @@ class Home
'name' => __('Alerts'),
'filename' => 'alerts.php',
'menu_item' => true,
'icon' => 'alerts',
'icon' => 'ui-icon-alerts ui-widget-icon-floatbeginning',
];
$items['agents'] = [
'name' => __('Agents'),
'filename' => 'agents.php',
'menu_item' => true,
'icon' => 'agents',
'icon' => 'ui-icon-agents ui-widget-icon-floatbeginning',
];
$items['modules'] = [
'name' => __('Modules'),
'filename' => 'modules.php',
'menu_item' => true,
'icon' => 'modules',
'icon' => 'ui-icon-modules ui-widget-icon-floatbeginning',
];
// Not in home.
@ -118,10 +118,11 @@ class Home
foreach ($this->pagesItems as $page => $data) {
if ($data['menu_item']) {
$options = [
'icon' => $data['icon'],
'pos' => 'right',
'text' => $data['name'],
'href' => "index.php?page=$page",
'icon' => $data['icon'],
'pos' => 'right',
'text' => $data['name'],
'href' => "index.php?page=$page",
'class' => $data['class'],
];
$ui->contentAddHtml($ui->createButton($options));
}
@ -142,10 +143,11 @@ class Home
} else {
$left_button = $ui->createHeaderButton(
[
'icon' => 'back',
'pos' => 'left',
'text' => __('Logout'),
'href' => 'index.php?action=logout',
'icon' => 'ui-icon-back',
'pos' => 'left',
'text' => __('Logout'),
'href' => 'index.php?action=logout',
'class' => 'header-button-left',
]
);
}

18
pandora_console/mobile/operation/module_graph.php
View File

@ -359,10 +359,11 @@ class ModuleGraph
sprintf(__('%s: %s'), get_product_name(), $this->module['nombre']),
$ui->createHeaderButton(
[
'icon' => 'back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=agent&id='.$this->id_agent,
'icon' => 'ui-icon-back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=agent&id='.$this->id_agent,
'class' => 'header-button-left',
]
)
);
@ -371,10 +372,11 @@ class ModuleGraph
sprintf(__('%s: %s'), get_product_name(), $this->module['nombre']),
$ui->createHeaderButton(
[
'icon' => 'back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=modules',
'icon' => 'ui-icon-back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=modules',
'class' => 'header-button-left',
]
)
);

9
pandora_console/mobile/operation/modules.php
View File

@ -218,10 +218,11 @@ class Modules
__('Modules'),
$ui->createHeaderButton(
[
'icon' => 'back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=home',
'icon' => 'ui-icon-back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=home',
'class' => 'header-button-left',
]
)
);

9
pandora_console/mobile/operation/tactical.php
View File

@ -97,10 +97,11 @@ class Tactical
__('Tactical view'),
$ui->createHeaderButton(
[
'icon' => 'back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=home',
'icon' => 'ui-icon-back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=home',
'class' => 'header-button-left',
]
)
);

9
pandora_console/mobile/operation/visualmap.php
View File

@ -278,10 +278,11 @@ class Visualmap
),
$ui->createHeaderButton(
[
'icon' => 'back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=visualmaps',
'icon' => 'ui-icon-back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=visualmaps',
'class' => 'header-button-left',
]
)
);

9
pandora_console/mobile/operation/visualmaps.php
View File

@ -177,10 +177,11 @@ class Visualmaps
__('Visual consoles'),
$ui->createHeaderButton(
[
'icon' => 'back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=home',
'icon' => 'ui-icon-back',
'pos' => 'left',
'text' => __('Back'),
'href' => 'index.php?page=home',
'class' => 'header-button-left',
]
)
);