Author: chandra
Date: 2008-09-26 11:33:17 +0200 (Fri, 26 Sep 2008)
New Revision: 1452
Modified:
trunk/openvas-plugins/ChangeLog
trunk/openvas-plugins/scripts/gb_vmware_prdts_detect_lin.nasl
trunk/openvas-plugins/scripts/gb_vmware_prdts_mult_vuln_lin.nasl
Log:
Incorporated review comments
Modified: trunk/openvas-plugins/ChangeLog
===================================================================
--- trunk/openvas-plugins/ChangeLog 2008-09-26 08:07:51 UTC (rev 1451)
+++ trunk/openvas-plugins/ChangeLog 2008-09-26 09:33:17 UTC (rev 1452)
@@ -1,4 +1,9 @@
2008-09-26 Chandrashekhar B <[EMAIL PROTECTED]>
+ * scripts/gb_vmware_prdts_detect_lin.nasl,
+ scripts/gb_vmware_prdts_mult_vuln_lin.nasl:
+ Incorporated review comments
+
+2008-09-26 Chandrashekhar B <[EMAIL PROTECTED]>
* scripts/secpod_proftpd_cmd_handling_sec_vuln_900133.nasl,
scripts/secpod_office_products_version_900032.nasl,
scripts/secpod_nms_dvd_burning_sdk_actvx_vuln_900132.nasl,
Modified: trunk/openvas-plugins/scripts/gb_vmware_prdts_detect_lin.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_vmware_prdts_detect_lin.nasl
2008-09-26 08:07:51 UTC (rev 1451)
+++ trunk/openvas-plugins/scripts/gb_vmware_prdts_detect_lin.nasl
2008-09-26 09:33:17 UTC (rev 1452)
@@ -40,81 +40,73 @@
script_category(ACT_GATHER_INFO);
script_copyright(english:"Copyright (C) 2008 Intevation GmbH");
script_family(english:"General");
- script_dependencies("gather-package-list.nasl");
- script_require_keys("ssh/login/uname");
exit(0);
}
include("ssh_func.inc");
-if("Linux" >!< get_kb_item("ssh/login/uname")){
- exit(0);
-}
-
sock = ssh_login_or_reuse_connection();
if(!sock){
exit(0);
}
-version = ssh_cmd(socket:sock, cmd:"vmware -v", timeout:120);
+version = ssh_cmd(socket:sock, cmd:"vmware-config.pl -v", timeout:120);
if("VMware GSX Server" >< version)
{
gsxVer = ereg_replace(string:version, replace:"\1",
pattern:".*VMware GSX Server ([0-9].*) build.*");
gsxBuild = ereg_replace(string:version, replace:"\1",
- pattern:".*VMware GSX Server [0-9].*
build-([0-9].*)$");
+ pattern:".*VMware GSX Server [0-9].* build-([0-9]+)
.*");
set_kb_item(name:"VMware/GSX-Server/Linux/Ver", value:gsxVer);
- set_kb_item(name:"VMware/GSX-Server/Linux/Build", value:gsxBuild);
+ set_kb_item(name:"VMware/GSX-Server/Linux/Build", value:chomp(gsxBuild));
set_kb_item(name:"VMware/Linux/Installed", value:TRUE);
ssh_close_connection();
exit(0);
}
-if("VMware Workstation" >< version)
+else if("VMware Workstation" >< version)
{
wrkstnVer = ereg_replace(string:version, replace:"\1",
pattern:".*VMware Workstation ([0-9].*) build.*");
wrkstnBuild = ereg_replace(string:version, replace:"\1",
- pattern:".*VMware Workstation [0-9].*
build-([0-9].*)$");
+ pattern:".*VMware Workstation [0-9].*
build-([0-9]+) .*");
set_kb_item(name:"VMware/Workstation/Linux/Ver", value:wrkstnVer);
- set_kb_item(name:"VMware/Workstation/Linux/Build", value:wrkstnBuild);
+ set_kb_item(name:"VMware/Workstation/Linux/Build", value:chomp(wrkstnBuild));
set_kb_item(name:"VMware/Linux/Installed", value:TRUE);
ssh_close_connection();
exit(0);
}
-if("VMware Server" >< version)
+else if("VMware Server" >< version)
{
svrVer = ereg_replace(string:version, replace:"\1",
pattern:".*VMware Server ([0-9].*) build.*");
svrBuild = ereg_replace(string:version, replace:"\1",
- pattern:".*VMware Server [0-9].* build-([0-9].*)$");
+ pattern:".*VMware Server [0-9].* build-([0-9]+) .*");
set_kb_item(name:"VMware/Server/Linux/Ver", value:svrVer);
- set_kb_item(name:"VMware/Server/Linux/Build", value:svrBuild);
+ set_kb_item(name:"VMware/Server/Linux/Build", value:chomp(svrBuild));
set_kb_item(name:"VMware/Linux/Installed", value:TRUE);
ssh_close_connection();
exit(0);
}
-version = ssh_cmd(socket:sock, cmd:"vmplayer -v", timeout:120);
-
-if("VMware Player" >< version)
+else if("VMware Player" >< version)
{
playerVer = ereg_replace(pattern:".*VMware Player ([0-9].*) build.*",
string:version, replace:"\1");
playerBuild = ereg_replace(string:version, replace:"\1",
- pattern:".*VMware Player [0-9].*
build-([0-9].*)$");
+ pattern:".*VMware Player [0-9].* build-([0-9]+)
.*");
set_kb_item(name:"VMware/Player/Linux/Ver", value:playerVer);
- set_kb_item(name:"VMware/Player/Linux/Build", value:playerBuild);
+ set_kb_item(name:"VMware/Player/Linux/Build", value:chomp(playerBuild));
set_kb_item(name:"VMware/Linux/Installed", value:TRUE);
ssh_close_connection();
Modified: trunk/openvas-plugins/scripts/gb_vmware_prdts_mult_vuln_lin.nasl
===================================================================
--- trunk/openvas-plugins/scripts/gb_vmware_prdts_mult_vuln_lin.nasl
2008-09-26 08:07:51 UTC (rev 1451)
+++ trunk/openvas-plugins/scripts/gb_vmware_prdts_mult_vuln_lin.nasl
2008-09-26 09:33:17 UTC (rev 1452)
@@ -77,17 +77,12 @@
script_category(ACT_GATHER_INFO);
script_copyright(english:"Copyright (C) 2008 Intevation GmbH");
script_family(english:"Misc.");
- script_dependencies("gather-package-list.nasl",
- "gb_vmware_prdts_detect_lin.nasl");
+ script_dependencies("gb_vmware_prdts_detect_lin.nasl");
script_require_keys("ssh/login/uname");
exit(0);
}
-if("Linux" >!< get_kb_item("ssh/login/uname")){
- exit(0);
-}
-
if(!get_kb_item("VMware/Linux/Installed")){
exit(0);
}
_______________________________________________
Openvas-commits mailing list
[email protected]
http://lists.wald.intevation.org/mailman/listinfo/openvas-commits
