Merge remote-tracking branch 'forge/2.3.x' into 2.3.x

fusioninventory · Jul 9, 2012 · c344ad7 · c344ad7
2 parents 9220492 + a18d430
commit c344ad7
Show file tree

Hide file tree

Showing 19 changed files with 207 additions and 55 deletions.
diff --git a/Changes b/Changes
@@ -3,20 +3,22 @@ Revision history for FusionInventory agent
 2.3.0
 General:
 * various UTF8 encoding fixes
+* Add DNS_DOMAIN and FQDN in OPERATINGSYSTEM section
 
 BSD:
 * Megaraid and 3ware RAID controller support (Egor Morozov)
 
 Linux:
 * Megaraid controller support (Egor Morozov)
 
-2.2.3
+2.2.3  Mon, 25 Jun 2012 21:36:29 +0200
 General:
 * Fix battery voltage and capacity retrieval
 * Add --timeout option
 
 MacOSX:
 * Fix global memory and CPU inventory
+* Fix drives inventory
 
 Linux:
 * LXC support (Egor Morozov)

diff --git a/README b/README
@@ -24,7 +24,6 @@ Additional mandatory perl modules:
 - LWP
 - Net::IP
 - UNIVERSAL::require
-- Mac::SysProfile (MacOs only)
 
 Additional optional perl modules:
 - Compress::Zlib, for message compression

diff --git a/fusioninventory-agent b/fusioninventory-agent
@@ -370,6 +370,9 @@ The network port to use for the embedded web server (62354).
 
 Trust requests from given range without authentication token (false).
 
+For example: "192.168.0.0/24", "192.68.168.0.5" or an IP range like
+"20.34.101.207 - 201.3.9.99". See L<Net::IP> documentation to get more example.
+
 =back
 
 =head2 Logging options

diff --git a/lib/FusionInventory/Agent.pm b/lib/FusionInventory/Agent.pm
@@ -23,7 +23,7 @@ use FusionInventory::Agent::XML::Query::Prolog;
 
 our $VERSION = '2.3.0';
 our $VERSION_STRING = 
-    "FusionInventory unified agent for UNIX, Linux and MacOSX ($VERSION)";
+    "FusionInventory Agent ($VERSION)";
 our $AGENT_STRING =
     "FusionInventory-Agent_v$VERSION";
 

