Changeset 1083

Timestamp:

12/19/07 08:28:41 (8 months ago)

Author:

xkovah

Message:

checking in the changed manager behavior(hopefully suspending the VM after it loses connectivity with the agent) to test with the real manager (as opposed to my local-running-only copy)

Files:

• honeyclient/trunk/etc/honeyclient.xml (modified) (2 diffs)
• honeyclient/trunk/lib/HoneyClient/Manager.pm (modified) (3 diffs)

honeyclient/trunk/etc/honeyclient.xml

@@ -101 +101 @@
-                </limit_spidering>
-                <max_relative_links_to_visit description="An integer, representing the maximum number of relative links that the browser should visit, before moving onto another website.  If negative, then the browser will exhaust all possible relative links found, before moving on.  This functionality is best effort; it's possible for the browser to visit new links on previously visited websites. Note that this value can be overridden if limit_spidering is set to 1 above." default="-1">
-5
+-1
-                </max_relative_links_to_visit>
-                <positive_words description="If a link contains any number of these words, then its probability of being visited (its score) will increase.">
@@ -374 +374 @@
-            etc/honeyclient_log.conf
-        </conffile>
+        <max_agent_error_count description="The maximum number of time the fault handler can be called for an Agent that the Manager has a SOAP connection to, before the VM is suspended and the Manager moves on. This is mostly to address the case where the Manager loses connectivity to the Agent (for instance due to the VM or Agent itself crashing) where if action is not taken, it will loop forever trying to connect to the Agent. This value should never be set to 0 and should always be positive." default="3">
+            3
+        </max_agent_error_count>
-        <!-- HoneyClient::Manager::FW Options -->
-        <FW>

honeyclient/trunk/lib/HoneyClient/Manager.pm

@@ -366 +366 @@
-our $globalAgentState   = undef;
-
+
+#This variable is used to count how many times stubAgent's fault
+#handler has been called, so that special actions can be taken if
+#it is called too many times (for instance when Manager loses 
+#connectivity with the Agent it would otherwise loop and get errors
+#forever if some action isn't taken)
+#NOTE: This will have to be changed to be agent/vm-specific in the
+#future when we have multiple Agents interacting with a single 
+#Manager.
+our $globalAgentErrorCount;
+
-# Temporary variable, used to indicate to the fault handler whether
-# or not errors/warnings should be suppressed.
@@ -451 +462 @@
-# Private Methods Implemented                                         #
-#######################################################################
+
+sub _agentHandleFault {
+
+    # Extract arguments.
+    my ($class, $res) = @_;
+
+
+    #NOTE: In the future we may want to have this check first to see if
+    #the error is specific to a failed connection (by regexing the error
+    #message. But for now, we have no evidence that multiple errors will
+    #occur in other circumstances.
+    $globalAgentErrorCount++;
+
+
+    # Construct error message.
+    # Figure out if the error occurred in transport or over
+    # on the other side.
+    my $errMsg = $class->transport->status; # Assume transport error.
+
+    if (ref $res) {
+        $errMsg = $res->faultcode . ": ".  $res->faultstring . "\n";
+    }
+
+    if (!$SUPPRESS_ERRORS) {
+        $LOG->warn("Error occurred during processing. " . $errMsg);
+        Carp::carp __PACKAGE__ . "->_handleFault(): Error occurred during processing.\n" . $errMsg;
+    }
+}
-
-sub _handleFault {
@@ -1014 +1053 @@
-        if ($vmCompromised) {
-            # Reset the FW state table. 
-
+
+
+
+
+
+
-            return $args{'agent_state'};
-        }