Changeset 399

Timestamp:

05/29/07 16:16:47 (1 year ago)

Author:

kindlund

Message:

Finished agent syslog support.

Files:

• honeyclient/branches/exp/kindlund-filesystem/lib/HoneyClient/Agent.pm (modified) (10 diffs)

honeyclient/branches/exp/kindlund-filesystem/lib/HoneyClient/Agent.pm

@@ -114 +114 @@
-    # within the global configuration file.  Or, feed the initialization logic through init() as part of the arguments.
-    @DRIVERS = ( 'IE' );
-# XXX: See if this is still needed.
-    foreach (@DRIVERS) {
-        eval "use HoneyClient::Agent::Driver::Browser::$_";
@@ -229 +228 @@
-use Data::Compare;
-
+# The global logging object.
+our $LOG = get_logger();
+
-# Complete URL of SOAP server, when initialized.
-our $URL_BASE       : shared = undef;
@@ -344 +346 @@
-    # Sanity check.  Make sure the daemon isn't already running.
-    if (defined($DAEMON_PID)) {
+        $LOG->fatal("Error: " . __PACKAGE__ . " daemon is already running (PID = " . $DAEMON_PID .")!");
-        Carp::croak "Error: " . __PACKAGE__ . " daemon is already running (PID = $DAEMON_PID)!\n";
-    }
@@ -407 +410 @@
-        # Make sure the fork was successful.
-        if (!defined($pid)) {
+            $LOG->fatal("Error: Unable to fork child process.\n$!");
-            Carp::croak "Error: Unable to fork child process.\n$!";
-        }
@@ -467 +471 @@
-    # the parent process...
-    if (defined($DAEMON_PID) && ($DAEMON_PID != 0)) {
+        $LOG->error("Killing PID = " . $DAEMON_PID);
-        print STDERR "Killing PID = " . $DAEMON_PID . "\n";
-        # The Win32 version of kill() seems to only respond to SIGKILL(9).
@@ -837 +842 @@
-            # We assume $driver->next() returns defined data.
-            foreach my $resource (keys %{$driver->next()->{resources}}) {
-print "Using Resource: " . $resource . "\n"
+$LOG->info("Driving To Resource: " . $resource)
-            }
-
@@ -854 +859 @@
-            # XXX: Delete this, eventually.
-            if ($driverTargetsChanged) {
-print "Driver targets have changed.\n"
+$LOG->info("Driver targets have changed.")
-                #$Data::Dumper::Terse = 0;
-                #$Data::Dumper::Indent = 1;
@@ -877 +882 @@
-            # For now, we update a scalar called 'is_compromised' within
-            # the $data->{$driverName}->{'status'} sub-hashtable.
-print "Performing Integrity Checks...\n"
+$LOG->info("Performing Integrity Checks.")
-            my $changes = $integrity->check();
-            if (scalar(@{$changes->{registry}}) || 
-                scalar(@{$changes->{filesystem}})) {
-print "Integrity Check: FAILED\n"
+$LOG->warn("Integrity Check: FAILED")
-                $isCompromised = 1;
-            } else {
-print "Integrity Check: PASSED\n"
+$LOG->info("Integrity Check: PASSED")
-            }
-        }
@@ -922 +927 @@
-
-        # TODO: Do proper fault queuing.
-print "FAULT: " . $@ . "\n"
+$LOG->error("FAULT: " . $@)
-    }
-
@@ -1131 +1136 @@
-        if ($proc->{Name} eq $processName) {
-            # TODO: Should this statement be in here?
+            $LOG->warn("Killing Process ID: " . $proc->{ProcessId});
-            Carp::carp "Killing Process ID: " . $proc->{ProcessId} . "\n";
-            Win32::Process::KillProcess($proc->{ProcessId}, 0);