Changeset 1450

Timestamp:

04/03/08 17:07:10 (3 months ago)

Author:

kindlund

Message:

Starting integration of new Agent code inside Manager code.

Files:

• honeyclient/branches/exp/kindlund-simpler_agent/etc/honeyclient.xml (modified) (1 diff)
• honeyclient/branches/exp/kindlund-simpler_agent/lib/HoneyClient/Agent.pm (modified) (1 diff)
• honeyclient/branches/exp/kindlund-simpler_agent/lib/HoneyClient/Manager/Database.pm (modified) (1 diff)
• honeyclient/branches/exp/kindlund-simpler_agent/lib/HoneyClient/Manager/VM/Clone.pm (modified) (11 diffs)

honeyclient/branches/exp/kindlund-simpler_agent/etc/honeyclient.xml

@@ -302 +302 @@
-        <VM>
-            <master_vm_config description="The full absolute path to the VM configuration file on the host system that will be used by all subsequent cloned VMs.">
-6
+7
-            </master_vm_config>
-            <port description="The TCP port number that the SOAP server of the VM daemon will listen on for requests.  Note: This port should be unique and not already be used by other modules, services, or daemons running on the host system." default="8089">

honeyclient/branches/exp/kindlund-simpler_agent/lib/HoneyClient/Agent.pm

@@ -38 +38 @@
-=head1 VERSION
-
-
+
-
-=head1 SYNOPSIS

honeyclient/branches/exp/kindlund-simpler_agent/lib/HoneyClient/Manager/Database.pm

@@ -344 +344 @@
-=head1 COPYRIGHT & LICENSE
-
-
+7-200
-
-This program is free software; you can redistribute it and/or

honeyclient/branches/exp/kindlund-simpler_agent/lib/HoneyClient/Manager/VM/Clone.pm

@@ -238 +238 @@
-use HoneyClient::Manager::VM;
-
+# Make sure HoneyClient::Manager::Database loads.
+BEGIN { use_ok('HoneyClient::Manager::Database') or diag("Can't load HoneyClient::Manager::Database package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('HoneyClient::Manager::Database');
+use HoneyClient::Manager::Database;
+
-# Make sure VMware::VmPerl loads.
-BEGIN { use_ok('VMware::VmPerl', qw(VM_EXECUTION_STATE_ON VM_EXECUTION_STATE_OFF VM_EXECUTION_STATE_STUCK VM_EXECUTION_STATE_SUSPENDED)) or diag("Can't load VMware::VmPerl package.  Check to make sure the package library is correctly listed within the path."); }
@@ -287 +292 @@
-use File::Basename qw(dirname basename);
-
+# Make sure Sys::Hostname loads.
+BEGIN { use_ok('Sys::Hostname') or diag("Can't load Sys::Hostname package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('Sys::Hostname');
+use Sys::Hostname;
+
+# Make sure Sys::HostIP loads.
+BEGIN { use_ok('Sys::HostIP') or diag("Can't load Sys::HostIP package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('Sys::HostIP');
+use Sys::HostIP;
+
+# Make sure DateTime::HiRes loads.
+BEGIN { use_ok('DateTime::HiRes') or diag("Can't load Sys::HostIP package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('DateTime::HiRes');
+use DateTime::HiRes;
+
-=end testing
-
@@ -325 +345 @@
-our $LOG = get_logger();
-
+# Use Hostname Libraries
+use Sys::Hostname::Long;
+
+# Use HostIP Libraries
+use Sys::HostIP;
+
+# Use DateTime::HiRes Libraries
+use DateTime::HiRes;
+
-# The global variable, used to count the number of
-# Clone objects that have been created.
-our $OBJECT_COUNT : shared = -1;
+
+# Include Database Libraries
+use HoneyClient::Manager::Database;
-
-=pod
@@ -390 +422 @@
-
-The ID of the VM instance, if it is stored within the Drone database.
+
+=back
+
+=head2 status
+
+=over 4
+
+The status of the cloned VM.
+
+=back
+
+=head2 driver_name
+
+=over 4
+
+The Driver assigned to this cloned VM.
-
-=back
@@ -496 +544 @@
-            $LOG->error("Unable to suspend VM (" . $self->{'config'} . ").");
-        }
-
-    }
-
@@ -593 +640 @@
-        }
-    }
+    $self->_changeStatus(status => "initialized");
-
-    # Wait until the VM gets registered, before proceeding.
@@ -606 +654 @@
-        }
-    }
+    $self->_changeStatus(status => "registered");
-
-    # Once registered, check if the VM is ON yet.
@@ -619 +668 @@
-        }
-    }
+    $self->_changeStatus(status => "running");
-
-    # Now, get the VM's MAC address.
@@ -655 +705 @@
-
-        eval {
-Status(
+Properties(driver_name => $self->{'driver_name'}
-            $ret = $som->result();
-        };
@@ -666 +716 @@
-        if (!defined($ret)) {
-            sleep ($self->{'_retry_period'});
+        } elsif (getVar(name      => "enable",
+                        namespace => "HoneyClient::Manager::Database")) {
+            # Register the cloned VM with the Drone database.
+            my $dt = DateTime::HiRes->now(time_zone => "local");
+    
+            # Construct the 'Client' object.
+            my $client = {
+                cid => $self->{'name'},
+                status => $self->{'status'},
+                host => {
+                    org => getVar(name => "organization"),
+                    hostname => Sys::Hostname::Long::hostname_long,
+                    ip => Sys::HostIP->ip,
+                },
+                os => $ret,
+                start => $dt->ymd('-').'T'.$dt->hms(':'),
+            };
+            $self->{'database_id'} = HoneyClient::Manager::Database::insert_client($client);
-        }
+    }
+
+    return $self;
+}
+
+# TODO: Comment this.
+# XXX: Should this be made public?
+sub _changeStatus {
+
+    # Extract arguments.
+    my ($self, %args) = @_;
+
+    # Sanity check: Make sure we've been fed an object.
+    unless (ref($self)) {
+        $LOG->error("Error: Function must be called in reference to a " .
+                    __PACKAGE__ . "->new() object!");
+        Carp::croak "Error: Function must be called in reference to a " .
+                    __PACKAGE__ . "->new() object!";
+    }
+
+    # Sanity check.  Make sure we get a valid argument.
+    my $argsExist = scalar(%args);
+    if (!$argsExist || 
+        !exists($args{'status'}) ||
+        !defined($args{'status'})) {
+
+        # Croak if no valid argument is supplied.
+        $LOG->error("Error: No status argument supplied.");
+        Carp::croak "Error: No status argument supplied.";
+    }
+
+    # Don't change the status field for any VM that has been marked
+    # as suspicious or compromised.
+    if (($self->{'status'} ne "suspicious") &&
+        ($self->{'status'} ne "compromised")) {
+        $self->{'status'} = $args{'status'};
-    }
-
@@ -847 +951 @@
-        # A variable containing the database identifier, if any is specified.
-        database_id => undef,
-
+
+
+
+
+
+
+
+
-        # A SOAP handle to the VM manager daemon.  (This internal variable
-        # should never be modified externally.)