Changeset 1461

Timestamp:

04/04/08 22:21:25 (3 months ago)

Author:

kindlund

Message:

Still working on finalizing new-Agent support inside Clone.

Files:

• honeyclient/branches/exp/kindlund-simpler_agent/etc/honeyclient.xml (modified) (1 diff)
• honeyclient/branches/exp/kindlund-simpler_agent/lib/HoneyClient/Manager/VM/Clone.pm (modified) (18 diffs)
• honeyclient/branches/exp/kindlund-simpler_agent/t/honeyclient_manager_vm_clone.t (modified) (9 diffs)

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

@@ -328 +328 @@
-                /var/log/messages
-            </dhcp_log>
+            <!-- HoneyClient::Manager::VM::Clone Options -->
+            <Clone>
+                <archive_upon_suspend description="If set to 1, then everytime a cloned VM is suspended, a copy of the VM will be archived in the 'snapshot_path' directory.  Set this option to 0, if you discover errors during cloning operations, where the hard disk on the host system is overworked on slow systems." default="1">
+                    1
+                </archive_upon_suspend>
+            </Clone>
-            <!-- HoneyClient::Manager::VM::Test Options -->
-            <Test>

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

@@ -71 +71 @@
-  my $name = $clone->{'name'};
-
-A
-archive(
+Suspend and a
+suspend(perform_archive => 1
-
-  # If you want the cloned VM to be suspended and no longer used,
@@ -315 +315 @@
-use DateTime::HiRes;
-
+# Make sure IO::File loads.
+BEGIN { use_ok('IO::File') or diag("Can't load IO::File package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('IO::File');
+use IO::File;
+
-=end testing
-
@@ -371 +376 @@
-# Include Base64 Libraries
-use MIME::Base64 qw(encode_base64 decode_base64);
+
+# Include IO::File Libraries
+use IO::File;
-
-=pod
@@ -776 +784 @@
-# VM Clone object.
-#
+# Input: hashref
+#
-# Output: The updated Clone $object, reflecting the status change
-# of the clone VM.  Will croak if this operation fails.
@@ -821 +831 @@
-                HoneyClient::Manager::Database::set_client_suspended($self->{'database_id'});
-            } elsif (/suspicious/) {
+                if (!$argsExist || 
+                    !exists($args{'fingerprint'}) ||
+                    !defined($args{'fingerprint'})) {
+
+                    # Croak if no valid argument is supplied.
+                    $LOG->error("Error: No fingerprint argument supplied.");
+                    Carp::croak "Error: No fingerprint argument supplied.";
+                }
+
-                # TODO: Need to implement this properly.
+                $LOG->info("(" . $self->{'name'} . ") - Inserting Fingerprint Into Database.");
+                # Make sure the fingerprint contains a client_id.
+                $args{'fingerprint'}->{'client_id'} = $self->{'database_id'};
+                my $fingerprint_id = undef;
+                eval {
+                    $fingerprint_id = HoneyClient::Manager::Database::insert_fingerprint($args{'fingerprint'});
+                };
+                if ($@ || ($fingerprint_id == 0) || !defined($fingerprint_id)) {
+                    $LOG->warn("(" . $self->{'name'} . ") - Failure Inserting Fingerprint: " . $@);
+                } else {
+                    $LOG->info("(" . $self->{'name'} . ") - Database Insert Successful.");
+                }
-            } elsif (/compromised/) {
-                HoneyClient::Manager::Database::set_client_compromised($self->{'database_id'});
@@ -838 +869 @@
-sub _dumpFingerprint {
-
+    # Get the supplied fingerprint.
+    my ($self, $fingerprint) = @_;
+
-    # Dump the fingerprint to a file, if needed.
-    my $COMPROMISE_FILE = getVar(name => "fingerprint_dump");
@@ -848 +882 @@
-        $Data::Dumper::Terse = 0;
-        $Data::Dumper::Indent = 2;
-vmName
+self->{'name'}
-        print $dump_file Dumper($fingerprint);
-        $dump_file->close();
@@ -1091 +1125 @@
-=pod
-
-archive(
+suspend(perform_archive => $boolean, 
-
-=over 4
-
-
-
+
+
+
-directory, as specified in the <HoneyClient/><Manager/><VM/>
-section of the etc/honeyclient.xml file.
-
-I<Inputs>:
+ B<$boolean> is an optional argument, indicating that the
+Clone object should be archived upon suspend.
- B<$snapshotFile> is an optional argument, indicating the
-full, absolute path and filename of where the snapshot
-file should be stored.
- 
-
+suspended/
-
-I<Notes>:
@@ -1116 +1153 @@
-using ISO8601 date format variables.
-
-destroy
+alter
-expect to perform any additional operations with 
-
+
+
-
-=back
@@ -1144 +1182 @@
-    my $question;
-    $question = prompt("#\n" .
-
+suspend/
-                       "# with a fully functional master VM that has the HoneyClient code\n" .
-                       "# loaded upon boot-up.\n" .
@@ -1158 +1196 @@
-
-        # Archive the clone.
-archive(
-
-
+suspend(perform_archive => 1, 
+
+suspend/
-        sleep (45);
-    
-archive
-archive(snapshot_file => '$snapshot')") or diag("The archive
+operations
+suspend(perform_archive => 1, snapshot_file => '$snapshot')") or diag("The suspend
-   
-        unlink $snapshot;
@@ -1189 +1227 @@
-=cut
-
-archive
+suspend
-
-    # Extract arguments.
@@ -1212 +1250 @@
-    # Sanity checks; check if any args were specified.
-    my $argsExist = scalar(%args);
+    if (!$argsExist || 
+        !exists($args{'perform_archive'}) ||
+        !defined($args{'perform_archive'})) {
+        $args{'perform_archive'} = getVar(name => "archive_upon_suspend");
+    }
-
-    # Extract the VM configuration file.
@@ -1220 +1263 @@
-    $self->{'config'} = undef;
-    
-Archiv
+Suspend
-    my $som = $self->{'_vm_handle'}->suspendVM(config => $vmConfig);
-
-
-
-
-
+
+
+
+
-    } else {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -1302 +1355 @@
-
-# TODO: Fix this.
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        # Connect to daemon as a client.
-        $stub = getClientHandle(namespace => "HoneyClient::Manager::VM");
@@ -1372 +1416 @@
-    my $currentWork;
-    my $finishedWork = {
-$self->{'database_id'
+{
-        'links_visited' => {}, 
-        'links_timed_out' => {},
@@ -1380 +1424 @@
-
-    while (scalar(%{$args{'work'}})) {
+        # Make sure the database_id is set to the client_id.
+        $finishedWork->{'client_id'} = $self->{'database_id'};
-
-        # Extract the highest priority work.
@@ -1396 +1442 @@
-            $LOG->warn("(" . $self->{'name'} . ") - " . $self->{'driver_name'} . " - Integrity Check: FAILED");
-            # XXX: Test this.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } else {
-            $LOG->info("(" . $self->{'name'} . ") - " . $self->{'driver_name'} . " - Integrity Check: PASSED");
+            # If possibile, insert work history.
+            $finishedWork->{'links_visited'}->{$currentWork} = $result->{'time_at'};
+            if (defined($self->{'database_id'})) {
+                $numWorkInserted = HoneyClient::Manager::Database::insert_history_urls($finishedWork);
+                $LOG->info($numWorkInserted . " URL(s) Inserted.");
+            }
-        }
-
-        $finishedWork->{'links_visited'}->{$currentWork} = $result->{'time_at'};
-
-        $numWorkInserted = HoneyClient::Manager::Database::insert_history_urls($finishedWork);
-        $LOG->info($numWorkInserted . " URL(s) Inserted.");
-
-        # Flush the work history, after committing to the database.
-        $finishedWork->{'links_visited'} = {};
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

honeyclient/branches/exp/kindlund-simpler_agent/t/honeyclient_manager_vm_clone.t

@@ -86 +86 @@
-
-# Make sure Storable loads.
-
+ thaw
-require_ok('Storable');
-can_ok('Storable', 'dclone');
-
+
+
+
+
+
+
+
+
+
-
-# Make sure Data::Dumper loads
@@ -128 +136 @@
-require_ok('DateTime::HiRes');
-use DateTime::HiRes;
+
+# Make sure IO::File loads.
+BEGIN { use_ok('IO::File') or diag("Can't load IO::File package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('IO::File');
+use IO::File;
-}
-
@@ -183 +196 @@
-    # Now, kill the VM daemon.
-    HoneyClient::Manager::VM->destroy();
-    # XXX: See if this is still needed.
-    #sleep (10);
-
-    # Create a generic empty clone, with test state data.
@@ -218 +229 @@
-# Kill the child daemon, if it still exists.
-HoneyClient::Manager::VM->destroy();
-# XXX: See if this is still needed.
-#sleep (1);
-
-# Report any failure found.
@@ -251 +260 @@
-    my $question;
-    $question = prompt("#\n" .
-
+suspend/
-                       "# with a fully functional master VM that has the HoneyClient code\n" .
-                       "# loaded upon boot-up.\n" .
@@ -257 +266 @@
-                       "# Your master VM is: " . getVar(name => "master_vm_config", namespace => "HoneyClient::Manager::VM") . "\n" .
-                       "#\n" .
-
+and archiving 
-    if ($question =~ /^y.*/i) {
-
@@ -265 +274 @@
-
-        # Archive the clone.
-archive(
-
-
+suspend(perform_archive => 1, 
+
+suspend/
-        sleep (45);
-    
-archive
-archive(snapshot_file => '$snapshot')") or diag("The archive
+operations
+suspend(perform_archive => 1, snapshot_file => '$snapshot')") or diag("The suspend
-   
-        unlink $snapshot;
@@ -286 +295 @@
-# Kill the child daemon, if it still exists.
-HoneyClient::Manager::VM->destroy();
-# XXX: See if this is still needed.
-#sleep (1);
-
-# Report any failure found.
@@ -297 +304 @@
-
-
+# =begin testing
+{
+# Shared test variables.
+my ($stub, $som, $URL);
+my $testVM = $ENV{PWD} . "/" . getVar(name      => "test_vm_config",
+                                      namespace => "HoneyClient::Manager::VM::Test");
+
+# Catch all errors, in order to make sure child processes are
+# properly killed.
+eval {
+
+    # Pretend as though no other Clone objects have been created prior
+    # to this point.
+    $HoneyClient::Manager::VM::Clone::OBJECT_COUNT = -1;
+    
+    my $question;
+    $question = prompt("#\n" .
+                       "# Note: Testing real drive operations will *ONLY* work\n" .
+                       "# with a fully functional master VM that has the HoneyClient code\n" .
+                       "# loaded upon boot-up.\n" .
+                       "#\n" .
+                       "# Your master VM is: " . getVar(name => "master_vm_config", namespace => "HoneyClient::Manager::VM") . "\n" .
+                       "#\n" .
+                       "# Do you want to test cloning and driving this master VM?", "no");
+    if ($question =~ /^y.*/i) {
+
+        # Create a generic empty clone, with test state data.
+        my $clone = HoneyClient::Manager::VM::Clone->new();
+        my $cloneConfig = $clone->{config};
+
+# TODO: Fix this.
+        $clone = $clone->drive(work => { 'http://www.google.com/' => 1 });
+        isa_ok($clone, 'HoneyClient::Manager::VM::Clone', "drive(work => { 'http://www.google.com/' => 1})") or diag("The drive() call failed.");
+        $clone = undef;
+
+        # Connect to daemon as a client.
+        $stub = getClientHandle(namespace => "HoneyClient::Manager::VM");
+    
+        # Destroy the clone VM.
+        $som = $stub->destroyVM(config => $cloneConfig);
+    }
+};
+
+# Kill the child daemon, if it still exists.
+HoneyClient::Manager::VM->destroy();
+
+# Report any failure found.
+if ($@) {
+    fail($@);
+}
+}
+
+
+
-
-1;