diff --git a/lib/FusionInventory/Agent/Task/Inventory/Input/Generic.pm b/lib/FusionInventory/Agent/Task/Inventory/Input/Generic.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use English qw(-no_match_vars);
+use Net::Domain qw(hostfqdn hostdomain);
 
 sub isEnabled {
     return 1;
@@ -15,7 +16,9 @@ sub doInventory {
     my $inventory = $params{inventory};
 
     $inventory->setOperatingSystem({
-        KERNEL_NAME => $OSNAME
+            KERNEL_NAME => $OSNAME,
+            FQDN => hostfqdn(),
+            DNS_DOMAIN => hostdomain()
     });
 }
 

diff --git a/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Screen.pm b/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Screen.pm
@@ -112,7 +112,7 @@ sub doInventory {
     my $inventory = $params{inventory};
     my $logger    = $params{logger};
 
-    Parse::EDID->requires();
+    Parse::EDID->require();
 
     foreach my $screen (_getScreens($logger)) {
 

diff --git a/lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Storages/Megaraid.pm b/lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Storages/Megaraid.pm
@@ -30,7 +30,9 @@ sub _parseMegasasctl {
         }
 
         my $storage;
-        $storage->{NAME} = "$vendor $model";
+        $storage->{NAME} = $disk_addr;
+        $storage->{MANUFACTURER} = $vendor;
+        $storage->{MODEL} = $model;
         $storage->{DESCRIPTION} = 'SAS';
         $storage->{TYPE} = 'disk';
         $storage->{DISKSIZE} = $size;

diff --git a/lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/Jails.pm b/lib/FusionInventory/Agent/Task/Inventory/Input/Virtualization/Jails.pm
@@ -15,7 +15,6 @@ sub doInventory {
     my $inventory = $params{inventory};
     my $logger    = $params{inventory};
 
-    my $command = 'jls -n';
     foreach my $machine (_getVirtualMachines(logger => $logger)) {
         $inventory->addEntry(
             section => 'VIRTUALMACHINES', entry => $machine
@@ -38,8 +37,6 @@ sub  _getVirtualMachines {
         my $info;
         foreach my $item (split(' ', $line)) {
             next unless $item =~ /(\S+)=(\S+)/;
-            my $key   = $1;
-            my $value = $2;
             $info->{$1} = $2;
         }
 

diff --git a/lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Softwares.pm b/lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Softwares.pm
@@ -11,6 +11,7 @@ use Win32::TieRegistry (
     ArrayValues => 0,
     qw/KEY_READ/
 );
+use File::Basename;
 
 use FusionInventory::Agent::Tools;
 use FusionInventory::Agent::Tools::Win32;
@@ -23,6 +24,56 @@ sub isEnabled {
     return !$params{no_category}->{software};
 }
 
+sub _loadUserSoftware {
+    my (%params) = @_;
+
+    my $inventory = $params{inventory};
+    my $is64bit   = is64bit();
+
+
+    my $lmachine = $Registry->Open('LMachine');
+
+    my $profileList =
+        $lmachine->{"SOFTWARE/Microsoft/Windows NT/CurrentVersion/ProfileList"};
+
+    return unless $profileList;
+
+    $Registry->AllowLoad(1);
+
+    foreach my $profileName (keys %$profileList) {
+        next unless length($profileName) > 10;
+
+        my $profilePath = $profileList->{$profileName}{'/ProfileImagePath'};
+        my $sid = $profileList->{$profileName}{'/Sid'};
+
+        next unless $sid;
+        next unless $profilePath;
+
+        $profilePath =~ s/%SystemDrive%/$ENV{SYSTEMDRIVE}/i;
+
+        my $user = basename($profilePath);
+        my $userKey = $is64bit ?
+            $Registry->Load($profilePath.'\ntuser.dat', { Access=> KEY_READ | KEY_WOW64_64 } ) :
+            $Registry->Load($profilePath.'\ntuser.dat', { Access=> KEY_READ } )                ;
+
+        my $softwares =
+            $userKey->{"SOFTWARE/Microsoft/Windows/CurrentVersion/Uninstall"};
+
+        foreach my $software (_getSoftwares(
+                    softwares => $softwares,
+                    is64bit   => 1,
+                    userid => $sid,
+                    username => $user
+                    )) {
+            _addSoftware(inventory => $inventory, entry => $software);
+        }
+
+    }
+    $Registry->AllowLoad(0);
+
+}
+
+
 sub doInventory {
     my (%params) = @_;
 
@@ -58,6 +109,10 @@ sub doInventory {
             inventory => $inventory,
             is64bit   => 1
         );
+        _loadUserSoftware(
+            inventory => $inventory,
+            is64bit   => 1
+        );
 
         my $machKey32 = $Registry->Open('LMachine', {
             Access => KEY_READ | KEY_WOW64_32 ## no critic (ProhibitBitwise)
@@ -79,6 +134,10 @@ sub doInventory {
             inventory => $inventory,
             is64bit   => 0
         );
+        _loadUserSoftware(
+            inventory => $inventory,
+            is64bit   => 0
+        );
 
 
     } else {
@@ -101,6 +160,11 @@ sub doInventory {
             inventory => $inventory,
             is64bit   => 0
         );
+        _loadUserSoftware(
+            inventory => $inventory,
+            is64bit   => 0
+        );
+
     }
 
     foreach (values %$kbList) {
@@ -130,7 +194,7 @@ sub _getSoftwares {
     my (%params) = @_;
 
     my $softwares = $params{softwares};
-    my $kbList = $params{kbList};
+    my $kbList = $params{kbList} || {};
 
     my @softwares;
 
@@ -164,6 +228,8 @@ sub _getSoftwares {
             NO_REMOVE        => hex2dec($data->{'/NoRemove'}),
             ARCH             => $params{is64bit} ? 'x86_64' : 'i586',
             GUID             => $guid,
+            USERNAME         => $params{username},
+            USERID           => $params{userid},
         };
 
         # Workaround for #415

diff --git a/lib/FusionInventory/Agent/Task/Inventory/Inventory.pm b/lib/FusionInventory/Agent/Task/Inventory/Inventory.pm
@@ -41,7 +41,7 @@ my %fields = (
     SOFTWARES   => [ qw/COMMENTS FILESIZE FOLDER FROM HELPLINK INSTALLDATE NAME
                         NO_REMOVE RELEASE_TYPE PUBLISHER UNINSTALL_STRING 
                         URL_INFO_ABOUT VERSION VERSION_MINOR VERSION_MAJOR 
-                        GUID ARCH/ ],
+                        GUID ARCH USERNAME USERID/ ],
     SOUNDS      => [ qw/CAPTION DESCRIPTION MANUFACTURER NAME/ ],
     STORAGES    => [ qw/DESCRIPTION DISKSIZE INTERFACE MANUFACTURER MODEL NAME
                         TYPE SERIAL SERIALNUMBER FIRMWARE SCSI_COID SCSI_CHID
@@ -63,7 +63,7 @@ my %fields = (
                              DEFAULTGATEWAY VMSYSTEM WINOWNER WINPRODID
                              WINPRODKEY WINCOMPANY WINLANG CHASSIS_TYPE/ ],
     OPERATINGSYSTEM  => [ qw/KERNEL_NAME KERNEL_VERSION NAME VERSION FULL_NAME 
-                            SERVICE_PACK INSTALL_DATE/ ],
+                            SERVICE_PACK INSTALL_DATE FQDN DNS_DOMAIN/ ],
     ACCESSLOG        => [ qw/USERID LOGDATE/ ],
     VIRTUALMACHINES  => [ qw/MEMORY NAME UUID STATUS SUBSYSTEM VMTYPE VCPU
                              VMID MAC COMMENT OWNER/ ],
@@ -1104,6 +1104,14 @@ If the software is in 32 or 64bit, (1/0)
 
 Windows software GUID
 
+=item USERNAME
+
+Name of the owner of the software.
+
+=item USERID
+
+ID of the owner of the software. SID on Windows.
+
 =back
 
 =head2 USERS

diff --git a/lib/FusionInventory/Agent/Tools.pm b/lib/FusionInventory/Agent/Tools.pm
@@ -45,6 +45,8 @@ our @EXPORT = qw(
     delay
 );
 
+my $nowhere = $OSNAME eq 'MSWin32' ? 'nul' : '/dev/null';
+
 # this trigger some errors on Perl 5.12/Win32:
 # Anonymous function called in forbidden scalar context
 if ($OSNAME ne 'MSWin32') {
@@ -231,16 +233,7 @@ sub getFileHandle {
             last SWITCH;
         }
         if ($params{command}) {
-            if ($OSNAME eq 'MSWin32') {
-                FusionInventory::Agent::Tools::Win32->require;
-                (undef, $handle) = FusionInventory::Agent::Tools::Win32::runCommand(
-                        command => $params{command},
-                        no_stderr => 1
-                );
-                if (!$handle) {
-                    return;
-                }
-            } elsif (!open $handle, '-|', $params{command} . " 2>/dev/null") {
+            if (!open $handle, '-|', $params{command} . " 2>$nowhere") {
                 $params{logger}->error(
                     "Can't run command $params{command}: $ERRNO"
                 ) if $params{logger};

diff --git a/lib/FusionInventory/Agent/Tools/Linux.pm b/lib/FusionInventory/Agent/Tools/Linux.pm
@@ -201,7 +201,7 @@ sub getDevicesFromProc {
     my %seen;
     @names = grep { !$seen{$_}++ } @names;
 
-    # extract informations
+    # extract information
     my @devices;
     foreach my $name (@names) {
         my $device = {
@@ -465,7 +465,7 @@ Availables parameters:
 
 =head2 getInfoFromSmartctl(%params)
 
-Returns some informations about a drive, using smartctl.
+Returns some information about a drive, using smartctl.
 
 Availables parameters:
 

diff --git a/lib/FusionInventory/Agent/Tools/Win32.pm b/lib/FusionInventory/Agent/Tools/Win32.pm
@@ -23,6 +23,8 @@ use utf8;
 use File::Temp qw(:seekable tempfile);
 use Win32::Job;
 
+use Cwd;
+
 Win32::OLE->Option(CP => Win32::OLE::CP_UTF8);
 
 use FusionInventory::Agent::Tools;
@@ -179,7 +181,11 @@ sub runCommand {
     my $buff = File::Temp->new();
     my $void = File::Temp->new();
 
-    my ($fh, $filename) = File::Temp::tempfile( "$ENV{TEMP}/fusinvXXXXXXXXXXX", SUFFIX => '.bat');
+    my $winCwd = Cwd::getcwd();
+    $winCwd =~ s{/}{\\}g;
+
+    my ($fh, $filename) = File::Temp::tempfile( "$ENV{TEMP}\\fusinvXXXXXXXXXXX", SUFFIX => '.bat');
+    print $fh "cd \"".$winCwd."\"\r\n";
     print $fh $params{command}."\r\n";
     print $fh "exit %ERRORLEVEL%\r\n";
     close $fh;

diff --git a/t/apps/agent.t b/t/apps/agent.t
@@ -28,7 +28,7 @@ ok($rc == 0, '--version exit status');
 is($err, '', '--version stderr');
 like(
     $out,
-    qr/^FusionInventory unified agent for UNIX, Linux and MacOSX/,
+    qr/^FusionInventory Agent/,
     '--version stdin'
 );
 

diff --git a/t/inventory/bsd/storages.t b/t/inventory/bsd/storages.t
@@ -72,12 +72,12 @@ my %tests_mfiutil = (
     ]
 );
 
-plan tests => scalar keys (%tests) + scalar keys (%tests_mfiutil);
+plan tests => scalar keys (%tests_fstab) + scalar keys (%tests_mfiutil);
 
 foreach my $test (keys %tests_fstab) {
     my $file = "resources/bsd/fstab/$test";
     my @results = FusionInventory::Agent::Task::Inventory::Input::BSD::Storages::_getDevicesFromFstab(file => $file);
-    is_deeply(\@results, $tests{$test}, $test);
+    is_deeply(\@results, $tests_fstab{$test}, $test);
 }
 
 foreach my $test (keys %tests_mfiutil) {