tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

2012-08-20 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* index.php, extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
	general/login_page.php, general/logon_failed.php,
	godmode/users/configure_user.php, include/api.php,
	include/auth/mysql.php, pandoradb.sql, pandoradb.postgreSQL.sql,
	pandoradb.oracle.sql: added the feature to set any user with
	"not login" for only the user can work across the API.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6891 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-08-20 18:06:04 +00:00
parent e77e723b12
commit 2bf6062ea2
13 changed files with 683 additions and 590 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -1,3 +1,14 @@
2012-08-20 Miguel de Dios <miguel.dedios@artica.es>
* index.php, extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
general/login_page.php, general/logon_failed.php,
godmode/users/configure_user.php, include/api.php,
include/auth/mysql.php, pandoradb.sql, pandoradb.postgreSQL.sql,
pandoradb.oracle.sql: added the feature to set any user with
"not login" for only the user can work across the API.
2012-08-20 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/configurar_agente.php: Add enterprise tab

59
pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
View File

@ -1,7 +1,6 @@
-- -----------------------------------------------------
-- Table `tnetflow_filter`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tnetflow_filter` (
`id_sg` int(10) unsigned NOT NULL auto_increment,
`id_name` varchar(600) NOT NULL default '0',
@ -20,7 +19,6 @@ PRIMARY KEY (`id_sg`)
-- -----------------------------------------------------
-- Table `tnetflow_report`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tnetflow_report` (
`id_report` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
`id_name` varchar(150) NOT NULL default '',
@ -32,7 +30,6 @@ PRIMARY KEY(`id_report`)
-- -----------------------------------------------------
-- Table `tnetflow_report_content`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tnetflow_report_content` (
`id_rc` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
`id_report` INTEGER UNSIGNED NOT NULL default 0,
@ -49,30 +46,19 @@ CREATE TABLE IF NOT EXISTS `tnetflow_report_content` (
ON DELETE CASCADE
) ENGINE = InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
ALTER TABLE `tusuario` ADD COLUMN `disabled` int(4) NOT NULL DEFAULT 0;
ALTER TABLE `tusuario` ADD COLUMN `shortcut` tinyint(1) DEFAULT 0;
ALTER TABLE tusuario ADD COLUMN `shortcut_data` text;
-- -----------------------------------------------------
-- Table `tincidencia`
-- -----------------------------------------------------
ALTER TABLE `tincidencia` ADD COLUMN `id_agent` int(10) unsigned NULL default 0;
-- -----------------------------------------------------
-- Table `tagente`
-- -----------------------------------------------------
ALTER TABLE `tagente` ADD COLUMN `url_address` mediumtext NULL;
-- -----------------------------------------------------
-- Table `talert_special_days`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `talert_special_days` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`date` date NOT NULL DEFAULT '0000-00-00',
@ -84,7 +70,6 @@ CREATE TABLE IF NOT EXISTS `talert_special_days` (
-- -----------------------------------------------------
-- Table `talert_templates`
-- -----------------------------------------------------
ALTER TABLE `talert_templates` ADD COLUMN `special_day` tinyint(1) DEFAULT '0';
-- -----------------------------------------------------
@ -100,7 +85,6 @@ ON DELETE CASCADE;
-- -----------------------------------------------------
-- Table `tevento`
-- -----------------------------------------------------
ALTER TABLE `tevento` ADD COLUMN (`source` tinytext NOT NULL,
`id_extra` tinytext NOT NULL);
@ -131,7 +115,6 @@ ALTER TABLE tgraph_source MODIFY weight FLOAT(5,3) NOT NULL DEFAULT '0.000';
-- -----------------------------------------------------
-- Table `tevent_filter`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tevent_filter` (
`id_filter` int(10) unsigned NOT NULL auto_increment,
`id_group_filter` int(10) NOT NULL default 0,
@ -180,7 +163,6 @@ ALTER TABLE `tgraph` ADD COLUMN `id_graph_template` int(11) NOT NULL DEFAULT 0;
-- Table `ttipo_modulo`
-- -----------------------------------------------------
UPDATE ttipo_modulo SET descripcion='Generic data' WHERE id_tipo=1;
UPDATE ttipo_modulo SET descripcion='Generic data incremental' WHERE id_tipo=4;
-- -----------------------------------------------------
@ -189,6 +171,16 @@ UPDATE ttipo_modulo SET descripcion='Generic data incremental' WHERE id_tipo=4;
ALTER TABLE `tusuario` ADD COLUMN `section` TEXT NOT NULL;
INSERT INTO `tusuario` (`section`) VALUES ('Default');
ALTER TABLE `tusuario` ADD COLUMN `data_section` TEXT NOT NULL;
ALTER TABLE `tusuario` ADD COLUMN `disabled` int(4) NOT NULL DEFAULT 0;
ALTER TABLE `tusuario` ADD COLUMN `shortcut` tinyint(1) DEFAULT 0;
ALTER TABLE `tusuario` ADD COLUMN `shortcut_data` text;
ALTER TABLE `tusuario` ADD COLUMN `not_login` tinyint(1) unsigned NOT NULL DEFAULT 0;
ALTER TABLE `tusuario` ADD COLUMN `force_change_pass` tinyint(1) DEFAULT 0;
ALTER TABLE `tusuario` ADD COLUMN `last_pass_change` DATETIME NOT NULL DEFAULT 0;
ALTER TABLE `tusuario` ADD COLUMN `last_failed_login` DATETIME NOT NULL DEFAULT 0;
ALTER TABLE `tusuario` ADD COLUMN `failed_attempt` int(4) NOT NULL DEFAULT 0;
ALTER TABLE `tusuario` ADD COLUMN `login_blocked` tinyint(1) DEFAULT 0;
ALTER TABLE `tusuario` ADD COLUMN `metaconsole_access` enum('basic','advanced','custom','all','only_console') DEFAULT 'only_console';
-- -----------------------------------------------------
-- Table `treport_content_item`
@ -203,29 +195,16 @@ ALTER TABLE `tmensajes` MODIFY COLUMN `mensaje` TEXT NOT NULL;
-- -----------------------------------------------------
-- Table `talert_compound`
-- -----------------------------------------------------
ALTER TABLE `talert_compound` ADD COLUMN `special_day` tinyint(1) DEFAULT '0';
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
ALTER TABLE `tusuario` ADD COLUMN `force_change_pass` tinyint(1) DEFAULT 0;
ALTER TABLE `tusuario` ADD COLUMN `last_pass_change` DATETIME NOT NULL DEFAULT 0;
ALTER TABLE `tusuario` ADD COLUMN `last_failed_login` DATETIME NOT NULL DEFAULT 0;
ALTER TABLE `tusuario` ADD COLUMN `failed_attempt` int(4) NOT NULL DEFAULT 0;
ALTER TABLE `tusuario` ADD COLUMN `login_blocked` tinyint(1) DEFAULT 0;
-- -----------------------------------------------------
-- Table `talert_commands`
-- -----------------------------------------------------
INSERT INTO `talert_commands` (`name`, `command`, `description`, `internal`) VALUES ('Validate Event','Internal type','This alert validate the events matched with a module given the agent name (_field1_) and module name (_field2_)', 1);
-- -----------------------------------------------------
-- Table `tconfig`
-- -----------------------------------------------------
INSERT INTO `tconfig` (`token`, `value`) VALUES
('enable_pass_policy', 0),
('pass_size', 4),
@ -261,7 +240,6 @@ WHERE `token`= 'prominent_time';
-- -----------------------------------------------------
-- Table `tnetwork_component`
-- -----------------------------------------------------
ALTER TABLE tnetwork_component ADD `wizard_level` enum('basic','advanced','custom','nowizard') default 'nowizard';
ALTER TABLE tnetwork_component ADD `only_metaconsole` tinyint(1) unsigned default '0';
ALTER TABLE tnetwork_component ADD `macros` text;
@ -269,27 +247,18 @@ ALTER TABLE tnetwork_component ADD `macros` text;
-- -----------------------------------------------------
-- Table `tagente_modulo`
-- -----------------------------------------------------
ALTER TABLE tagente_modulo ADD `wizard_level` enum('basic','advanced','custom','nowizard') default 'nowizard';
ALTER TABLE tagente_modulo ADD `macros` text;
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
ALTER TABLE tusuario ADD `metaconsole_access` enum('basic','advanced','custom','all','only_console') default 'only_console';
-- -----------------------------------------------------
-- Table `tplugin`
-- -----------------------------------------------------
ALTER TABLE tplugin ADD `macros` text;
ALTER TABLE tplugin ADD `parameters` text;
-- -----------------------------------------------------
-- Table `trecon_script`
-- -----------------------------------------------------
UPDATE trecon_script SET `description`='This&#x20;script&#x20;is&#x20;used&#x20;to&#x20;automatically&#x20;detect&#x20;SNMP&#x20;Interfaces&#x20;on&#x20;devices,&#x20;used&#x20;as&#x20;Recon&#x20;Custom&#x20;Script&#x20;in&#x20;the&#x20;recon&#x20;task.&#x20;Parameters&#x20;used&#x20;are:&#x0d;&#x0a;&#x0d;&#x0a;*&#x20;custom_field1&#x20;=&#x20;network.&#x20;i.e.:&#x20;192.168.100.0/24&#x0d;&#x0a;*&#x20;custom_field2&#x20;=&#x20;several&#x20;communities&#x20;separated&#x20;by&#x20;comma.&#x20;For&#x20;example:&#x20;snmp_community,public,private&#x20;&#x0d;&#x0a;*&#x20;custom_field3&#x20;=&#x20;optative&#x20;parameter&#x20;to&#x20;force&#x20;process&#x20;downed&#x20;interfaces&#x20;&#40;use:&#x20;&#039;-a&#039;&#41;.&#x20;Only&#x20;up&#x20;interfaces&#x20;are&#x20;processed&#x20;by&#x20;default&#x20;&#x0d;&#x0a;&#x0d;&#x0a;See&#x20;documentation&#x20;for&#x20;more&#x20;information.'
WHERE id_recon_script = 1;
@ -298,11 +267,3 @@ WHERE id_recon_script=1;
-- -----------------------------------------------------
ALTER TABLE trecon_task MODIFY subnet TEXT NOT NULL DEFAULT '';
ALTER TABLE trecon_task MODIFY field1 TEXT NOT NULL DEFAULT '';
ALTER TABLE tagente_modulo ADD `critical_instructions` text;
ALTER TABLE tagente_modulo ADD `warning_instructions` text;
ALTER TABLE tagente_modulo ADD `unknown_instructions` text;

59
pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
View File

@ -1,14 +1,26 @@
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
alter table tusuario add (disabled NUMBER(10,0) default 0 NOT NULL);
alter table tusuario add (shortcut NUMBER(5, 0) DEFAULT 0);
ALTER TABLE tusuario ADD COLUMN (disabled NUMBER(10,0) DEFAULT 0 NOT NULL);
ALTER TABLE tusuario ADD COLUMN (shortcut NUMBER(5, 0) DEFAULT 0);
ALTER TABLE tusuario ADD COLUMN (force_change_pass NUMBER(5,0) DEFAULT 0 NOT NULL);
ALTER TABLE tusuario ADD COLUMN (last_pass_change TIMESTAMP DEFAULT 0);
ALTER TABLE tusuario ADD COLUMN (last_failed_login TIMESTAMP DEFAULT 0);
ALTER TABLE tusuario ADD COLUMN (failed_attempt NUMBER(5,0) DEFAULT 0 NOT NULL);
ALTER TABLE tusuario ADD COLUMN (login_blocked NUMBER(5,0) DEFAULT 0 NOT NULL);
ALTER TABLE tusuario ADD COLUMN disabled NUMBER(10, 0) NOT NULL DEFAULT 0;
ALTER TABLE tusuario ADD COLUMN shortcut NUMBER(5, 0) DEFAULT 0;
ALTER TABLE tusuario ADD COLUMN shortcut_data CLOB DEFAULT '';
ALTER TABLE tusuario ADD (section VARCHAR2(255) NOT NULL);
INSERT INTO tusuario (section) VALUES ('Default');
ALTER TABLE tusuario ADD COLUMN (data_section VARCHAR2(255) NOT NULL);
ALTER TABLE tusuario ADD COLUMN (metaconsole_access VARCHAR2(100) DEFAULT 'only_console' NOT NULL);
ALTER TABLE tusuario ADD CONSTRAINT t_usuario_metaconsole_access_cons CHECK (metaconsole_access IN ('basic','advanced','custom','all','only_console'));
ALTER TABLE tusuario ADD COLUMN (not_login NUMBER(5,0) default 0 NOT NULL);
-- -----------------------------------------------------
-- Table "tnetflow_filter"
-- -----------------------------------------------------
CREATE TABLE tnetflow_filter (
id_sg NUMBER(10, 0) NOT NULL PRIMARY KEY,
id_name VARCHAR2(600) NOT NULL,
@ -22,28 +34,24 @@ filter_args CLOB NOT NULL,
aggregate VARCHAR2(60),
output VARCHAR2(60)
);
CREATE SEQUENCE tnetflow_filter_s INCREMENT BY 1 START WITH 1;
CREATE OR REPLACE TRIGGER tnetflow_filter_inc BEFORE INSERT ON tnetflow_filter REFERENCING NEW AS NEW FOR EACH ROW BEGIN SELECT tnetflow_filter_s.nextval INTO :NEW.ID_SG FROM dual; END tnetflow_filter_inc;;
-- -----------------------------------------------------
-- Table "tnetflow_report"
-- -----------------------------------------------------
CREATE TABLE tnetflow_report (
id_report NUMBER(10, 0) NOT NULL PRIMARY KEY,
id_name VARCHAR2(100) NOT NULL,
description CLOB default '',
id_group NUMBER(10, 0)
);
CREATE SEQUENCE tnetflow_report_s INCREMENT BY 1 START WITH 1;
CREATE OR REPLACE TRIGGER tnetflow_report_inc BEFORE INSERT ON tnetflow_report REFERENCING NEW AS NEW FOR EACH ROW BEGIN SELECT tnetflow_report_s.nextval INTO :NEW.ID_REPORT FROM dual; END tnetflow_report_inc;;
-- -----------------------------------------------------
-- Table "tnetflow_report_content"
-- -----------------------------------------------------
CREATE TABLE tnetflow_report_content (
id_rc NUMBER(10, 0) NOT NULL PRIMARY KEY,
id_report NUMBER(10, 0) NOT NULL REFERENCES tnetflow_report(id_report) ON DELETE CASCADE,
@ -54,14 +62,12 @@ max NUMBER(11, 0) default 0 NOT NULL,
show_graph VARCHAR2(60),
"order" NUMBER(11,0) default 0 NOT NULL
);
CREATE SEQUENCE tnetflow_report_content_s INCREMENT BY 1 START WITH 1;
CREATE OR REPLACE TRIGGER tnetflow_report_content_inc BEFORE INSERT ON tnetflow_report_content REFERENCING NEW AS NEW FOR EACH ROW BEGIN SELECT tnetflow_report_content_s.nextval INTO :NEW.ID_RC FROM dual; END tnetflow_report_content_inc;;
-- -----------------------------------------------------
-- Table `tincidencia`
-- -----------------------------------------------------
alter table tincidencia add (id_agent NUMBER(10,0) default 0 NULL);
-- -----------------------------------------------------
@ -72,7 +78,6 @@ alter table tagente add (url_address CLOB default '' NULL);
-- -----------------------------------------------------
-- Table `talert_special_days`
-- -----------------------------------------------------
CREATE TABLE talert_special_days (
id NUMBER(10,0) NOT NULL PRIMARY KEY,
date DATE default '0000-00-00' NOT NULL,
@ -87,7 +92,6 @@ CREATE OR REPLACE TRIGGER talert_special_days_inc BEFORE INSERT ON talert_specia
-- -----------------------------------------------------
-- Table `talert_templates`
-- -----------------------------------------------------
alter table talert_templates add (special_day NUMBER(5,0) default 0);
-- -----------------------------------------------------
@ -171,20 +175,6 @@ ALTER TABLE tgraph ADD (id_graph_template NUMBER(11, 0) default 0 NOT NULL);
UPDATE ttipo_modulo SET descripcion='Generic data' WHERE id_tipo=1;
UPDATE ttipo_modulo SET descripcion='Generic data incremental' WHERE id_tipo=4;
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
ALTER TABLE tusuario ADD COLUMN disabled NUMBER(10, 0) NOT NULL DEFAULT 0;
ALTER TABLE tusuario ADD COLUMN shortcut NUMBER(5, 0) DEFAULT 0;
ALTER TABLE tusuario ADD COLUMN shortcut_data CLOB default '';
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
ALTER TABLE tusuario ADD (section VARCHAR2(255) NOT NULL);
INSERT INTO tusuario (section) VALUES ('Default');
ALTER TABLE tusuario ADD (data_section VARCHAR2(255) NOT NULL);
-- -----------------------------------------------------
-- Table `treport_content_item`
-- -----------------------------------------------------
@ -207,16 +197,6 @@ alter table talert_compound add (special_day NUMBER(5,0) default 0);
ALTER TABLE tnetwork_component ADD COLUMN unit CLOB default '';
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
alter table tusuario add (force_change_pass NUMBER(5,0) default 0 NOT NULL);
alter table tusuario add (last_pass_change TIMESTAMP default 0);
alter table tusuario add (last_failed_login TIMESTAMP default 0);
alter table tusuario add (failed_attempt NUMBER(5,0) default 0 NOT NULL);
alter table tusuario add (login_blocked NUMBER(5,0) default 0 NOT NULL);
-- -----------------------------------------------------
-- Table `talert_commands`
-- -----------------------------------------------------
@ -276,13 +256,6 @@ ALTER TABLE tagente_modulo ADD (wizard_level VARCHAR2(100) default 'nowizard' NO
ALTER TABLE tagente_modulo ADD CONSTRAINT t_agente_modulo_wizard_level_cons CHECK (wizard_level IN ('basic','advanced','custom','nowizard'));
ALTER TABLE tagente_modulo ADD (macros CLOB default '');
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
ALTER TABLE tusuario ADD (metaconsole_access VARCHAR2(100) default 'only_console' NOT NULL);
ALTER TABLE tusuario ADD CONSTRAINT t_usuario_metaconsole_access_cons CHECK (metaconsole_access IN ('basic','advanced','custom','all','only_console'));
-- -----------------------------------------------------
-- Table `tplugin`
-- -----------------------------------------------------

45
pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
View File

@ -1,9 +1,22 @@
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
ALTER TABLE "tusuario" ADD COLUMN "disabled" INTEGER NOT NULL DEFAULT 0;
ALTER TABLE "tusuario" ADD COLUMN "shortcut" SMALLINT DEFAULT 0;
ALTER TABLE "tusuario" ADD COLUMN "disabled" INTEGER NOT NULL DEFAULT 0;
ALTER TABLE "tusuario" ADD COLUMN "shortcut" SMALLINT DEFAULT 0;
ALTER TABLE "tusuario" ADD COLUMN "shortcut_data" text DEFAULT '';
ALTER TABLE "tusuario" ADD COLUMN "section" varchar(255) NOT NULL DEFAULT '';
INSERT INTO "tusuario" ("section") VALUES ("Default");
ALTER TABLE "tusuario" ADD COLUMN "data_section" varchar(255) NOT NULL DEFAULT '';
ALTER TABLE "tusuario" ADD COLUMN "force_change_pass" SMALLINT NOT NULL DEFAULT 0;
ALTER TABLE "tusuario" ADD COLUMN "last_pass_change" BIGINT NOT NULL DEFAULT 0;
ALTER TABLE "tusuario" ADD COLUMN "last_failed_login" BIGINT NOT NULL DEFAULT 0;
ALTER TABLE "tusuario" ADD COLUMN "failed_attempt" INTEGER NOT NULL DEFAULT 0;
ALTER TABLE "tusuario" ADD COLUMN "login_blocked" SMALLINT NOT NULL DEFAULT 0;
CREATE TYPE type_tusuario_metaconsole_access AS ENUM ('basic','advanced','custom','all','only_console');
ALTER TABLE "tusuario" ADD COLUMN "metaconsole_access" type_tusuario_metaconsole_access DEFAULT 'only_console';
ALTER TABLE "tusuario" ADD COLUMN "not_login" SMALLINT NOT NULL default 0;
-- -----------------------------------------------------
-- Table `tnetflow_filter`
@ -163,20 +176,6 @@ ALTER TABLE "tgraph" ADD COLUMN "id_graph_template" INTEGER NOT NULL default 0;
UPDATE "ttipo_modulo" SET "descripcion"='Generic data' WHERE "id_tipo"=1;
UPDATE "ttipo_modulo" SET "descripcion"='Generic data incremental' WHERE "id_tipo"=4;
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
ALTER TABLE "tusuario" ADD COLUMN "disabled" INTEGER NOT NULL DEFAULT 0;
ALTER TABLE "tusuario" ADD COLUMN "shortcut" SMALLINT DEFAULT 0;
ALTER TABLE "tusuario" ADD COLUMN "shortcut_data" text default '';
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
ALTER TABLE "tusuario" ADD COLUMN "section" varchar(255) NOT NULL DEFAULT '';
INSERT INTO "tusuario" ("section") VALUES ("Default");
ALTER TABLE "tusuario" ADD COLUMN "data_section" varchar(255) NOT NULL DEFAULT '';
-- -----------------------------------------------------
-- Table `treport_content_item`
-- -----------------------------------------------------
@ -199,16 +198,6 @@ ALTER TABLE "talert_compound" ADD COLUMN "special_day" SMALLINT default 0;
ALTER TABLE "tnetwork_component" ADD COLUMN "unit" text default '';
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
ALTER TABLE "tusuario" ADD COLUMN "force_change_pass" SMALLINT NOT NULL default 0;
ALTER TABLE "tusuario" ADD COLUMN "last_pass_change" BIGINT NOT NULL default 0;
ALTER TABLE "tusuario" ADD COLUMN "last_failed_login" BIGINT NOT NULL default 0;
ALTER TABLE "tusuario" ADD COLUMN "failed_attempt" INTEGER NOT NULL DEFAULT 0;
ALTER TABLE "tusuario" ADD COLUMN "login_blocked" SMALLINT NOT NULL default 0;
-- -----------------------------------------------------
-- Table `talert_commands`
-- -----------------------------------------------------
@ -267,12 +256,6 @@ CREATE TYPE type_tagente_modulo_wizard_level AS ENUM ('basic','advanced','custom
ALTER TABLE "tagente_modulo" ADD COLUMN "wizard_level" type_tagente_modulo_wizard_level default 'nowizard';
ALTER TABLE "tagente_modulo" ADD COLUMN "macros" TEXT default '';
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
CREATE TYPE type_tusuario_metaconsole_access AS ENUM ('basic','advanced','custom','all','only_console');
ALTER TABLE "tusuario" ADD COLUMN "metaconsole_access" type_tusuario_metaconsole_access default 'only_console';
-- -----------------------------------------------------
-- Table `tplugin`
-- -----------------------------------------------------

1
pandora_console/general/login_page.php
View File

@ -82,7 +82,6 @@ echo '<div id="ver_num">' . $pandora_version.(($develop_bypass == 1) ? ' '.__('B
if (isset ($login_failed)) {
echo '<div id="login_failed" title="Login failed" style="">';
echo '<div style="position:absolute; top:0px; text-align: center; left:0%; right:0%; height:100px; width:330px; margin: 0 auto; ">';

7
pandora_console/godmode/users/configure_user.php
View File

@ -100,6 +100,7 @@ if ($new_user && $config['admin_can_add_user']) {
$user_info['comments'] = '';
$user_info['is_admin'] = 0;
$user_info['language'] = 'default';
$user_info["not_login"] = false;
if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
$user_info['id_skin'] = '';
}
@ -137,6 +138,7 @@ if ($create_user) {
$values['last_pass_change'] = date ("Y/m/d H:i:s", get_system_time());
$values['metaconsole_access'] = get_parameter ('metaconsole_access');
}
$values["not_login"] = (bool)get_parameter ('not_login', false);
if ($id == '') {
ui_print_error_message (__('User ID cannot be empty'));
@ -230,6 +232,7 @@ if ($update_user) {
if(enterprise_installed()) {
$values['metaconsole_access'] = get_parameter ('metaconsole_access');
}
$values["not_login"] = (bool)get_parameter ('not_login', false);
$res1 = update_user ($id, $values);
@ -443,6 +446,10 @@ if (enterprise_installed()) {
'','',-1,true, false, false);
}
$table->data[13][0] = __('Not Login');
$table->data[13][0] .= ui_print_help_tip(__('The user with not login set only can access to API.'), true);
$table->data[13][1] = html_print_checkbox('not_login', 1, $user_info["not_login"], true);
echo '<form method="post" autocomplete="off">';
html_print_table ($table);

2
pandora_console/include/api.php
View File

@ -50,7 +50,7 @@ $no_login_msg = "";
if (isInACL($ipOrigin)) {
if(empty($apiPassword) || (!empty($apiPassword) && $api_password === $apiPassword)) {
$user_in_db = process_user_login($user, $password);
$user_in_db = process_user_login($user, $password, true);
if ($user_in_db !== false) {
$config['id_user'] = $user_in_db;
$correctLogin = true;

85
pandora_console/include/auth/mysql.php
View File

@ -41,11 +41,13 @@ if (!isset ($config)) {
<div id="login_f">
<h1 id="log_f" class="error">You cannot access this file</h1>
<div>
<img src="../../images/pandora_logo.png" border="0"></a>
<img src="../../images/pandora_logo.png" border="0" />
</div>
<div class="msg">
<span class="error"><b>ERROR:</b>
You can\'t access this file directly!</span>
<span class="error">
<b>ERROR:</b> You can\'t access this file directly!
</span>
</div>
</div>
</div>
</div>
@ -69,10 +71,11 @@ $config["admin_can_make_admin"] = true;
*
* @param string $login
* @param string $pass
* @param boolean $api
*
* @return mixed False in case of error or invalid credentials, the username in case it's correct.
*/
function process_user_login ($login, $pass) {
function process_user_login ($login, $pass, $api = false) {
global $config, $mysql_cache;
// Always authenticate admins against the local database
@ -80,19 +83,32 @@ function process_user_login ($login, $pass) {
// Connect to Database
switch ($config["dbtype"]) {
case "mysql":
$sql = sprintf ("SELECT `id_user`, `password` FROM `tusuario` WHERE `id_user` = '%s' AND `disabled` = 0", $login);
$sql = sprintf ("SELECT `id_user`, `password`
FROM `tusuario`
WHERE `id_user` = '%s' AND `not_login` = " .
((int)$api) . "
AND `disabled` = 0", $login);
break;
case "postgresql":
$sql = sprintf ('SELECT "id_user", "password" FROM "tusuario" WHERE "id_user" = \'%s\' AND "disabled" = 0', $login);
$sql = sprintf ('SELECT "id_user", "password"
FROM "tusuario"
WHERE "id_user" = \'%s\' AND "not_login" = ' .
((int)$api) . '
AND "disabled" = 0', $login);
break;
case "oracle":
$sql = sprintf ('SELECT id_user, password FROM tusuario WHERE id_user = \'%s\' AND disabled = 0', $login);
$sql = sprintf ('SELECT id_user, password
FROM tusuario
WHERE id_user = \'%s\' AND not_login = ' .
((int)$api) . '
AND disabled = 0', $login);
break;
}
$row = db_get_row_sql ($sql);
//Check that row exists, that password is not empty and that password is the same hash
if ($row !== false && $row["password"] !== md5 ("") && $row["password"] == md5 ($pass)) {
if ($row !== false && $row["password"] !== md5 ("")
&& $row["password"] == md5 ($pass)) {
// Login OK
// Nick could be uppercase or lowercase (select in MySQL
// is not case sensitive)
@ -101,19 +117,22 @@ function process_user_login ($login, $pass) {
// Thanks to David Muñiz for Bug discovery :)
return $row["id_user"];
}
else {
if (!user_can_login($login)) {
$mysql_cache["auth_error"] = "User only can use the API.";
$config["auth_error"] = "User only can use the API.";
}
else {
$mysql_cache["auth_error"] = "User not found in database or incorrect password";
$config["auth_error"] = "User not found in database or incorrect password";
}
}
return false;
// Remote authentication
}
else {
// Remote authentication
switch ($config["auth"]) {
// LDAP
case 'ldap':
if (ldap_process_user_login ($login, $pass) === false) {
@ -158,10 +177,15 @@ function process_user_login ($login, $pass) {
default:
$config["auth_error"] = "User not found in database or incorrect password";
return false;
break;
}
// Authentication ok, check if the user exists in the local database
if (is_user ($login)) {
if (!user_can_login($login)) {
return false;
}
return $login;
}
@ -192,15 +216,8 @@ function process_user_login ($login, $pass) {
* @return bool True is the user is admin
*/
function is_user_admin ($id_user) {
/* This code below was here, but I don't understand WHY. This always returns TRUE ¿?¿?
static $is_admin = -1;
if ($is_admin !== -1)
return $is_admin;
*/
$is_admin = (bool) db_get_value ('is_admin', 'tusuario', 'id_user', $id_user);
return $is_admin;
}
@ -223,7 +240,8 @@ function get_user_id ($user) {
return $user['id_usuario'];
else
return false;
} else {
}
else {
return $user;
}
}
@ -237,8 +255,20 @@ function get_user_id ($user) {
*/
function is_user ($user) {
$user = db_get_row('tusuario', 'id_user', get_user_id ($user));
if (! $user)
return false;
return true;
}
function user_can_login($user) {
$not_login = db_get_value('not_login', 'tusuario', 'id_user', $user);
if ($not_login != 0) {
return false;
}
return true;
}
@ -360,12 +390,14 @@ function save_pass_history ($id_user, $password) {
* @param string User id
*/
function delete_user ($id_user) {
$result = db_process_sql_delete('tusuario_perfil', array('id_usuario' => $id_user));
$result = db_process_sql_delete('tusuario_perfil',
array('id_usuario' => $id_user));
if ($result === false) {
return false;
}
$result = db_process_sql_delete('tusuario', array('id_user' => $id_user));
$result = db_process_sql_delete('tusuario',
array('id_user' => $id_user));
if ($result === false) {
return false;
}
@ -415,7 +447,8 @@ function ldap_process_user_login ($login, $password) {
global $config;
if (! function_exists ("ldap_connect")) {
$config["auth_error"] = 'Your installation of PHP does not support LDAP';
$config["auth_error"] = __('Your installation of PHP does not support LDAP');
return false;
}
@ -424,6 +457,7 @@ function ldap_process_user_login ($login, $password) {
if (!$ds) {
$config["auth_error"] = 'Error connecting to LDAP server';
return false;
}
@ -434,6 +468,7 @@ function ldap_process_user_login ($login, $password) {
if (!@ldap_start_tls ($ds)) {
$config["auth_error"] = 'Could not start TLS for LDAP connection';
@ldap_close ($ds);
return false;
}
}
@ -441,10 +476,12 @@ function ldap_process_user_login ($login, $password) {
if (strlen($password) == 0 || !@ldap_bind ($ds, $config["ldap_login_attr"]."=".$login.",".$config["ldap_base_dn"], $password)) {
$config["auth_error"] = 'User not found in database or incorrect password';
@ldap_close ($ds);
return false;
}
@ldap_close ($ds);
return true;
}

10
pandora_console/index.php
View File

@ -187,7 +187,10 @@ elseif (! isset ($config['id_user']) && isset ($_GET["login"])) {
$expired_pass = false;
if (($nick_in_db != false)&& ((!is_user_admin($nick) || $config['enable_pass_policy_admin'])) && (defined('PANDORA_ENTERPRISE')) && ($config['enable_pass_policy'])) {
if (($nick_in_db != false) && ((!is_user_admin($nick)
|| $config['enable_pass_policy_admin']))
&& (defined('PANDORA_ENTERPRISE'))
&& ($config['enable_pass_policy'])) {
include_once(ENTERPRISE_DIR."/include/auth/mysql.php");
$blocked = login_check_blocked($nick);
@ -209,7 +212,6 @@ elseif (! isset ($config['id_user']) && isset ($_GET["login"])) {
login_change_password($nick);
break;
}
}
if (($nick_in_db !== false) && $expired_pass) { //login ok and password has expired
@ -218,7 +220,8 @@ elseif (! isset ($config['id_user']) && isset ($_GET["login"])) {
while (@ob_end_flush ());
exit ("</html>");
}
else if (($nick_in_db !== false) && (!$expired_pass)) { //login ok and password has not expired
else if (($nick_in_db !== false) && (!$expired_pass)) {
//login ok and password has not expired
$process_login = true;
unset ($_GET["sec2"]);
@ -307,7 +310,6 @@ elseif (! isset ($config['id_user']) && isset ($_GET["login"])) {
}
}
elseif (! isset ($config['id_user'])) {
// There is no user connected
require_once ('general/login_page.php');
while (@ob_end_flush ());

41
pandora_console/pandoradb.oracle.sql
View File

@ -27,28 +27,33 @@
CREATE OR REPLACE FUNCTION UNIX_TIMESTAMP (oracletime IN DATE DEFAULT SYSDATE) RETURN INTEGER AS unixtime INTEGER; BEGIN unixtime := (oracletime - to_date('19700101','YYYYMMDD')) * 86400; RETURN unixtime; END;;
CREATE OR REPLACE FUNCTION NOW RETURN TIMESTAMP AS t_now TIMESTAMP; BEGIN SELECT LOCALTIMESTAMP INTO t_now FROM dual; RETURN t_now; END;;
-- -----------------------------------------------------
-- Table `taddress`
-- -----------------------------------------------------
CREATE TABLE taddress (
id_a NUMBER(10, 0) NOT NULL PRIMARY KEY,
ip VARCHAR(60) default '',
ip_pack NUMBER(10, 0) default 0 NOT NULL
);
CREATE INDEX taddress_ip_idx ON taddress(ip);
CREATE SEQUENCE taddress_s INCREMENT BY 1 START WITH 1;
-- Triggers must end with double semicolons because Pandora installer need it
CREATE OR REPLACE TRIGGER taddress_inc BEFORE INSERT ON taddress REFERENCING NEW AS NEW FOR EACH ROW BEGIN SELECT taddress_s.nextval INTO :NEW.ID_A FROM dual; END;;
-- -----------------------------------------------------
-- Table `taddress_agent`
-- -----------------------------------------------------
CREATE TABLE taddress_agent (
id_ag NUMBER(19, 0) NOT NULL PRIMARY KEY,
id_a NUMBER(19, 0) default 0 NOT NULL,
id_agent NUMBER(19, 0) default 0 NOT NULL
);
CREATE SEQUENCE taddress_agent_s INCREMENT BY 1 START WITH 1;
CREATE OR REPLACE TRIGGER taddress_agent_inc BEFORE INSERT ON taddress_agent REFERENCING NEW AS NEW FOR EACH ROW BEGIN SELECT taddress_agent_s.nextval INTO :NEW.ID_AG FROM dual; END;;
-- -----------------------------------------------------
-- Table `tagente`
-- -----------------------------------------------------
CREATE TABLE tagente (
id_agente NUMBER(10, 0) NOT NULL PRIMARY KEY,
nombre VARCHAR2(600) default '',
@ -79,11 +84,12 @@ CREATE INDEX tagente_nombre_idx ON tagente(nombre);
CREATE INDEX tagente_direccion_idx ON tagente(direccion);
CREATE INDEX tagente_disabled_idx ON tagente(disabled);
CREATE INDEX tagente_id_grupo_idx ON tagente(id_grupo);
CREATE SEQUENCE tagente_s INCREMENT BY 1 START WITH 1;
CREATE OR REPLACE TRIGGER tagente_inc BEFORE INSERT ON tagente REFERENCING NEW AS NEW FOR EACH ROW BEGIN SELECT tagente_s.nextval INTO :NEW.ID_AGENTE FROM dual; END;;
-- -----------------------------------------------------
-- Table `tagente_datos`
-- -----------------------------------------------------
CREATE TABLE tagente_datos (
id_agente_modulo NUMBER(10, 0) default 0 NOT NULL,
datos BINARY_DOUBLE default NULL,
@ -92,6 +98,9 @@ CREATE TABLE tagente_datos (
CREATE INDEX tagente_datos_id_agent_mod_idx ON tagente_datos(id_agente_modulo);
CREATE INDEX tagente_datos_utimestamp_idx ON tagente_datos(utimestamp);
-- -----------------------------------------------------
-- Table `tagente_datos_inc`
-- -----------------------------------------------------
CREATE TABLE tagente_datos_inc (
id_adi NUMBER(10, 0) NOT NULL PRIMARY KEY,
id_agente_modulo NUMBER(10, 0) default 0 NOT NULL,
@ -99,11 +108,12 @@ CREATE TABLE tagente_datos_inc (
utimestamp NUMBER(10, 0) default 0 NOT NULL
);
CREATE INDEX tagente_datos_inc_id_ag_mo_idx ON tagente_datos_inc(id_agente_modulo);
CREATE SEQUENCE tagente_datos_inc_s INCREMENT BY 1 START WITH 1;
CREATE OR REPLACE TRIGGER tagente_datos_inc_inc BEFORE INSERT ON tagente_datos_inc REFERENCING NEW AS NEW FOR EACH ROW BEGIN SELECT tagente_datos_inc_s.nextval INTO :NEW.ID_ADI FROM dual; END;;
-- -----------------------------------------------------
-- Table `tagente_datos_string`
-- -----------------------------------------------------
CREATE TABLE tagente_datos_string (
id_agente_modulo NUMBER(10, 0) NOT NULL,
datos CLOB NOT NULL,
@ -111,6 +121,9 @@ CREATE TABLE tagente_datos_string (
);
CREATE INDEX tagente_datos_string_utsta_idx ON tagente_datos_string(utimestamp);
-- -----------------------------------------------------
-- Table `tagente_datos_log4x`
-- -----------------------------------------------------
CREATE TABLE tagente_datos_log4x (
id_tagente_datos_log4x NUMBER(19, 0) NOT NULL PRIMARY KEY,
id_agente_modulo NUMBER(10, 0) default 0 NOT NULL,
@ -120,11 +133,12 @@ CREATE TABLE tagente_datos_log4x (
utimestamp NUMBER(10, 0) default 0 NOT NULL
);
CREATE INDEX tagente_datos_log4x_id_a_m_idx ON tagente_datos_log4x(id_agente_modulo);
CREATE SEQUENCE tagente_datos_log4x_s INCREMENT BY 1 START WITH 1;
CREATE OR REPLACE TRIGGER tagente_datos_log4x_inc BEFORE INSERT ON tagente_datos_log4x REFERENCING NEW AS NEW FOR EACH ROW BEGIN SELECT tagente_datos_log4x_s.nextval INTO :NEW.ID_TAGENTE_DATOS_LOG4X FROM dual; END;;
-- -----------------------------------------------------
-- Table `tagente_estado`
-- -----------------------------------------------------
CREATE TABLE tagente_estado (
id_agente_estado NUMBER(10, 0) NOT NULL PRIMARY KEY,
id_agente_modulo NUMBER(10, 0) default 0 NOT NULL,
@ -861,6 +875,9 @@ CREATE SEQUENCE ttrap_s INCREMENT BY 1 START WITH 1;
CREATE OR REPLACE TRIGGER ttrap_inc BEFORE INSERT ON ttrap REFERENCING NEW AS NEW FOR EACH ROW BEGIN SELECT ttrap_s.nextval INTO :NEW.ID_TRAP FROM dual; END ttrap_inc;;
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
CREATE TABLE tusuario (
id_user VARCHAR2(60) NOT NULL PRIMARY KEY,
fullname VARCHAR2(255) NOT NULL,
@ -890,9 +907,13 @@ CREATE TABLE tusuario (
failed_attempt NUMBER(5,0) default 0 NOT NULL,
login_blocked NUMBER(5,0) default 0 NOT NULL,
metaconsole_access VARCHAR2(100) default 'only_console' NOT NULL,
not_login NUMBER(5,0) default 0 NOT NULL,
CONSTRAINT t_usuario_metaconsole_access_cons CHECK (metaconsole_access IN ('basic','advanced','custom','all','only_console'))
);
-- -----------------------------------------------------
-- Table `tusuario_perfil`
-- -----------------------------------------------------
CREATE TABLE tusuario_perfil (
id_up NUMBER(19, 0) NOT NULL PRIMARY KEY,
id_usuario VARCHAR2(100) default '',

79
pandora_console/pandoradb.postgreSQL.sql
View File

@ -30,11 +30,28 @@ CREATE OR REPLACE LANGUAGE plpgsql;
CREATE OR REPLACE FUNCTION unix_timestamp(TIMESTAMP without time zone = CURRENT_TIMESTAMP) RETURNS double precision AS 'SELECT ceil(date_part(''epoch'', $1)); ' LANGUAGE SQL;
CREATE TABLE "taddress" ("id_a" SERIAL NOT NULL PRIMARY KEY,"ip" VARCHAR(60) NOT NULL default '',"ip_pack" INTEGER NOT NULL default 0);
-- -----------------------------------------------------
-- Table `taddress`
-- -----------------------------------------------------
CREATE TABLE "taddress" (
"id_a" SERIAL NOT NULL PRIMARY KEY,
"ip" VARCHAR(60) NOT NULL default '',
"ip_pack" INTEGER NOT NULL default 0
);
CREATE INDEX "taddress_ip_idx" ON "taddress"("ip");
CREATE TABLE "taddress_agent" ("id_ag" BIGSERIAL NOT NULL PRIMARY KEY,"id_a" BIGINT NOT NULL default 0,"id_agent" BIGINT NOT NULL default 0);
-- -----------------------------------------------------
-- Table `taddress_agent`
-- -----------------------------------------------------
CREATE TABLE "taddress_agent" (
"id_ag" BIGSERIAL NOT NULL PRIMARY KEY,
"id_a" BIGINT NOT NULL default 0,
"id_agent" BIGINT NOT NULL default 0
);
-- -----------------------------------------------------
-- Table `tagente`
-- -----------------------------------------------------
CREATE TABLE "tagente" (
"id_agente" SERIAL NOT NULL PRIMARY KEY,
"nombre" varchar(600) NOT NULL default '',
@ -66,6 +83,9 @@ CREATE INDEX "tagente_direccion_idx" ON "tagente"("direccion");
CREATE INDEX "tagente_disabled_idx" ON "tagente"("disabled");
CREATE INDEX "tagente_id_grupo_idx" ON "tagente"("id_grupo");
-- -----------------------------------------------------
-- Table `tagente_datos`
-- -----------------------------------------------------
CREATE TABLE "tagente_datos" (
"id_agente_modulo" INTEGER NOT NULL default 0,
"datos" DOUBLE PRECISION default NULL,
@ -74,6 +94,9 @@ CREATE TABLE "tagente_datos" (
CREATE INDEX "tagente_datos_id_agente_modulo_idx" ON "tagente_datos"("id_agente_modulo");
CREATE INDEX "tagente_datos_utimestamp_idx" ON "tagente_datos"("utimestamp");
-- -----------------------------------------------------
-- Table `tagente_datos_inc`
-- -----------------------------------------------------
CREATE TABLE "tagente_datos_inc" (
"id_adi" SERIAL NOT NULL PRIMARY KEY,
"id_agente_modulo" INTEGER NOT NULL default 0,
@ -82,8 +105,9 @@ CREATE TABLE "tagente_datos_inc" (
);
CREATE INDEX "tagente_datos_inc_id_agente_modulo_idx" ON "tagente_datos_inc"("id_agente_modulo");
-- -----------------------------------------------------
-- Table `tagente_datos_string`
-- -----------------------------------------------------
CREATE TABLE "tagente_datos_string" (
"id_agente_modulo" INTEGER NOT NULL default 0,
"datos" TEXT NOT NULL,
@ -92,20 +116,22 @@ CREATE TABLE "tagente_datos_string" (
CREATE INDEX "tagente_datos_string_id_agente_modulo_idx" ON "tagente_datos_string"("id_agente_modulo");
CREATE INDEX "tagente_datos_string_utimestamp_idx" ON "tagente_datos_string"("utimestamp");
-- -----------------------------------------------------
-- Table `tagente_datos_log4x`
-- -----------------------------------------------------
CREATE TABLE "tagente_datos_log4x" (
"id_tagente_datos_log4x" BIGSERIAL NOT NULL PRIMARY KEY,
"id_agente_modulo" INTEGER NOT NULL default 0,
"severity" text NOT NULL,
"message" text NOT NULL,
"stacktrace" text NOT NULL,
"utimestamp" INTEGER NOT NULL default 0
);
CREATE INDEX "tagente_datos_log4x_id_agente_modulo_idx" ON "tagente_datos_log4x"("id_agente_modulo");
-- -----------------------------------------------------
-- Table `tagente_estado`
-- -----------------------------------------------------
CREATE TABLE "tagente_estado" (
"id_agente_estado" SERIAL NOT NULL PRIMARY KEY,
"id_agente_modulo" INTEGER NOT NULL default 0,
@ -664,6 +690,9 @@ CREATE TABLE "tsesion" (
CREATE INDEX "tsesion_utimestamp_idx" ON "tsesion"("utimestamp");
CREATE INDEX "tsesion_id_usuario_idx" ON "tsesion"("id_usuario");
-- -----------------------------------------------------
-- Table `ttipo_modulo`
-- -----------------------------------------------------
CREATE TABLE "ttipo_modulo" (
"id_tipo" SERIAL NOT NULL PRIMARY KEY,
"nombre" varchar(100) NOT NULL default '',
@ -672,6 +701,9 @@ CREATE TABLE "ttipo_modulo" (
"icon" varchar(100) default NULL
);
-- -----------------------------------------------------
-- Table `ttrap`
-- -----------------------------------------------------
CREATE TABLE "ttrap" (
"id_trap" BIGSERIAL NOT NULL PRIMARY KEY,
"source" varchar(50) NOT NULL default '',
@ -691,6 +723,9 @@ CREATE TABLE "ttrap" (
"severity" INTEGER NOT NULL default 2
);
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
CREATE TYPE type_tusuario_metaconsole_access AS ENUM ('basic','advanced','custom','all','only_console');
CREATE TABLE "tusuario" (
"id_user" varchar(60) NOT NULL PRIMARY KEY,
@ -720,9 +755,13 @@ CREATE TABLE "tusuario" (
"last_failed_login" BIGINT NOT NULL default 0,
"failed_attempt" INTEGER NOT NULL DEFAULT 0,
"login_blocked" SMALLINT NOT NULL default 0,
"not_login" SMALLINT NOT NULL default 0,
"metaconsole_access" type_tusuario_metaconsole_access default 'only_console'
);
-- -----------------------------------------------------
-- Table `tusuario_perfil`
-- -----------------------------------------------------
CREATE TABLE "tusuario_perfil" (
"id_up" BIGSERIAL NOT NULL PRIMARY KEY,
"id_usuario" varchar(100) NOT NULL default '',
@ -732,6 +771,9 @@ CREATE TABLE "tusuario_perfil" (
"id_policy" INTEGER DEFAULT 0 NOT NULL
);
-- -----------------------------------------------------
-- Table `tnews`
-- -----------------------------------------------------
CREATE TABLE "tnews" (
"id_news" SERIAL NOT NULL PRIMARY KEY,
"author" varchar(255) NOT NULL DEFAULT '',
@ -740,6 +782,9 @@ CREATE TABLE "tnews" (
"timestamp" TIMESTAMP without time zone default '1970-01-01 00:00:00'
);
-- -----------------------------------------------------
-- Table `tgraph`
-- -----------------------------------------------------
CREATE TABLE "tgraph" (
"id_graph" SERIAL NOT NULL PRIMARY KEY,
"id_user" varchar(100) NOT NULL default '',
@ -755,6 +800,9 @@ CREATE TABLE "tgraph" (
"id_graph_template" INTEGER NOT NULL default 0
);
-- -----------------------------------------------------
-- Table `tgraph_source`
-- -----------------------------------------------------
CREATE TABLE "tgraph_source" (
"id_gs" SERIAL NOT NULL PRIMARY KEY,
"id_graph" BIGINT NOT NULL default 0,
@ -824,6 +872,9 @@ CREATE TABLE "treport_content" (
"server_name" TEXT DEFAULT ''
);
-- -----------------------------------------------------
-- Table "treport_content_sla_combined"
-- -----------------------------------------------------
CREATE TABLE "treport_content_sla_combined" (
"id" SERIAL NOT NULL PRIMARY KEY,
"id_report_content" INTEGER NOT NULL REFERENCES treport_content("id_rc") ON UPDATE CASCADE ON DELETE CASCADE,
@ -834,6 +885,9 @@ CREATE TABLE "treport_content_sla_combined" (
"server_name" TEXT DEFAULT ''
);
-- -----------------------------------------------------
-- Table "treport_content_item"
-- -----------------------------------------------------
CREATE TABLE "treport_content_item" (
"id" SERIAL NOT NULL PRIMARY KEY,
"id_report_content" INTEGER NOT NULL REFERENCES treport_content("id_rc") ON UPDATE CASCADE ON DELETE CASCADE,
@ -842,12 +896,18 @@ CREATE TABLE "treport_content_item" (
"operation" TEXT DEFAULT ''
);
-- -----------------------------------------------------
-- Table "treport_custom_sql"
-- -----------------------------------------------------
CREATE TABLE "treport_custom_sql" (
"id" SERIAL NOT NULL PRIMARY KEY,
"name" varchar(150) NOT NULL default '',
"sql" TEXT default NULL
);
-- -----------------------------------------------------
-- Table "tlayout"
-- -----------------------------------------------------
CREATE TABLE "tlayout" (
"id" SERIAL NOT NULL PRIMARY KEY,
"name" varchar(50) NOT NULL,
@ -858,6 +918,9 @@ CREATE TABLE "tlayout" (
"width" INTEGER NOT NULL default 0
);
-- -----------------------------------------------------
-- Table "tlayout_data"
-- -----------------------------------------------------
CREATE TABLE "tlayout_data" (
"id" SERIAL NOT NULL PRIMARY KEY,
"id_layout" INTEGER NOT NULL default 0,

54
pandora_console/pandoradb.sql
View File

@ -215,7 +215,6 @@ CREATE TABLE IF NOT EXISTS `tagente_modulo` (
`critical_instructions` text,
`warning_instructions` text,
`unknown_instructions` text,
PRIMARY KEY (`id_agente_modulo`),
KEY `main_idx` (`id_agente_modulo`,`id_agente`),
KEY `tam_agente` (`id_agente`),
@ -657,11 +656,16 @@ CREATE TABLE IF NOT EXISTS `tnota` (
KEY `id_incident` (`id_incident`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `torigen`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `torigen` (
`origen` varchar(100) NOT NULL default ''
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `tperfil`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tperfil` (
`id_perfil` int(10) unsigned NOT NULL auto_increment,
`name` TEXT NOT NULL,
@ -678,6 +682,9 @@ CREATE TABLE IF NOT EXISTS `tperfil` (
PRIMARY KEY (`id_perfil`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `trecon_script`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `trecon_script` (
`id_recon_script` int(10) NOT NULL auto_increment,
`name` varchar(100) default '',
@ -686,6 +693,9 @@ CREATE TABLE IF NOT EXISTS `trecon_script` (
PRIMARY KEY (`id_recon_script`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `trecon_task`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `trecon_task` (
`id_rt` int(10) unsigned NOT NULL auto_increment,
`name` varchar(100) NOT NULL default '',
@ -715,8 +725,9 @@ CREATE TABLE IF NOT EXISTS `trecon_task` (
KEY `recon_task_daemon` (`id_recon_server`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `tserver`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tserver` (
`id_server` int(10) unsigned NOT NULL auto_increment,
`name` varchar(100) NOT NULL default '',
@ -749,7 +760,6 @@ CREATE TABLE IF NOT EXISTS `tserver` (
KEY `keepalive` (`keepalive`),
KEY `status` (`status`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- server types:
-- 0 data
-- 1 network
@ -763,6 +773,9 @@ CREATE TABLE IF NOT EXISTS `tserver` (
-- 9 web
-- TODO: drop 2.x xxxx_server fields, unused since server_type exists.
-- -----------------------------------------------------
-- Table `tsesion`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tsesion` (
`id_sesion` bigint(20) unsigned NOT NULL auto_increment,
`id_usuario` varchar(60) NOT NULL default '0',
@ -776,7 +789,9 @@ CREATE TABLE IF NOT EXISTS `tsesion` (
KEY `idx_user` (`id_usuario`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `ttipo_modulo`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `ttipo_modulo` (
`id_tipo` smallint(5) unsigned NOT NULL auto_increment,
`nombre` varchar(100) NOT NULL default '',
@ -786,7 +801,9 @@ CREATE TABLE IF NOT EXISTS `ttipo_modulo` (
PRIMARY KEY (`id_tipo`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `ttrap`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `ttrap` (
`id_trap` bigint(20) unsigned NOT NULL auto_increment,
`source` varchar(50) NOT NULL default '',
@ -809,6 +826,9 @@ CREATE TABLE IF NOT EXISTS `ttrap` (
INDEX status (`status`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tusuario` (
`id_user` varchar(60) NOT NULL default '0',
`fullname` varchar(255) NOT NULL,
@ -838,6 +858,7 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
`failed_attempt` int(4) NOT NULL DEFAULT 0,
`login_blocked` tinyint(1) unsigned NOT NULL default 0,
`metaconsole_access` enum('basic','advanced','custom','all','only_console') default 'only_console',
`not_login` tinyint(1) unsigned NOT NULL DEFAULT 0,
UNIQUE KEY `id_user` (`id_user`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@ -993,6 +1014,9 @@ CREATE TABLE IF NOT EXISTS `tlayout` (
PRIMARY KEY(`id`)
) ENGINE = InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `tlayout_data`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tlayout_data` (
`id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
`id_layout` INTEGER UNSIGNED NOT NULL default 0,
@ -1013,6 +1037,11 @@ CREATE TABLE IF NOT EXISTS `tlayout_data` (
PRIMARY KEY(`id`)
) ENGINE = InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `tplugin`
-- -----------------------------------------------------
-- The fields "net_dst_opt", "net_port_opt", "user_opt" and
-- "pass_opt" are deprecated for the 5.1.
CREATE TABLE IF NOT EXISTS `tplugin` (
`id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
`name` varchar(200) NOT NULL,
@ -1029,14 +1058,18 @@ CREATE TABLE IF NOT EXISTS `tplugin` (
PRIMARY KEY(`id`)
) ENGINE = InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `tmodule`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tmodule` (
`id_module` int(11) unsigned NOT NULL auto_increment,
`name` varchar(100) NOT NULL default '',
PRIMARY KEY (`id_module`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `tserver_export`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `tserver_export` (
`id` int(10) unsigned NOT NULL auto_increment,
`name` varchar(100) NOT NULL default '',
@ -1055,6 +1088,9 @@ CREATE TABLE IF NOT EXISTS `tserver_export` (
INDEX id_export_server (`id_export_server`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- -----------------------------------------------------
-- Table `tserver_export_data`
-- -----------------------------------------------------
-- id_export_server is real pandora fms export server process that manages this server
-- id is the "destination" server to export
CREATE TABLE IF NOT EXISTS `tserver_export_data` (