Changeset 1129

Timestamp:

01/25/08 17:30:47 (7 months ago)

Author:

kindlund

Message:

Updated Manager and Database code to reflect changes to Ruby webservice API.

Files:

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

honeyclient/trunk/lib/HoneyClient/Manager.pm

@@ -590 +590 @@
-
-        # Mark the VM as suspended within the database.
-#my $num_urls_inserted = 
+
-    }
-
@@ -728 +728 @@
-    # Note: We assume our VM has a single MAC address
-    # and a single IP address.
-#    $vmStateTable->{$vmName}->{sources}->{$vmMAC}->{$vmIP} = {
-    $vmStateTable->{$vm->name}->{sources}->{$vm->mac_address}->{$vm->ip_address} = {
-        # XXX: We assume we can't pinpoint what source TCP ports the
@@ -752 +751 @@
-    # Recreate the client stub; handle faults.
-    $stubAgent = getClientHandle(namespace     => "HoneyClient::Agent",
-#                                 address       => $vmIP,
-                                 address       => $vm->ip_address,
-                                 fault_handler => \&_handleFaultAndCleanup);
@@ -764 +762 @@
-    # Recreate the client stub; ignore faults.
-    $stubAgent = getClientHandle(namespace     => "HoneyClient::Agent",
-#                                 address       => $vmIP,
-                                 address       => $vm->ip_address,
-                                 fault_handler => \&_agentHandleFault);
@@ -953 +950 @@
-    $LOG->info("agent_state = " . Data::Dumper::Dumper($agent_state));
-
+    # XXX: We should delete the URLs from agent_state after successfully committing them into the database.
+
-    my $num_urls_inserted = HoneyClient::Manager::Database::insert_history_urls($agent_state->{$agent_driver});
-    $LOG->info($num_urls_inserted . " URL(s) Inserted.");

honeyclient/trunk/lib/HoneyClient/Manager/Database.pm

@@ +1 @@
+#######################################################################
+# Created on:  Jan 25, 2008
+# Package:     HoneyClient::Manager::Database
+# File:        Database.pm
+# Description: XML-RPC client interface to access HoneyClient data within
+#              the Hive web service.
+#
+# CVS: $Id: Database.pm 994 2007-11-08 20:30:12Z kindlund $
+#
+# @author mbriggs, kindlund
+#
+# Copyright (C) 2008 The MITRE Corporation.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, using version 2
+# of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+#######################################################################
+
+=pod
+
+=head1 NAME
+
+HoneyClient::Manager::Database - Perl extension to provide an abstract
+interface for storing/accessing HoneyClient within the Hive web service.
+
+=head1 VERSION
+
+This documentation refers to HoneyClient::Manager::Database version 1.00.
+
+=head1 SYNOPSIS
+
+  # XXX: Need to fill this in.
+
+=head1 DESCRIPTION
+
+This library is an abstract interface to access and store HoneyClient
+data within the Hive web service.
+
+# XXX: Need further descriptions.
+
+=cut
+
+package HoneyClient::Manager::Database;
+
-use strict;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-use YAML;
+
+# Make sure XML::RPC loads.
+BEGIN { use_ok('XML::RPC') or diag("Can't load XML::RPC package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('XML::RPC');
-use XML::RPC;
-
+
+
+
+
-use Data::Dumper;
+
+# Make sure Data::Structure::Util loads.
+BEGIN { use_ok('Data::Structure::Util', qw(unbless)) or diag("Can't load Data::Structure::Util package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('Data::Structure::Util');
+can_ok('Data::Structure::Util', 'unbless');
-use Data::Structure::Util;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-our $AUTOLOAD;
-
+# Include Logging Library
+use Log::Log4perl qw(:easy);
+
+# The global logging object.
+our $LOG = get_logger();
+
+#######################################################################
+# Public Methods Implemented                                          #
+#######################################################################
+
+# Helper function designed to programmatically call the Hive web service,
+# based upon arbitrary inputs given.
+#
+# For example, this call:
+# my $output = HoneyClient::Manager::Database::foo($bar);
+#
+# ... will contact the Hive web service using the "foo" function name
+# and supply the hashtable reference, specified by $bar.
+#
+# Note: Errors generated by the web service call will be propagated back
+# in the form of croaked exceptions.
+# 
+# Inputs: the hashtable or object to send 
+# Outputs: the returned data from the web service
-sub AUTOLOAD {
-    my $obj = shift;
@@ -16 +235 @@
-    my $name = $AUTOLOAD;
-    $name =~  s/.*://;
-
+
+
+
-    my $xmlrpc = XML::RPC->new('http://172.16.164.103:3000/hc_database/api');
-    
-    my $ret = $xmlrpc->call($name,$obj_yaml);
-
-    # XXX: Make this more robust.
-    # Need to check if arguments are like "faultCode" or "errString", I believe.
-    # Error checking.
-
-
+
+
+
-    }
-
@@ -31 +250 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-1;
+
+#######################################################################
+# Additional Module Documentation                                     #
+#######################################################################
+
+__END__
+
+=head1 BUGS & ASSUMPTIONS
+
+# XXX: Fill this in.
+
+=head1 SEE ALSO
+
+L<perltoot/"Autoloaded Data Methods">
+
+L<http://www.honeyclient.org/trac>
+
+=head1 REPORTING BUGS
+
+L<http://www.honeyclient.org/trac/newticket>
+
+=head1 AUTHORS
+
+Matt Briggs, E<lt>mbriggs@mitre.orgE<gt>
+
+Darien Kindlund, E<lt>kindlund@mitre.orgE<gt>
+
+=head1 COPYRIGHT & LICENSE
+
+Copyright (C) 2008 The MITRE Corporation.  All rights reserved.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation, using version 2
+of the License.
+ 
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+ 
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.
+
+
+=cut