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

#11843 Added word legacy in the discovery. It is added only for version 1.0 of discovery.

This commit is contained in:
Jorge Rincon 2023-08-09 14:40:56 +02:00
parent f4b555162b
commit ed9b70725d
4 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/godmode/menu.php
View File

@ -82,12 +82,12 @@ if ((bool) check_acl($config['id_user'], 0, 'AR') === true
// Applications.
$sub2 = [];
if (enterprise_installed() === true) {
$sub2['godmode/servers/discovery&wiz=app&mode=MicrosoftSQLServer']['text'] = __('Microsoft SQL Server');
$sub2['godmode/servers/discovery&wiz=app&mode=mysql']['text'] = __('Mysql');
$sub2['godmode/servers/discovery&wiz=app&mode=oracle']['text'] = __('Oracle');
$sub2['godmode/servers/discovery&wiz=app&mode=vmware']['text'] = __('VMware');
$sub2['godmode/servers/discovery&wiz=app&mode=SAP']['text'] = __('SAP');
$sub2['godmode/servers/discovery&wiz=app&mode=DB2']['text'] = __('DB2');
$sub2['godmode/servers/discovery&wiz=app&mode=MicrosoftSQLServer']['text'] = __('Microsoft SQL Server (legacy)');
$sub2['godmode/servers/discovery&wiz=app&mode=mysql']['text'] = __('Mysql (legacy)');
$sub2['godmode/servers/discovery&wiz=app&mode=oracle']['text'] = __('Oracle (legacy)');
$sub2['godmode/servers/discovery&wiz=app&mode=vmware']['text'] = __('VMware (legacy)');
$sub2['godmode/servers/discovery&wiz=app&mode=SAP']['text'] = __('SAP (legacy)');
$sub2['godmode/servers/discovery&wiz=app&mode=DB2']['text'] = __('DB2 (legacy)');
}
$extensions = ManageExtensions::getExtensionBySection('app');
@ -112,9 +112,9 @@ if ((bool) check_acl($config['id_user'], 0, 'AR') === true
// Cloud.
$sub2 = [];
if (enterprise_installed() === true) {
$sub2['godmode/servers/discovery&wiz=cloud&mode=amazonws']['text'] = __('Amazon Web Services');
$sub2['godmode/servers/discovery&wiz=cloud&mode=azure']['text'] = __('Microsoft Azure');
$sub2['godmode/servers/discovery&wiz=cloud&mode=gcp']['text'] = __('Google Compute Platform');
$sub2['godmode/servers/discovery&wiz=cloud&mode=amazonws']['text'] = __('Amazon Web Services (legacy)');
$sub2['godmode/servers/discovery&wiz=cloud&mode=azure']['text'] = __('Microsoft Azure (legacy)');
$sub2['godmode/servers/discovery&wiz=cloud&mode=gcp']['text'] = __('Google Compute Platform (legacy)');
}

3
pandora_console/godmode/wizards/Applications.class.php
View File

@ -67,6 +67,9 @@ class Applications extends Wizard
'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=app'
);
// Print Warning Message.
$this->printWarningMessage();
return $this;
}

