Changeset 1200

Timestamp:

02/15/08 15:59:44 (6 months ago)

Author:

kindlund

Message:

Added initial logic to have the Manager fetch initial URLs from a centralized database.

Files:

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

honeyclient/trunk/lib/HoneyClient/Manager.pm

@@ -755 +755 @@
-
-    # TODO XXX: Get URL list from database.
+    if ($DB_ENABLE && ($vm->database_id > 0)) {
+        $args{'agent_state'} = get_urls($vm, $args{'agent_state'}, $args{'driver'});
+    }
-
-    # Call updateState() first, to seed initial data.
@@ -777 +780 @@
-        # assume that the Agent's watchdog process will recover.
-        eval {
-
-
-
+#
+#
+#
-
-            # XXX: Delete this, eventually.
-
+
+
+
-
-            print "Calling getStatus()...\n";
@@ -794 +799 @@
-            #print Dumper($ret);
-
+            # Extract current agent state.
+            my @driverNames = keys(%{$ret});
+            my $state = {};
+            foreach my $driverName (@driverNames) {
+                $state->{$driverName} = $ret->{$driverName}->{'state'};
+            }
+            $args{'agent_state'} = encode_base64(nfreeze($state));
+            $globalAgentState = $args{'agent_state'};
+            print "GlobalAgentState:\n";
+            print Dumper(thaw(decode_base64($globalAgentState)));
+
-            # Check to see if Agent::run() thread has stopped
-            # and that a compromise was detected.
@@ -850 +866 @@
-                        $LOG->info("Database Insert Successful.");
-                    }
+                    # The VM should be suspended, at this point.  Clear out the global DB ID, so
+                    # that our cleanup code doesn't re-mark the VM as suspended.
+                    $clientDbId = 0;
+
-                    # Make sure VM is suspended.
-                    $vm = undef;
@@ -992 +1012 @@
-}
-
+sub get_urls {
+    my $vm = shift;
+    my $agent_state = shift;
+    my $driver = shift;
+
+    # Decode and thaw the initial agent state.
+    my $state = thaw(decode_base64($agent_state));
+
+    # XXX: We hardcode the value of 10 URLs to request; this will change, eventually.
+    my $queue_url_list = {};
+    $LOG->info("Retrieving new URLs from database.");
+    $queue_url_list = HoneyClient::Manager::Database::get_queue_urls(10, $vm->database_id);
+    my $remoteLinksExist = scalar(%{$queue_url_list});
+
+    # While we have no local URLs and no URLs from the database, re-query the database.
+    while (!defined($state->{$driver}->{next_link_to_visit}) &&
+           !$remoteLinksExist) {
+
+        # XXX: Hardcoded timeout.
+        sleep (2);
+        $LOG->info("Retrieving new URLs from database.");
+        $queue_url_list = HoneyClient::Manager::Database::get_queue_urls(10, $vm->database_id);
+        $remoteLinksExist = scalar(%{$queue_url_list});
+    }
+
+    # If we do have URLs from the database, then merge them into the agent state.
+    # Note: Priorities specified in the database take precedent over any URLs specified locally.
+    if ($remoteLinksExist) {
+        $state->{$driver}->{links_to_visit} = { %{$state->{$driver}->{links_to_visit}}, 
+                                                %{$queue_url_list} };
+        $agent_state = encode_base64(nfreeze($state));
+    }
+
+    return $agent_state;
+}
+
-#######################################################################
-