Changeset 38

Timestamp:

11/29/06 05:28:05 (2 years ago)

Author:

kindlund

Message:

experimental support to move integrity baselining into the Agent::init() function, rather than have it be called multiple times in the Agent::run() threads

Files:

• honeyclient/branches/bug/42/lib/HoneyClient/Agent.pm (modified) (4 diffs)

honeyclient/branches/bug/42/lib/HoneyClient/Agent.pm

@@ -237 +237 @@
-    getVar(name => "perform_integrity_checks");
-
+# A globally shared, serialized hashtable, containing the
+# initialized integrity state of the VM -- ready to be checked
+# against, at any time.
+our $integrityState : shared = undef;
+
-# A globally shared, serialized hashtable, containing data per
-# registered driver.  Specifically, for each @DRIVER <entry>,
@@ -359 +364 @@
-        $driverUpdateQueues{$driverName} = new Thread::Queue;
-    }
+
+    # Perform initial integrity baseline check.
+    my $integrity = undef;
+    if ($PERFORM_INTEGRITY_CHECKS) {
+        print "Initializing Integrity Check...\n";
+        # TODO: Initialize Integrity Checks
+        $integrity = HoneyClient::Agent::Integrity->new();
+        $integrity->initAll();
+    }
+    $integrityState = nfreeze($integrity);
-
-    # Release data lock.
@@ -688 +703 @@
-            eval {
-
-                my $integrity = undef;
-                if ($PERFORM_INTEGRITY_CHECKS) {
-                    print "Initializing Integrity Check...\n";
-                    # TODO: Initialize Integrity Checks
-                    $integrity = HoneyClient::Agent::Integrity->new();
-                    $integrity->initAll();
-                }
- 
-                ###################################
-                ### Driver Initialization Phase ###
-                ###################################
+
+                # Initially set local integrity object to undef.
+                my $integrity = undef;
-                
-                # Initially set all driver objects to undef. 
@@ -705 +715 @@
-                # Acquire lock on stored driver state.
-                $data = _lock();
+
+                if ($PERFORM_INTEGRITY_CHECKS) {
+                    # XXX: WARNING - The $integrityState object data is NOT thread-safe
+                    # (since it relies on external data stored on the file system).
+                    # As such, do NOT try to call integrity checks on multiple, simultaneous
+                    # asynchronous threaded drivers.
+                    $integrity = thaw($integrityState);
+                }
-
-                # Now, initialize each driver object.