37
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -32,6 +32,8 @@ require_once $config['homedir'].'/include/class/HTML.class.php';
require_once $config['homedir'].'/include/functions_users.php';
require_once $config['homedir'].'/include/functions_reports.php';
require_once $config['homedir'].'/include/functions_cron.php';
require_once $config['homedir'].'/godmode/wizards/Wizard.main.php';
enterprise_include_once('include/functions_tasklist.php');
enterprise_include_once('include/functions_cron.php');
@ -215,7 +217,8 @@ class DiscoveryTaskList extends HTML
}
// Warning Message.
$this->getWarningMessage();
$wizar_main = new Wizard();
$wizar_main->printWarningMessage();
return $ret;
}
@ -779,7 +782,7 @@ class DiscoveryTaskList extends HTML
'class' => 'main_menu_icon invert_filter',
]
).'  ';
$data[6] .= __('Cloud.Azure.Compute');
$data[6] .= __('Cloud.Azure.Compute (legacy)');
break;
case DISCOVERY_CLOUD_AWS_EC2:
@ -792,7 +795,7 @@ class DiscoveryTaskList extends HTML
'class' => 'main_menu_icon invert_filter',
]
).'  ';
$data[6] .= __('Cloud.AWS.EC2');
$data[6] .= __('Cloud.AWS.EC2 (legacy)');
break;
case DISCOVERY_CLOUD_AWS_RDS:
@ -805,7 +808,7 @@ class DiscoveryTaskList extends HTML
'class' => 'main_menu_icon invert_filter',
]
).'  ';
$data[6] .= __('Discovery.Cloud.Aws.RDS');
$data[6] .= __('Discovery.Cloud.Aws.RDS (legacy)');
break;
case DISCOVERY_CLOUD_AWS_S3:
@ -818,7 +821,7 @@ class DiscoveryTaskList extends HTML
'class' => 'main_menu_icon invert_filter',
]
).'  ';
$data[6] .= __('Discovery.Cloud.Aws.S3');
$data[6] .= __('Discovery.Cloud.Aws.S3 (legacy)');
break;
case DISCOVERY_APP_MYSQL:
@ -831,7 +834,7 @@ class DiscoveryTaskList extends HTML
'class' => 'main_menu_icon invert_filter',
]
).'  ';
$data[6] .= __('Discovery.App.MySQL');
$data[6] .= __('Discovery.App.MySQL (legacy)');
break;
case DISCOVERY_APP_ORACLE:
@ -844,7 +847,7 @@ class DiscoveryTaskList extends HTML
'class' => 'main_menu_icon invert_filter',
]
).'  ';
$data[6] .= __('Discovery.App.Oracle');
$data[6] .= __('Discovery.App.Oracle (legacy)');
break;
case DISCOVERY_APP_DB2:
@ -857,7 +860,7 @@ class DiscoveryTaskList extends HTML
'class' => 'main_menu_icon invert_filter',
]
).'  ';
$data[6] .= __('Discovery.App.DB2');
$data[6] .= __('Discovery.App.DB2 (legacy)');
break;
case DISCOVERY_DEPLOY_AGENTS:
@ -868,7 +871,7 @@ class DiscoveryTaskList extends HTML
true,
['title' => __('Agent deployment')]
).'  ';
$data[6] .= __('Discovery.Agent.Deployment');
$data[6] .= __('Discovery.Agent.Deployment (legacy)');
break;
case DISCOVERY_APP_MICROSOFT_SQL_SERVER:
@ -881,7 +884,7 @@ class DiscoveryTaskList extends HTML
'class' => 'main_menu_icon invert_filter',
]
).'  ';
$data[6] .= __('Discovery.App.Microsoft SQL Server');
$data[6] .= __('Discovery.App.Microsoft SQL Server (legacy)');
break;
case DISCOVERY_EXTENSION:
@ -909,7 +912,7 @@ class DiscoveryTaskList extends HTML
'class' => 'main_menu_icon invert_filter',
]
).'  ';
$data[6] .= __('Discovery.NetScan');
$data[6] .= __('Discovery.NetScan (legacy)');
} else {
// APP or external script recon task.
$data[6] = html_print_image(
@ -917,7 +920,7 @@ class DiscoveryTaskList extends HTML
true,
['class' => 'main_menu_icon invert_filter']
).'  ';
$data[6] .= $recon_script_name;
$data[6] .= $recon_script_name.' (legacy)';
}
break;
}
@ -2025,13 +2028,13 @@ class DiscoveryTaskList extends HTML
}
/**
/*
* Generates warning message.
*
* @return void Warning message.
*/
public function getWarningMessage()
{
public function getWarningMessage()
{
return ui_print_warning_message(
__(
'Starting with version 773, the new modular system of discovery 2.0 has been implemented. The current
@ -2046,7 +2049,7 @@ class DiscoveryTaskList extends HTML
model will be included.'
)
);
}
}*/
}

24
pandora_console/godmode/wizards/Wizard.main.php
View File

@ -522,4 +522,28 @@ class Wizard
}
/**
* Generates warning message.
*
* @return void Warning message.
*/
public function printWarningMessage()
{
return ui_print_warning_message(
__(
'Starting with version 773, the new modular system of discovery 2.0 has been implemented. The current
discovery (1.0) and its defined tasks will continue to function normally until the next LTS version,
in which migration to the new system will be mandatory.
The tasks of the current discovery (1.0) will be marked as legacy although it will not affect their
operation, it will only be a visual indicator to identify and differentiate the tasks of discovery 1.0
from those of the new version 2.0.
In the intermediate versions between the 773 and the next LTS version, more applications of the new
discovery 2.0 will be added. Both new and those that will come to replace the applications of the
current discovery 1.0. In addition, an automatic migration tool for legacy (1.0) tasks to the new 2.0
model will be included.'
)
);
}
}