From 0e277ad1ef4dae7b17bcc7d71f83f6c76494cf45 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Mon, 6 Apr 2015 13:49:28 +0200 Subject: [PATCH 01/11] Add new image for tree view, not view in internet explorer (cherry picked from commit b63f1cfe817448709561a5d06d99ad89d7e5b68e) --- pandora_console/images/pandora.png | Bin 0 -> 493 bytes .../include/javascript/tree/TreeController.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 pandora_console/images/pandora.png diff --git a/pandora_console/images/pandora.png b/pandora_console/images/pandora.png new file mode 100644 index 0000000000000000000000000000000000000000..bbe2ea5bc07cedee42c9b9cd1adb6e514b4b454c GIT binary patch literal 493 zcmVb zfEa-y`x!vsKM(*p{{aGs0Z24}7$DHG&*VQ70~FkNwTFR&m6rh^fDn41fCXeyyvbsQ zlaCgHRWaUwck=(jGqGS<1wk_gCJ;w}QcRU{3;+QHGNS<~S&wWENWq8iPr+=s zt>uoV8PY8_fY~5P5FchK*tmsf;uv0hz798K=7|7=0+=I^0n7@30K)JGIsp3%p8_Ui zm)E=AWboJSV9*eAK~*5ZtI3dWvyY*3zbV7Us}*4TK?>mtK;8p6^v9o1U_p>?K%s_W z#f#53a5@sM8)Pgj6ek{WLMQ-*IS7F4M+X1_hBYoo0WA0=K^`%ei$@6-kZX3{Y=cJ| zh5?`;i#J)sz`?=?R#*$nRLRSXtD!vr`GDFwv'); + .prepend(''); } // Normal group else { From f6405cb8e0f6ba96415bdef8e6442ebdd836dd4d Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Mon, 6 Apr 2015 15:50:35 +0200 Subject: [PATCH 02/11] Reduced the length of the profile types cause they only store 1 or 0 --- pandora_console/pandoradb.oracle.sql | 34 ++++++++++++++-------------- pandora_console/pandoradb.sql | 34 ++++++++++++++-------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql index b8438d6a83..bdfc0f59a4 100755 --- a/pandora_console/pandoradb.oracle.sql +++ b/pandora_console/pandoradb.oracle.sql @@ -823,23 +823,23 @@ CREATE TABLE torigen ( CREATE TABLE tperfil ( id_perfil NUMBER(10, 0) NOT NULL PRIMARY KEY, name CLOB default '', - incident_edit NUMBER(5, 0) default 0 NOT NULL, - incident_view NUMBER(5, 0) default 0 NOT NULL, - incident_management NUMBER(5, 0) default 0 NOT NULL, - agent_view NUMBER(5, 0) default 0 NOT NULL, - agent_edit NUMBER(5, 0) default 0 NOT NULL, - alert_edit NUMBER(5, 0) default 0 NOT NULL, - user_management NUMBER(5, 0) default 0 NOT NULL, - db_management NUMBER(5, 0) default 0 NOT NULL, - alert_management NUMBER(5, 0) default 0 NOT NULL, - pandora_management NUMBER(5, 0) default 0 NOT NULL, - report_view NUMBER(5, 0) default 0 NOT NULL, - report_edit NUMBER(5, 0) default 0 NOT NULL, - report_management NUMBER(5, 0) default 0 NOT NULL, - event_view NUMBER(5, 0) default 0 NOT NULL, - event_edit NUMBER(5, 0) default 0 NOT NULL, - event_management NUMBER(5, 0) default 0 NOT NULL, - agent_disable NUMBER(5, 0) default 0 NOT NULL + incident_edit NUMBER(1, 0) default 0 NOT NULL, + incident_view NUMBER(1, 0) default 0 NOT NULL, + incident_management NUMBER(1, 0) default 0 NOT NULL, + agent_view NUMBER(1, 0) default 0 NOT NULL, + agent_edit NUMBER(1, 0) default 0 NOT NULL, + alert_edit NUMBER(1, 0) default 0 NOT NULL, + user_management NUMBER(1, 0) default 0 NOT NULL, + db_management NUMBER(1, 0) default 0 NOT NULL, + alert_management NUMBER(1, 0) default 0 NOT NULL, + pandora_management NUMBER(1, 0) default 0 NOT NULL, + report_view NUMBER(1, 0) default 0 NOT NULL, + report_edit NUMBER(1, 0) default 0 NOT NULL, + report_management NUMBER(1, 0) default 0 NOT NULL, + event_view NUMBER(1, 0) default 0 NOT NULL, + event_edit NUMBER(1, 0) default 0 NOT NULL, + event_management NUMBER(1, 0) default 0 NOT NULL, + agent_disable NUMBER(1, 0) default 0 NOT NULL ); CREATE SEQUENCE tperfil_s INCREMENT BY 1 START WITH 1; diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 5674dba402..c38e69183e 100755 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -782,23 +782,23 @@ CREATE TABLE IF NOT EXISTS `torigen` ( CREATE TABLE IF NOT EXISTS `tperfil` ( `id_perfil` int(10) unsigned NOT NULL auto_increment, `name` TEXT NOT NULL, - `incident_edit` tinyint(3) NOT NULL default '0', - `incident_view` tinyint(3) NOT NULL default '0', - `incident_management` tinyint(3) NOT NULL default '0', - `agent_view` tinyint(3) NOT NULL default '0', - `agent_edit` tinyint(3) NOT NULL default '0', - `alert_edit` tinyint(3) NOT NULL default '0', - `user_management` tinyint(3) NOT NULL default '0', - `db_management` tinyint(3) NOT NULL default '0', - `alert_management` tinyint(3) NOT NULL default '0', - `pandora_management` tinyint(3) NOT NULL default '0', - `report_view` tinyint(3) NOT NULL default '0', - `report_edit` tinyint(3) NOT NULL default '0', - `report_management` tinyint(3) NOT NULL default '0', - `event_view` tinyint(3) NOT NULL default '0', - `event_edit` tinyint(3) NOT NULL default '0', - `event_management` tinyint(3) NOT NULL default '0', - `agent_disable` tinyint(3) NOT NULL default '0', + `incident_edit` tinyint(1) NOT NULL DEFAULT 0, + `incident_view` tinyint(1) NOT NULL DEFAULT 0, + `incident_management` tinyint(1) NOT NULL DEFAULT 0, + `agent_view` tinyint(1) NOT NULL DEFAULT 0, + `agent_edit` tinyint(1) NOT NULL DEFAULT 0, + `alert_edit` tinyint(1) NOT NULL DEFAULT 0, + `user_management` tinyint(1) NOT NULL DEFAULT 0, + `db_management` tinyint(1) NOT NULL DEFAULT 0, + `alert_management` tinyint(1) NOT NULL DEFAULT 0, + `pandora_management` tinyint(1) NOT NULL DEFAULT 0, + `report_view` tinyint(1) NOT NULL DEFAULT 0, + `report_edit` tinyint(1) NOT NULL DEFAULT 0, + `report_management` tinyint(1) NOT NULL DEFAULT 0, + `event_view` tinyint(1) NOT NULL DEFAULT 0, + `event_edit` tinyint(1) NOT NULL DEFAULT 0, + `event_management` tinyint(1) NOT NULL DEFAULT 0, + `agent_disable` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id_perfil`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; From a06f8eee09bb836c0f34701a19979e53fa319258 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Mon, 6 Apr 2015 15:51:53 +0200 Subject: [PATCH 03/11] Added new profile bits to control the access to the visual console and the network maps --- .../extras/pandoradb_migrate_5.1_to_6.0.mysql.sql | 14 ++++++++++++++ .../extras/pandoradb_migrate_5.1_to_6.0.oracle.sql | 14 ++++++++++++++ .../pandoradb_migrate_5.1_to_6.0.postgreSQL.sql | 14 ++++++++++++++ pandora_console/pandoradb.oracle.sql | 8 +++++++- pandora_console/pandoradb.postgreSQL.sql | 8 +++++++- pandora_console/pandoradb.sql | 6 ++++++ 6 files changed, 62 insertions(+), 2 deletions(-) diff --git a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql index 4ab94fad5a..f51651480a 100755 --- a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql @@ -70,3 +70,17 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('post_process_custom_values', ALTER TABLE `tnetwork_map` ADD COLUMN `id_tag` int(11) DEFAULT 0; ALTER TABLE `tnetwork_map` ADD COLUMN `store_group` int(11) DEFAULT 0; UPDATE `tnetwork_map` SET `store_group` = `id_group`; + +-- --------------------------------------------------------------------- +-- Table `tperfil` +-- --------------------------------------------------------------------- +ALTER TABLE `tperfil` ADD COLUMN `map_view` tinyint(1) NOT NULL DEFAULT 0; +ALTER TABLE `tperfil` ADD COLUMN `map_edit` tinyint(1) NOT NULL DEFAULT 0; +ALTER TABLE `tperfil` ADD COLUMN `map_management` tinyint(1) NOT NULL DEFAULT 0; +ALTER TABLE `tperfil` ADD COLUMN `vconsole_view` tinyint(1) NOT NULL DEFAULT 0; +ALTER TABLE `tperfil` ADD COLUMN `vconsole_edit` tinyint(1) NOT NULL DEFAULT 0; +ALTER TABLE `tperfil` ADD COLUMN `vconsole_management` tinyint(1) NOT NULL DEFAULT 0; + +UPDATE `tperfil` SET `map_view` = 1, `vconsole_view` = 1 WHERE `report_view` = 1; +UPDATE `tperfil` SET `map_edit` = 1, `vconsole_edit` = 1 WHERE `report_edit` = 1; +UPDATE `tperfil` SET `map_management` = 1, `vconsole_management` = 1 WHERE `report_management` = 1; diff --git a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql index a1e52b9bff..36ff8004e0 100755 --- a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql @@ -70,3 +70,17 @@ INSERT INTO tconfig (token, value) VALUES ('post_process_custom_values', '{"0.00 ALTER TABLE tnetwork_map ADD COLUMN id_tag NUMBER(11, 0) DEFAULT 0; ALTER TABLE tnetwork_map ADD COLUMN store_group NUMBER(11, 0) DEFAULT 0; UPDATE tnetwork_map SET store_group = id_group; + +-- --------------------------------------------------------------------- +-- Table `tperfil` +-- --------------------------------------------------------------------- +ALTER TABLE tperfil ADD COLUMN map_view NUMBER(1, 0) DEFAULT 0 NOT NULL; +ALTER TABLE tperfil ADD COLUMN map_edit NUMBER(1, 0) DEFAULT 0 NOT NULL; +ALTER TABLE tperfil ADD COLUMN map_management NUMBER(1, 0) DEFAULT 0 NOT NULL; +ALTER TABLE tperfil ADD COLUMN vconsole_view NUMBER(1, 0) DEFAULT 0 NOT NULL; +ALTER TABLE tperfil ADD COLUMN vconsole_edit NUMBER(1, 0) DEFAULT 0 NOT NULL; +ALTER TABLE tperfil ADD COLUMN vconsole_management NUMBER(1, 0) DEFAULT 0 NOT NULL; + +UPDATE tperfil SET map_view = 1, vconsole_view = 1 WHERE report_view = 1; +UPDATE tperfil SET map_edit = 1, vconsole_edit = 1 WHERE report_edit = 1; +UPDATE tperfil SET map_management = 1, vconsole_management = 1 WHERE report_management = 1; diff --git a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql index 6882914fd2..3ca472b93c 100755 --- a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql @@ -68,3 +68,17 @@ INSERT INTO "tconfig" ("token", "value") VALUES ('post_process_custom_values', ' ALTER TABLE "tnetwork_map" ADD COLUMN "id_tag" INTEGER DEFAULT 0; ALTER TABLE "tnetwork_map" ADD COLUMN "store_group" INTEGER DEFAULT 0; UPDATE "tnetwork_map" SET "store_group" = "id_group"; + +-- --------------------------------------------------------------------- +-- Table `tperfil` +-- --------------------------------------------------------------------- +ALTER TABLE "tperfil" ADD COLUMN "map_view" SMALLINT NOT NULL DEFAULT 0; +ALTER TABLE "tperfil" ADD COLUMN "map_edit" SMALLINT NOT NULL DEFAULT 0; +ALTER TABLE "tperfil" ADD COLUMN "map_management" SMALLINT NOT NULL DEFAULT 0; +ALTER TABLE "tperfil" ADD COLUMN "vconsole_view" SMALLINT NOT NULL DEFAULT 0; +ALTER TABLE "tperfil" ADD COLUMN "vconsole_edit" SMALLINT NOT NULL DEFAULT 0; +ALTER TABLE "tperfil" ADD COLUMN "vconsole_management" SMALLINT NOT NULL DEFAULT 0; + +UPDATE "tperfil" SET "map_view" = 1, "vconsole_view" = 1 WHERE "report_view" = 1; +UPDATE "tperfil" SET "map_edit" = 1, "vconsole_edit" = 1 WHERE "report_edit" = 1; +UPDATE "tperfil" SET "map_management" = 1, "vconsole_management" = 1 WHERE "report_management" = 1; diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql index bdfc0f59a4..57a9a8f871 100755 --- a/pandora_console/pandoradb.oracle.sql +++ b/pandora_console/pandoradb.oracle.sql @@ -839,7 +839,13 @@ CREATE TABLE tperfil ( event_view NUMBER(1, 0) default 0 NOT NULL, event_edit NUMBER(1, 0) default 0 NOT NULL, event_management NUMBER(1, 0) default 0 NOT NULL, - agent_disable NUMBER(1, 0) default 0 NOT NULL + agent_disable NUMBER(1, 0) default 0 NOT NULL, + map_view NUMBER(1, 0) default 0 NOT NULL, + map_edit NUMBER(1, 0) default 0 NOT NULL, + map_management NUMBER(1, 0) default 0 NOT NULL, + vconsole_view NUMBER(1, 0) default 0 NOT NULL, + vconsole_edit NUMBER(1, 0) default 0 NOT NULL, + vconsole_management NUMBER(1, 0) default 0 NOT NULL ); CREATE SEQUENCE tperfil_s INCREMENT BY 1 START WITH 1; diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql index a78404a135..7d3ed285a8 100755 --- a/pandora_console/pandoradb.postgreSQL.sql +++ b/pandora_console/pandoradb.postgreSQL.sql @@ -738,7 +738,13 @@ CREATE TABLE "tperfil" ( "event_view" SMALLINT NOT NULL default 0, "event_edit" SMALLINT NOT NULL default 0, "event_management" SMALLINT NOT NULL default 0, - "agent_disable" SMALLINT NOT NULL default 0 + "agent_disable" SMALLINT NOT NULL default 0, + "map_view" SMALLINT NOT NULL default 0, + "map_edit" SMALLINT NOT NULL default 0, + "map_management" SMALLINT NOT NULL default 0, + "vconsole_view" SMALLINT NOT NULL default 0, + "vconsole_edit" SMALLINT NOT NULL default 0, + "vconsole_management" SMALLINT NOT NULL default 0 ); -- --------------------------------------------------------------------- diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index c38e69183e..32fd2a49b0 100755 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -799,6 +799,12 @@ CREATE TABLE IF NOT EXISTS `tperfil` ( `event_edit` tinyint(1) NOT NULL DEFAULT 0, `event_management` tinyint(1) NOT NULL DEFAULT 0, `agent_disable` tinyint(1) NOT NULL DEFAULT 0, + `map_view` tinyint(1) NOT NULL DEFAULT 0, + `map_edit` tinyint(1) NOT NULL DEFAULT 0, + `map_management` tinyint(1) NOT NULL DEFAULT 0, + `vconsole_view` tinyint(1) NOT NULL DEFAULT 0, + `vconsole_edit` tinyint(1) NOT NULL DEFAULT 0, + `vconsole_management` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id_perfil`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; From 533167e46ed32270d5ef077acc0057873a7493a0 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Mon, 6 Apr 2015 16:01:43 +0200 Subject: [PATCH 04/11] Added the values of the new access bits to the default profiles --- pandora_console/pandoradb.data.oracle.sql | 10 +++++----- pandora_console/pandoradb.data.postgreSQL.sql | 2 +- pandora_console/pandoradb_data.sql | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql index 26eb0c988a..cc136482f9 100644 --- a/pandora_console/pandoradb.data.oracle.sql +++ b/pandora_console/pandoradb.data.oracle.sql @@ -317,11 +317,11 @@ END;; -- BEGIN LOCK TABLE tperfil IN EXCLUSIVE MODE; -INSERT INTO tperfil VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0); -INSERT INTO tperfil VALUES (2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0); -INSERT INTO tperfil VALUES (3,'Chief Operator',1,1,1,1,0,0,0,0,1,0,1,1,1,1,1,0,1); -INSERT INTO tperfil VALUES (4,'Group coordinator',1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1); -INSERT INTO tperfil VALUES (5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1); +INSERT INTO tperfil VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0); +INSERT INTO tperfil VALUES (2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0,1,1,0,1,1,0); +INSERT INTO tperfil VALUES (3,'Chief Operator',1,1,1,1,0,0,0,0,1,0,1,1,1,1,1,0,1,1,1,1,1,1,1); +INSERT INTO tperfil VALUES (4,'Group coordinator',1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1); +INSERT INTO tperfil VALUES (5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1); COMMIT; END;; diff --git a/pandora_console/pandoradb.data.postgreSQL.sql b/pandora_console/pandoradb.data.postgreSQL.sql index 73c827d6a4..8abccd16c4 100644 --- a/pandora_console/pandoradb.data.postgreSQL.sql +++ b/pandora_console/pandoradb.data.postgreSQL.sql @@ -289,7 +289,7 @@ SELECT setval('tusuario_perfil_id_up_seq', (SELECT (SELECT MAX(id_up) FROM tusua -- -- Dumping data for table "tperfil" -- -INSERT INTO "tperfil" VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0),(2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0),(3,'Chief Operator',1,1,1,1,0,0,0,0,1,0,1,1,1,1,1,0,1),(4,'Group coordinator',1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1),(5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1); +INSERT INTO "tperfil" VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0),(2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0,1,1,0,1,1,0),(3,'Chief Operator',1,1,1,1,0,0,0,0,1,0,1,1,1,1,1,0,1,1,1,1,1,1,1),(4,'Group coordinator',1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1),(5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1); SELECT setval('tperfil_id_perfil_seq', (SELECT (SELECT MAX(id_perfil) FROM tperfil))); -- diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index b64a5c642f..a50d236132 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -279,7 +279,7 @@ INSERT INTO `tusuario_perfil` (`id_up`, `id_usuario`, `id_perfil`, `id_grupo`, ` -- Dumping data for table `tperfil` -- -INSERT INTO `tperfil` VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0),(2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0),(3,'Chief Operator',1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,1),(4,'Group coordinator',1,1,1,1,1,1,1,0,1,0,1,1,1,1,1,1,1),(5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1); +INSERT INTO `tperfil` VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0),(2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0,1,1,0,1,1,0),(3,'Chief Operator',1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,1,1,1,1,1,1,1),(4,'Group coordinator',1,1,1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1),(5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1); -- -- Dumping data for table `tnews` From e61ecd3f7349089d27b42df06959533f8d66d6f2 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Mon, 6 Apr 2015 16:54:24 +0200 Subject: [PATCH 05/11] Added the new 'tperfil' columns to the function "get_acl_column" --- pandora_console/include/functions.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index c70d6868d3..3183b8e6f5 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -1874,6 +1874,24 @@ function get_acl_column($access) { case "EM": return "event_management"; break; + case "MR": + return "map_view"; + break; + case "MW": + return "map_edit"; + break; + case "MM": + return "map_management"; + break; + case "VR": + return "vconsole_view"; + break; + case "VW": + return "vconsole_edit"; + break; + case "VM": + return "vconsole_management"; + break; default: return ""; break; From 9035eda57da41fd3b23ff8242f6744c2425f4c11 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Mon, 6 Apr 2015 18:51:24 +0200 Subject: [PATCH 06/11] Added the new access bits to the profiles list and editor --- .../godmode/users/configure_profile.php | 279 ++++++++++++++---- .../godmode/users/profile_list.php | 263 +++++++++++------ 2 files changed, 399 insertions(+), 143 deletions(-) diff --git a/pandora_console/godmode/users/configure_profile.php b/pandora_console/godmode/users/configure_profile.php index 622b01f009..39e2565bd7 100644 --- a/pandora_console/godmode/users/configure_profile.php +++ b/pandora_console/godmode/users/configure_profile.php @@ -64,24 +64,51 @@ $id_profile = (int) get_parameter ('id'); if ($id_profile || $new_profile) { if ($new_profile) { + // Name $name = ''; + + // Incidents $incident_view = 0; $incident_edit = 0; $incident_management = 0; + + // Agents $agent_view = 0; $agent_edit = 0; + $agent_disable = 0; + + // Alerts $alert_edit = 0; - $user_management = 0; - $db_management = 0; $alert_management = 0; + + // Users + $user_management = 0; + + // DB + $db_management = 0; + + // Pandora $pandora_management = 0; - $report_view = 0; - $report_edit = 0; - $report_management = 0; + + // Events $event_view = 0; $event_edit = 0; $event_management = 0; - $agent_disable = 0; + + // Reports + $report_view = 0; + $report_edit = 0; + $report_management = 0; + + // Network maps + $map_view = 0; + $map_edit = 0; + $map_management = 0; + + // Visual console + $vconsole_view = 0; + $vconsole_edit = 0; + $vconsole_management = 0; $page_title = __('Create profile'); } @@ -101,38 +128,91 @@ if ($id_profile || $new_profile) { exit; } + // Name $name = $profile["name"]; + + // Incidents $incident_view = (bool) $profile["incident_view"]; $incident_edit = (bool) $profile["incident_edit"]; $incident_management = (bool) $profile["incident_management"]; + + // Agents $agent_view = (bool) $profile["agent_view"]; $agent_edit = (bool) $profile["agent_edit"]; + $agent_disable = (bool) $profile["agent_disable"]; + + // Alerts $alert_edit = (bool) $profile["alert_edit"]; - $user_management = (bool) $profile["user_management"]; - $db_management = (bool) $profile["db_management"]; $alert_management = (bool) $profile["alert_management"]; + + // Users + $user_management = (bool) $profile["user_management"]; + + // DB + $db_management = (bool) $profile["db_management"]; + + // Pandora $pandora_management = (bool) $profile["pandora_management"]; - $report_view = (bool) $profile["report_view"]; - $report_edit = (bool) $profile["report_edit"]; - $report_management = (bool) $profile["report_management"]; + + // Events $event_view = (bool) $profile["event_view"]; $event_edit = (bool) $profile["event_edit"]; $event_management = (bool) $profile["event_management"]; - $agent_disable = (bool) $profile["agent_disable"]; + + // Reports + $report_view = (bool) $profile["report_view"]; + $report_edit = (bool) $profile["report_edit"]; + $report_management = (bool) $profile["report_management"]; + + // Network maps + $map_view = (bool) $profile["map_view"]; + $map_edit = (bool) $profile["map_edit"]; + $map_management = (bool) $profile["map_management"]; + + // Visual console + $vconsole_view = (bool) $profile["vconsole_view"]; + $vconsole_edit = (bool) $profile["vconsole_edit"]; + $vconsole_management = (bool) $profile["vconsole_management"]; $id_audit = db_pandora_audit("User management", "Edit profile ". $name); enterprise_include_once('include/functions_audit.php'); - $info = 'Name: ' . $name . ' Incident view: ' . $incident_view . - ' Incident edit: ' . $incident_edit . ' Incident management: ' . $incident_management . - ' Agent view: ' . $agent_view . ' Agent edit: ' . $agent_edit . - ' Alert edit: ' . $alert_edit . ' User management: ' . $user_management . - ' DB management: ' . $db_management . ' Alert management: ' . $alert_management . - ' Report view: ' . $report_view . ' Report edit: ' . $report_edit . - ' Report management: ' . $report_management . ' Event view: ' . $event_view . - ' Event edit: ' . $event_edit . ' Event management: ' . $event_management . - ' Agent disable: ' . $agent_disable . - ' Pandora Management: ' . $pandora_management; + + $info = 'Name: ' . $name . + + ' Incident view: ' . $incident_view . + ' Incident edit: ' . $incident_edit . + ' Incident management: ' . $incident_management . + + ' Agent view: ' . $agent_view . + ' Agent edit: ' . $agent_edit . + ' Agent disable: ' . $agent_disable . + + ' Alert edit: ' . $alert_edit . + ' Alert management: ' . $alert_management . + + ' User management: ' . $user_management . + + ' DB management: ' . $db_management . + + ' Event view: ' . $event_view . + ' Event edit: ' . $event_edit . + ' Event management: ' . $event_management . + + ' Report view: ' . $report_view . + ' Report edit: ' . $report_edit . + ' Report management: ' . $report_management . + + ' Network map view: ' . $map_view . + ' Network map edit: ' . $map_edit . + ' Network map management: ' . $map_management . + + ' Visual console view: ' . $vconsole_view . + ' Visual console edit: ' . $vconsole_edit . + ' Visual console management: ' . $vconsole_management . + + ' Pandora Management: ' . $pandora_management; + enterprise_hook('audit_pandora_enterprise', array($id_audit, $info)); @@ -141,7 +221,7 @@ if ($id_profile || $new_profile) { $table->width = '98%'; $table->class = 'databox'; - if (defined("METACONSOLE")){ + if (defined("METACONSOLE")) { $table->width = '100%'; $table->class = 'databox data'; if ($id_profile) @@ -156,42 +236,123 @@ if ($id_profile || $new_profile) { $table->style[0] = 'font-weight: bold'; $table->data = array (); - $table->data[0][0] = __('Profile name'); - $table->data[0][1] = html_print_input_text ('name', $name, '', 30, 60, true); - $table->data[1][0] = __('View incidents'); - $table->data[1][1] = html_print_checkbox ('incident_view', 1, $incident_view, true); - $table->data[2][0] = __('Edit incidents'); - $table->data[2][1] = html_print_checkbox ('incident_edit', 1, $incident_edit, true); - $table->data[3][0] = __('Manage incidents'); - $table->data[3][1] = html_print_checkbox ('incident_management', 1, $incident_management, true); - $table->data[4][0] = __('View agents'); - $table->data[4][1] = html_print_checkbox ('agent_view', 1, $agent_view, true); - $table->data[5][0] = __('Edit agents'); - $table->data[5][1] = html_print_checkbox ('agent_edit', 1, $agent_edit, true); - $table->data[6][0] = __('Disable agents'); - $table->data[6][1] = html_print_checkbox ('agent_disable', 1, $agent_disable, true); - $table->data[7][0] = __('Edit alerts'); - $table->data[7][1] = html_print_checkbox ('alert_edit', 1, $alert_edit, true); - $table->data[8][0] = __('Manage users'); - $table->data[8][1] = html_print_checkbox ('user_management', 1, $user_management, true); - $table->data[9][0] = __('Manage Database'); - $table->data[9][1] = html_print_checkbox ('db_management', 1, $db_management, true); - $table->data[10][0] = __('Manage alerts'); - $table->data[10][1] = html_print_checkbox ('alert_management', 1, $alert_management, true); - $table->data[11][0] = __('View reports'); - $table->data[11][1] = html_print_checkbox ('report_view', 1, $report_view, true); - $table->data[12][0] = __('Edit reports'); - $table->data[12][1] = html_print_checkbox ('report_edit', 1, $report_edit, true); - $table->data[13][0] = __('Manage reports'); - $table->data[13][1] = html_print_checkbox ('report_management', 1, $report_management, true); - $table->data[14][0] = __('View events'); - $table->data[14][1] = html_print_checkbox ('event_view', 1, $event_view, true); - $table->data[15][0] = __('Edit events'); - $table->data[15][1] = html_print_checkbox ('event_edit', 1, $event_edit, true); - $table->data[16][0] = __('Manage events'); - $table->data[16][1] = html_print_checkbox ('event_management', 1, $event_management, true); - $table->data[17][0] = __('Pandora management'); - $table->data[17][1] = html_print_checkbox ('pandora_management', 1, $pandora_management, true); + // Name + $row = array(); + $row['name'] = __('Profile name'); + $row['input'] = html_print_input_text ('name', $name, '', 30, 60, true); + $table->data['name'] = $row; + + // Incidents + $row = array(); + $row['name'] = __('View incidents'); + $row['input'] = html_print_checkbox ('incident_view', 1, $incident_view, true); + $table->data['IR'] = $row; + $row = array(); + $row['name'] = __('Edit incidents'); + $row['input'] = html_print_checkbox ('incident_edit', 1, $incident_edit, true); + $table->data['IW'] = $row; + $row = array(); + $row['name'] = __('Manage incidents'); + $row['input'] = html_print_checkbox ('incident_management', 1, $incident_management, true); + $table->data['IM'] = $row; + + // Agents + $row = array(); + $row['name'] = __('View agents'); + $row['input'] = html_print_checkbox ('agent_view', 1, $agent_view, true); + $table->data['AR'] = $row; + $row = array(); + $row['name'] = __('Edit agents'); + $row['input'] = html_print_checkbox ('agent_edit', 1, $agent_edit, true); + $table->data['AW'] = $row; + $row = array(); + $row['name'] = __('Disable agents'); + $row['input'] = html_print_checkbox ('agent_disable', 1, $agent_disable, true); + $table->data['AD'] = $row; + + // Alerts + $row = array(); + $row['name'] = __('Edit alerts'); + $row['input'] = html_print_checkbox ('alert_edit', 1, $alert_edit, true); + $table->data['LW'] = $row; + $row = array(); + $row['name'] = __('Manage alerts'); + $row['input'] = html_print_checkbox ('alert_management', 1, $alert_management, true); + $table->data['LM'] = $row; + + // Users + $row = array(); + $row['name'] = __('Manage users'); + $row['input'] = html_print_checkbox ('user_management', 1, $user_management, true); + $table->data['UM'] = $row; + + // DB + $row = array(); + $row['name'] = __('Manage database'); + $row['input'] = html_print_checkbox ('db_management', 1, $db_management, true); + $table->data['DM'] = $row; + + // Events + $row = array(); + $row['name'] = __('View events'); + $row['input'] = html_print_checkbox ('event_view', 1, $event_view, true); + $table->data['ER'] = $row; + $row = array(); + $row['name'] = __('Edit events'); + $row['input'] = html_print_checkbox ('event_edit', 1, $event_edit, true); + $table->data['EW'] = $row; + $row = array(); + $row['name'] = __('Manage events'); + $row['input'] = html_print_checkbox ('event_management', 1, $event_management, true); + $table->data['EM'] = $row; + + // Reports + $row = array(); + $row['name'] = __('View reports'); + $row['input'] = html_print_checkbox ('report_view', 1, $report_view, true); + $table->data['RR'] = $row; + $row = array(); + $row['name'] = __('Edit reports'); + $row['input'] = html_print_checkbox ('report_edit', 1, $report_edit, true); + $table->data['RW'] = $row; + $row = array(); + $row['name'] = __('Manage reports'); + $row['input'] = html_print_checkbox ('report_management', 1, $report_management, true); + $table->data['RM'] = $row; + + // Network maps + $row = array(); + $row['name'] = __('View network maps'); + $row['input'] = html_print_checkbox ('map_view', 1, $map_view, true); + $table->data['MR'] = $row; + $row = array(); + $row['name'] = __('Edit network maps'); + $row['input'] = html_print_checkbox ('map_edit', 1, $map_edit, true); + $table->data['MW'] = $row; + $row = array(); + $row['name'] = __('Manage network maps'); + $row['input'] = html_print_checkbox ('map_management', 1, $map_management, true); + $table->data['MM'] = $row; + + // Visual console + $row = array(); + $row['name'] = __('View visual console'); + $row['input'] = html_print_checkbox ('vconsole_view', 1, $vconsole_view, true); + $table->data['VR'] = $row; + $row = array(); + $row['name'] = __('Edit visual console'); + $row['input'] = html_print_checkbox ('vconsole_edit', 1, $vconsole_edit, true); + $table->data['VW'] = $row; + $row = array(); + $row['name'] = __('Manage visual console'); + $row['input'] = html_print_checkbox ('vconsole_management', 1, $vconsole_management, true); + $table->data['VM'] = $row; + + // Pandora + $row = array(); + $row['name'] = __('Pandora management'); + $row['input'] = html_print_checkbox ('pandora_management', 1, $pandora_management, true); + $table->data['PM'] = $row; echo '
'; diff --git a/pandora_console/godmode/users/profile_list.php b/pandora_console/godmode/users/profile_list.php index ef51daee39..94f30f6b1c 100644 --- a/pandora_console/godmode/users/profile_list.php +++ b/pandora_console/godmode/users/profile_list.php @@ -103,45 +103,78 @@ if ($delete_profile) { } // Store the variables when create or update -if($create_profile || $update_profile) { +if ($create_profile || $update_profile) { $name = get_parameter ("name"); + + // Incidents $incident_view = (bool) get_parameter ("incident_view"); $incident_edit = (bool) get_parameter ("incident_edit"); $incident_management = (bool) get_parameter ("incident_management"); + + // Agents $agent_view = (bool) get_parameter ("agent_view"); $agent_edit = (bool) get_parameter ("agent_edit"); + $agent_disable = (bool) get_parameter ("agent_disable"); + + // Alerts $alert_edit = (bool) get_parameter ("alert_edit"); - $user_management = (bool) get_parameter ("user_management"); - $db_management = (bool) get_parameter ("db_management"); $alert_management = (bool) get_parameter ("alert_management"); + + // Users + $user_management = (bool) get_parameter ("user_management"); + + // DB + $db_management = (bool) get_parameter ("db_management"); + + // Pandora $pandora_management = (bool) get_parameter ("pandora_management"); - $report_view = (bool) get_parameter ("report_view"); - $report_edit = (bool) get_parameter ("report_edit"); - $report_management = (bool) get_parameter ("report_management"); + + // Events $event_view = (bool) get_parameter ("event_view"); $event_edit = (bool) get_parameter ("event_edit"); $event_management = (bool) get_parameter ("event_management"); - $agent_disable = (bool) get_parameter ("agent_disable"); + + // Reports + $report_view = (bool) get_parameter ("report_view"); + $report_edit = (bool) get_parameter ("report_edit"); + $report_management = (bool) get_parameter ("report_management"); + + // Network maps + $map_view = (bool) get_parameter ("map_view"); + $map_edit = (bool) get_parameter ("map_edit"); + $map_management = (bool) get_parameter ("map_management"); + + // Visual console + $vconsole_view = (bool) get_parameter ("vconsole_view"); + $vconsole_edit = (bool) get_parameter ("vconsole_edit"); + $vconsole_management = (bool) get_parameter ("vconsole_management"); $values = array( - 'name' => $name, - 'incident_view' => $incident_view, - 'incident_edit' => $incident_edit, - 'incident_management' => $incident_management, - 'agent_view' => $agent_view, - 'agent_edit' => $agent_edit, - 'alert_edit' => $alert_edit, - 'user_management' => $user_management, - 'db_management' => $db_management, - 'alert_management' => $alert_management, - 'pandora_management' => $pandora_management, - 'report_view' => $report_view, - 'report_edit' => $report_edit, - 'report_management' => $report_management, - 'event_view' => $event_view, - 'event_edit' => $event_edit, - 'event_management' => $event_management, - 'agent_disable' => $agent_disable); + 'name' => $name, + 'incident_view' => $incident_view, + 'incident_edit' => $incident_edit, + 'incident_management' => $incident_management, + 'agent_view' => $agent_view, + 'agent_edit' => $agent_edit, + 'agent_disable' => $agent_disable, + 'alert_edit' => $alert_edit, + 'alert_management' => $alert_management, + 'user_management' => $user_management, + 'db_management' => $db_management, + 'event_view' => $event_view, + 'event_edit' => $event_edit, + 'event_management' => $event_management, + 'report_view' => $report_view, + 'report_edit' => $report_edit, + 'report_management' => $report_management, + 'map_view' => $map_view, + 'map_edit' => $map_edit, + 'map_management' => $map_management, + 'vconsole_view' => $vconsole_view, + 'vconsole_edit' => $vconsole_edit, + 'vconsole_management' => $vconsole_management, + 'pandora_management' => $pandora_management + ); } // Update profile @@ -149,16 +182,41 @@ if ($update_profile) { if ($name) { $ret = db_process_sql_update('tperfil', $values, array('id_perfil' => $id_profile)); if ($ret !== false) { - $info = 'Name: ' . $name . ' Incident view: ' . $incident_view . - ' Incident edit: ' . $incident_edit . ' Incident management: ' . $incident_management . - ' Agent view: ' . $agent_view . ' Agent edit: ' . $agent_edit . - ' Alert edit: ' . $alert_edit . ' User management: ' . $user_management . - ' DB management: ' . $db_management . ' Alert management: ' . $alert_management . - ' Report view: ' . $report_view . ' Report edit: ' . $report_edit . - ' Report management: ' . $report_management . ' Event view: ' . $event_view . - ' Event edit: ' . $event_edit . ' Event management: ' . $event_management . - ' Agent disable: ' . $agent_disable . - ' Pandora Management: ' . $pandora_management; + $info = 'Name: ' . $name . + + ' Incident view: ' . $incident_view . + ' Incident edit: ' . $incident_edit . + ' Incident management: ' . $incident_management . + + ' Agent view: ' . $agent_view . + ' Agent edit: ' . $agent_edit . + ' Agent disable: ' . $agent_disable . + + ' Alert edit: ' . $alert_edit . + ' Alert management: ' . $alert_management . + + ' User management: ' . $user_management . + + ' DB management: ' . $db_management . + + ' Event view: ' . $event_view . + ' Event edit: ' . $event_edit . + ' Event management: ' . $event_management . + + ' Report view: ' . $report_view . + ' Report edit: ' . $report_edit . + ' Report management: ' . $report_management . + + ' Network map view: ' . $map_view . + ' Network map edit: ' . $map_edit . + ' Network map management: ' . $map_management . + + ' Visual console view: ' . $vconsole_view . + ' Visual console edit: ' . $vconsole_edit . + ' Visual console management: ' . $vconsole_management . + + ' Pandora Management: ' . $pandora_management; + db_pandora_audit("User management", "Update profile ". $name, false, false, $info); @@ -182,16 +240,41 @@ if ($create_profile) { if ($ret !== false) { ui_print_success_message(__('Successfully created')); - $info = 'Name: ' . $name . ' Incident view: ' . $incident_view . - ' Incident edit: ' . $incident_edit . ' Incident management: ' . $incident_management . - ' Agent view: ' . $agent_view . ' Agent edit: ' . $agent_edit . - ' Alert edit: ' . $alert_edit . ' User management: ' . $user_management . - ' DB management: ' . $db_management . ' Alert management: ' . $alert_management . - ' Report view: ' . $report_view . ' Report edit: ' . $report_edit . - ' Report management: ' . $report_management . ' Event view: ' . $event_view . - ' Event edit: ' . $event_edit . ' Event management: ' . $event_management . - ' Agent disable: ' . $agent_disable . - ' Pandora Management: ' . $pandora_management; + $info = 'Name: ' . $name . + + ' Incident view: ' . $incident_view . + ' Incident edit: ' . $incident_edit . + ' Incident management: ' . $incident_management . + + ' Agent view: ' . $agent_view . + ' Agent edit: ' . $agent_edit . + ' Agent disable: ' . $agent_disable . + + ' Alert edit: ' . $alert_edit . + ' Alert management: ' . $alert_management . + + ' User management: ' . $user_management . + + ' DB management: ' . $db_management . + + ' Event view: ' . $event_view . + ' Event edit: ' . $event_edit . + ' Event management: ' . $event_management . + + ' Report view: ' . $report_view . + ' Report edit: ' . $report_edit . + ' Report management: ' . $report_management . + + ' Network map view: ' . $map_view . + ' Network map edit: ' . $map_edit . + ' Network map management: ' . $map_management . + + ' Visual console view: ' . $vconsole_view . + ' Visual console edit: ' . $vconsole_edit . + ' Visual console management: ' . $vconsole_management . + + ' Pandora Management: ' . $pandora_management; + db_pandora_audit("User management", "Created profile ". $name, false, false, $info); } @@ -217,26 +300,32 @@ $table->data = array (); $table->size = array (); $table->align = array (); -$table->head[0] = __('Profiles'); +$table->head['profiles'] = __('Profiles'); -$table->head[1] = "IR" . ui_print_help_tip (__('System incidents reading'), true); -$table->head[2] = "IW" . ui_print_help_tip (__('System incidents writing'), true); -$table->head[3] = "IM" . ui_print_help_tip (__('System incidents management'), true); -$table->head[4] = "AR" . ui_print_help_tip (__('Agents reading'), true); -$table->head[5] = "AW" . ui_print_help_tip (__('Agents management'), true); -$table->head[6] = "AD" . ui_print_help_tip (__('Agents disable'), true); -$table->head[7] = "LW" . ui_print_help_tip (__('Alerts editing'), true); -$table->head[8] = "UM" . ui_print_help_tip (__('Users management'), true); -$table->head[9] = "DM" . ui_print_help_tip (__('Database management'), true); -$table->head[10] = "LM" . ui_print_help_tip (__('Alerts management'), true); -$table->head[11] = "RR" . ui_print_help_tip (__('Reports reading'), true); -$table->head[12] = "RW" . ui_print_help_tip (__('Reports writing'), true); -$table->head[13] = "RM" . ui_print_help_tip (__('Reports management'), true); -$table->head[14] = "ER" . ui_print_help_tip (__('Events reading'), true); -$table->head[15] = "EW" . ui_print_help_tip (__('Events writing'), true); -$table->head[16] = "EM" . ui_print_help_tip (__('Events management'), true); -$table->head[17] = "PM" . ui_print_help_tip (__('Systems management'), true); -$table->head[18] = '' . __('Op.') . ''; +$table->head['IR'] = "IR" . ui_print_help_tip (__('System incidents reading'), true); +$table->head['IW'] = "IW" . ui_print_help_tip (__('System incidents writing'), true); +$table->head['IM'] = "IM" . ui_print_help_tip (__('System incidents management'), true); +$table->head['AR'] = "AR" . ui_print_help_tip (__('Agents reading'), true); +$table->head['AW'] = "AW" . ui_print_help_tip (__('Agents management'), true); +$table->head['AD'] = "AD" . ui_print_help_tip (__('Agents disable'), true); +$table->head['LW'] = "LW" . ui_print_help_tip (__('Alerts editing'), true); +$table->head['LM'] = "LM" . ui_print_help_tip (__('Alerts management'), true); +$table->head['UM'] = "UM" . ui_print_help_tip (__('Users management'), true); +$table->head['DM'] = "DM" . ui_print_help_tip (__('Database management'), true); +$table->head['ER'] = "ER" . ui_print_help_tip (__('Events reading'), true); +$table->head['EW'] = "EW" . ui_print_help_tip (__('Events writing'), true); +$table->head['EM'] = "EM" . ui_print_help_tip (__('Events management'), true); +$table->head['RR'] = "RR" . ui_print_help_tip (__('Reports reading'), true); +$table->head['RW'] = "RW" . ui_print_help_tip (__('Reports writing'), true); +$table->head['RM'] = "RM" . ui_print_help_tip (__('Reports management'), true); +$table->head['MR'] = "MR" . ui_print_help_tip (__('Network maps reading'), true); +$table->head['MW'] = "MW" . ui_print_help_tip (__('Network maps writing'), true); +$table->head['MM'] = "MM" . ui_print_help_tip (__('Network maps management'), true); +$table->head['VR'] = "VR" . ui_print_help_tip (__('Visual console reading'), true); +$table->head['VW'] = "VW" . ui_print_help_tip (__('Visual console writing'), true); +$table->head['VM'] = "VM" . ui_print_help_tip (__('Visual console management'), true); +$table->head['PM'] = "PM" . ui_print_help_tip (__('Systems management'), true); +$table->head['operations'] = '' . __('Op.') . ''; $table->align = array_fill (1, 11, "center"); $table->size = array_fill (1, 10, 40); @@ -249,26 +338,32 @@ if ($profiles === false) { $img = html_print_image ("images/ok.png", true, array ("border" => 0)); foreach ($profiles as $profile) { - $data[0] = ''.$profile["name"].''; - $data[1] = ($profile["incident_view"] ? $img : ''); - $data[2] = ($profile["incident_edit"] ? $img : ''); - $data[3] = ($profile["incident_management"] ? $img : ''); - $data[4] = ($profile["agent_view"] ? $img : ''); - $data[5] = ($profile["agent_edit"] ? $img : ''); - $data[6] = ($profile["agent_disable"] ? $img : ''); - $data[7] = ($profile["alert_edit"] ? $img : ''); - $data[8] = ($profile["user_management"] ? $img : ''); - $data[9] = ($profile["db_management"] ? $img : ''); - $data[10] = ($profile["alert_management"] ? $img : ''); - $data[11] = ($profile["report_view"] ? $img : ''); - $data[12] = ($profile["report_edit"] ? $img : ''); - $data[13] = ($profile["report_management"] ? $img : ''); - $data[14] = ($profile["event_view"] ? $img : ''); - $data[15] = ($profile["event_edit"] ? $img : ''); - $data[16] = ($profile["event_management"] ? $img : ''); - $data[17] = ($profile["pandora_management"] ? $img : ''); - $data[18] = ''. html_print_image('images/config.png', true, array('title' => __('Edit'))) .''; - $data[18] .= '  '. html_print_image("images/cross.png", true) . ''; + $data['profiles'] = ''.$profile["name"].''; + $data['IR'] = ($profile["incident_view"] ? $img : ''); + $data['IW'] = ($profile["incident_edit"] ? $img : ''); + $data['IM'] = ($profile["incident_management"] ? $img : ''); + $data['AR'] = ($profile["agent_view"] ? $img : ''); + $data['AW'] = ($profile["agent_edit"] ? $img : ''); + $data['AD'] = ($profile["agent_disable"] ? $img : ''); + $data['LW'] = ($profile["alert_edit"] ? $img : ''); + $data['LM'] = ($profile["alert_management"] ? $img : ''); + $data['UM'] = ($profile["user_management"] ? $img : ''); + $data['DM'] = ($profile["db_management"] ? $img : ''); + $data['ER'] = ($profile["event_view"] ? $img : ''); + $data['EW'] = ($profile["event_edit"] ? $img : ''); + $data['EM'] = ($profile["event_management"] ? $img : ''); + $data['RR'] = ($profile["report_view"] ? $img : ''); + $data['RW'] = ($profile["report_edit"] ? $img : ''); + $data['RM'] = ($profile["report_management"] ? $img : ''); + $data['MR'] = ($profile["map_view"] ? $img : ''); + $data['MW'] = ($profile["map_edit"] ? $img : ''); + $data['MM'] = ($profile["map_management"] ? $img : ''); + $data['VR'] = ($profile["vconsole_view"] ? $img : ''); + $data['VW'] = ($profile["vconsole_edit"] ? $img : ''); + $data['VM'] = ($profile["vconsole_management"] ? $img : ''); + $data['PM'] = ($profile["pandora_management"] ? $img : ''); + $data['operations'] = ''. html_print_image('images/config.png', true, array('title' => __('Edit'))) .''; + $data['operations'] .= '  '. html_print_image("images/cross.png", true) . ''; array_push ($table->data, $data); } From f005b00eb64d715ee6eca5d1ac795a56a1be068c Mon Sep 17 00:00:00 2001 From: hkosaka Date: Tue, 7 Apr 2015 13:08:50 +0900 Subject: [PATCH 07/11] Use -C to invoke tentacle_server when using SSL proxy mode (see also e8e59f3e3e98). --- pandora_agents/unix/pandora_agent | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index a929d9d46c..c0421a3004 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -975,6 +975,8 @@ sub launch_tentacle_proxy () { #Execute tentacle server as a daemon my $new_process = "tentacle_server -b ".$Conf{'server_ip'}." -g ".$Conf{'server_port'}." -c ".$Conf{'proxy_max_connection'}." -t ".$Conf{'proxy_timeout'}; + $new_process .= ' -C' if ($Conf{'server_ssl'} eq 'yes'); + log_message ('setup', 'Proxy mode enabled'); exec ($new_process); } From 5be63acffca3aaee911790d17690cd885d82d295 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Tue, 7 Apr 2015 16:26:20 +0200 Subject: [PATCH 08/11] Fixed html title when click graph in meta and nodo in status monitor, tiquet: #2077 --- pandora_console/operation/agentes/stat_win.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 9494b138c4..05f1c4dece 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -55,9 +55,10 @@ if (file_exists ('../../include/languages/'.$user_language.'.mo')) { } echo ''; - +$label = str_replace('%3D', '=', get_parameter('label', '')); +$label = base64_decode($label); $id = get_parameter('id'); -$label = base64_decode(get_parameter('label', '')); +//$label = rawurldecode(urldecode(base64_decode(get_parameter('label', '')))); ?> From f9936267e002e4fe8b50d7e9c9138d4709fdd458 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 7 Apr 2015 17:11:04 +0200 Subject: [PATCH 09/11] Fixed the separator (sometimes it is other) in the ajax call get_agent_modules_json_for_multiple_agents. (cherry picked from commit 6f71a01b0c4cabdb14e2953239b1330c12f5ec26) --- pandora_console/operation/agentes/ver_agente.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index b2e251dd8f..6f143e1bc1 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -246,7 +246,12 @@ if (is_ajax ()) { foreach ($idAgents as $idA) { if (empty($metaconsole_server_name)) { - $row = explode ('|', $idA); + if (strstr($idA, "|@_@|")) { + $row = explode ('|@_@|', $idA); + } + else { + $row = explode ('|', $idA); + } $server_name = $row[0]; $id_agent = $row [1]; } From da36f04a1ad6881e9170d25b0917356ea6d2d6a3 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 8 Apr 2015 00:01:10 +0200 Subject: [PATCH 10/11] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_console/pandoradb_data.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 7ea6c6a468..1460b50e3f 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0dev-150406 +Version: 6.0dev-150408 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 2668a6549e..5e6b09af11 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="6.0dev-150406" +pandora_version="6.0dev-150408" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index c0421a3004..66c3672fc0 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0dev'; -use constant AGENT_BUILD => '150406'; +use constant AGENT_BUILD => '150408'; # Commands to retrieve total memory information in kB use constant TOTALMEMORY_CMDS => { diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 3ce75006e2..2f7f2d4e33 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 6.0dev -%define release 150406 +%define release 150408 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index ff7d533bcb..95b7ed9308 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 6.0dev -%define release 150406 +%define release 150408 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 40c44ec39c..34d5b263d5 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{150406} +{150408} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 53235936bf..8f0ea58cd4 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("6.0dev(Build 150406)") +#define PANDORA_VERSION ("6.0dev(Build 150408)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 772c338377..e365c7e41b 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(6.0dev(Build 150406))" + VALUE "ProductVersion", "(6.0dev(Build 150408))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index f09a2fa329..fa85eec958 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0dev-150406 +Version: 6.0dev-150408 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 2578f7755b..a33b8a651b 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="6.0dev-150406" +pandora_version="6.0dev-150408" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 1ceaff3c3a..6c4302acac 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC150406'; +$build_version = 'PC150408'; $pandora_version = 'v6.0dev'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 5ac0639d2e..576bafa132 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -63,7 +63,7 @@
Date: Wed, 8 Apr 2015 09:31:45 +0200 Subject: [PATCH 11/11] if user is strict user only see option all in select servers in filter eventlist, tiquet: #2074 --- pandora_console/operation/events/events_list.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 64ad196346..b049083d92 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -472,9 +472,13 @@ if (!$meta) { } else { $data[1] = __('Server') . $jump; - $data[1] .= html_print_select_from_sql( - 'SELECT id, server_name FROM tmetaconsole_setup', - 'server_id', $server_id, 'script', __('All'), '0', true); + if ($strict_user) + $data[1] .= html_print_select('','server_id', + $server_id, 'script', __('All'), '0', true); + else + $data[1] .= html_print_select_from_sql( + 'SELECT id, server_name FROM tmetaconsole_setup', + 'server_id', $server_id, 'script', __('All'), '0', true); } $table_advanced->data[] = $data;