Changeset 1443

Timestamp:

04/03/08 15:22:02 (5 months ago)

Author:

kindlund

Message:

Finalized light-weight Agent design. Additional Housekeeping.

Files:

• honeyclient/branches/exp/kindlund-simpler_agent/foo.pl (deleted)
• honeyclient/branches/exp/kindlund-simpler_agent/lib/HoneyClient/Agent.pm (modified) (6 diffs)
• honeyclient/branches/exp/kindlund-simpler_agent/t/honeyclient_agent.t (modified) (2 diffs)
• honeyclient/branches/exp/kindlund-simpler_agent/t/honeyclient_agent_driver.t (deleted)
• honeyclient/branches/exp/kindlund-simpler_agent/t/honeyclient_agent_driver_activecontent.t (deleted)
• honeyclient/branches/exp/kindlund-simpler_agent/t/honeyclient_agent_driver_activecontent_flash.t (deleted)
• honeyclient/branches/exp/kindlund-simpler_agent/t/honeyclient_agent_driver_browser.t (deleted)
• honeyclient/branches/exp/kindlund-simpler_agent/t/honeyclient_agent_driver_browser_ff.t (deleted)
• honeyclient/branches/exp/kindlund-simpler_agent/t/honeyclient_agent_driver_browser_ie.t (deleted)

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

@@ -102 +102 @@
-  my $som;
-
+  # Get the properties of the Agent OS and driven application.
+  $som = $stub->getProperties(driver_name => "HoneyClient::Agent::Driver::Browser::IE");
+  print Dumper($som->result()) . "\n";
+
-  # Drive HoneyClient::Agent::Driver::Browser::IE to a website.
-  $som = $stub->drive(driver_name => "HoneyClient::Agent::Driver::Browser::IE",
@@ -269 +273 @@
-use DateTime::HiRes;
-
+# Make sure Data::Dumper loads.
+BEGIN { use_ok('Data::Dumper') or diag("Can't load Data::Dumper package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('Data::Dumper');
+use Data::Dumper;
+
-BEGIN {
-
@@ -312 +321 @@
-use HoneyClient::Util::Config qw(getVar);
-
-XXX: Remove this, eventually.
+Include Dumper Library
-use Data::Dumper;
-
@@ -518 +527 @@
-        $LOG->debug("Destroying Agent daemon at PID: " . $DAEMON_PID);
-        
-        # TODO: Need unit tests.
-        require Win32::Process;
-        Win32::Process::KillProcess($DAEMON_PID, 0);
@@ -555 +563 @@
-=head1 EXTERNAL SOAP FUNCTIONS
-
-
-
-
+
-
-=over 4
@@ -1454 +1460 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#######################################################################

honeyclient/branches/exp/kindlund-simpler_agent/t/honeyclient_agent.t

@@ -106 +106 @@
-require_ok('DateTime::HiRes');
-use DateTime::HiRes;
+
+# Make sure Data::Dumper loads.
+BEGIN { use_ok('Data::Dumper') or diag("Can't load Data::Dumper package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('Data::Dumper');
+use Data::Dumper;
-
-BEGIN {
@@ -862 +867 @@
-
-
+# =begin testing
+{
+# Check to make sure we're in a suitable environment.
+use Config;
+SKIP: {
+    skip 'HoneyClient::Agent only works in Cygwin environment.', 5 if ($Config{osname} !~ /^cygwin$/);
+
+    # Shared test variables.
+    my ($stub, $som, $URL);
+
+    # Catch all errors, in order to make sure child processes are
+    # properly killed.
+    eval {
+
+        $URL = HoneyClient::Agent->init();
+
+        # Connect to daemon as a client.
+        $stub = getClientHandle(namespace => "HoneyClient::Agent",
+                                address   => "localhost");
+
+        # Drive the Agent using IE.
+        $som = $stub->getProperties(driver_name => "HoneyClient::Agent::Driver::Browser::IE");
+
+        # Verify output.
+        my $output = $som->result();
+
+        # Check to see if the operation completed properly. 
+        ok($output, "getProperties(driver_name => 'HoneyClient::Agent::Driver::Browser::IE')") or diag("The getProperties() call failed.");
+        ok(exists($output->{'shortname'}), "getProperties(driver_name => 'HoneyClient::Agent::Driver::Browser::IE')") or diag("The drive() call failed.");
+        ok(exists($output->{'version'}), "getProperties(driver_name => 'HoneyClient::Agent::Driver::Browser::IE')") or diag("The drive() call failed.");
+        ok(exists($output->{'name'}), "getProperties(driver_name => 'HoneyClient::Agent::Driver::Browser::IE')") or diag("The drive() call failed.");
+        ok(exists($output->{'os_applications'}), "getProperties(driver_name => 'HoneyClient::Agent::Driver::Browser::IE')") or diag("The drive() call failed.");
+
+    };
+
+    # Kill the child daemon, if it still exists.
+    HoneyClient::Agent->destroy();
+
+    # Report any failure found.
+    if ($@) {
+        fail($@);
+    }
+}
+}
+
+
+
-
-1;