Changeset 1558 for honeyclient/trunk

Timestamp:

04/24/08 17:14:36 (7 months ago)

Author:

kindlund

Message:

Updated Manager to support DB retrieval of URLs for multiple, simultaneous VMs.

Files:

• honeyclient/trunk/lib/HoneyClient/Manager.pm (modified) (5 diffs)
• honeyclient/trunk/lib/HoneyClient/Manager/Database.pm (modified) (1 diff)

honeyclient/trunk/lib/HoneyClient/Manager.pm

@@ -241 +241 @@
-use Data::Dumper;
-
+# 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;
+
-=end testing
-
@@ -264 +274 @@
-# Include Database Libraries
-use HoneyClient::Manager::Database;
+
+# Use Hostname Libraries
+use Sys::Hostname::Long;
+
+# Use HostIP Libraries
+use Sys::HostIP;
-
-# Use Dumper Library
@@ -540 +556 @@
-}
-
+# Helper function designed to get new URLs from the Drone
+# database.  If it's the first attempt at obtaining URLs,
+# then it will ask the Drone database for any existing,
+# pre-assigned URLs.  Otherwise, it will ask the Drone
+# database for new, unassigned URLs.
+#
+# Inputs: first_attempt
+# Outputs: Hashref of (url => priority) pairs.
+sub _get_urls {
+
+    # Extract arguments.
+    my (%args) = @_;
+
+    # Returned argument.
+    my $ret = { };
+
+    # If this is the first attempt, then get any pre-assigned URLs.
+    if ($args{'first_attempt'}) {
+        $ret = HoneyClient::Manager::Database::get_queue_urls_by_hostname(Sys::Hostname::Long::hostname_long);
+    } else {
+        $ret = HoneyClient::Manager::Database::get_new_queue_urls(Sys::Hostname::Long::hostname_long, getVar(name => "num_urls_to_process"));
+    }
+    return $ret;
+}
-
-# Signal handler to help give user immediate feedback during
@@ -644 +684 @@
-    }
-
+    # Register the host system with the database, if need be.
+    if (getVar(name      => "enable",
+               namespace => "HoneyClient::Manager::Database")) {
+
+        my $host = {
+            org => getVar(name => "organization"),
+            hostname => Sys::Hostname::Long::hostname_long,
+            ip => Sys::HostIP->ip,
+        };
+        HoneyClient::Manager::Database::insert_host($host);
+    }
+
-    # If supported, get a URL list from the database.
-    my $remoteLinksExist = 0;
-    my $queue_url_list = {};
-    my $tid = undef;
+    my $first_access_attempt = 1;
-    while (getVar(name      => "enable",
-                  namespace => "HoneyClient::Manager::Database")) {
-        $LOG->info("Waiting for new URLs from database.");
-# TODO: Fix this.
-#$queue_url_list = HoneyClient::Manager::Database::get_queue_urls(getVar(name => "num_urls_to_process"), $vm->database_id)
-
+$queue_url_list = _get_urls(first_attempt => $first_access_attempt);
+$first_access_attempt = 0
+
-        $remoteLinksExist = scalar(%{$queue_url_list});
-        while (!$localLinksExist && !$remoteLinksExist) {
@@ -661 +714 @@
-            # XXX: Trap/ignore all errors and simply retry.
-            eval {
-
-
-
+
-                $remoteLinksExist = scalar(%{$queue_url_list});
-            };

honeyclient/trunk/lib/HoneyClient/Manager/Database.pm

@@ -296 +296 @@
-
-# XXX: Need to comment this further.
-
-
+_by_hostname
+_by_hostname
-    # Results from this call are YAML-encoded; need to deserialize them.
-    return YAML::XS::Load(_AUTOLOAD(@_));
-}
+
+# XXX: Need to comment this further.
+sub get_new_queue_urls {
+    $AUTOLOAD = "Database::get_new_queue_urls";
+    # Results from this call are YAML-encoded; need to deserialize them.
+    return YAML::XS::Load(_AUTOLOAD(@_));
+}
+
-
-# XXX: Need to comment this further.