Changeset 601

Timestamp:

06/21/07 16:37:41 (1 year ago)

Author:

kindlund

Message:

Merged DB branch back into trunk.

Files:

• honeyclient/trunk/bin/install_honeyclient_db.pl (modified) (1 diff, 1 prop)
• honeyclient/trunk/etc/honeyclient.xml (modified) (1 diff)
• honeyclient/trunk/etc/honeyclient_log.conf (modified) (1 diff)
• honeyclient/trunk/lib/HoneyClient/DB.pm (modified) (21 diffs, 1 prop)
• honeyclient/trunk/lib/HoneyClient/DB/File.pm (modified) (2 diffs, 1 prop)
• honeyclient/trunk/lib/HoneyClient/DB/Fingerprint.pm (modified) (1 prop)
• honeyclient/trunk/lib/HoneyClient/DB/Note.pm (modified) (2 diffs, 1 prop)
• honeyclient/trunk/lib/HoneyClient/DB/Regkey.pm (modified) (1 diff, 1 prop)

honeyclient/trunk/bin/install_honeyclient_db.pl

@@ -1 @@
-
+
+
+
+
-use strict;
+use warnings;
+use Carp ();
-
+use ExtUtils::MakeMaker qw(prompt);
+use Net::IP qw(ip_is_ipv4);
-use DBI;
+use DBI::Const::GetInfoType;
-use HoneyClient::Util::Config qw(getVar);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-my $host = getVar(name => "host", namespace => "HoneyClient::DB");
-my $user = getVar(name => "user", namespace => "HoneyClient::DB");
-my $pass = getVar(name => "pass", namespace => "HoneyClient::DB");
-my $database_name = getVar(name => "dbname", namespace => "HoneyClient::DB");
+my ($question, $root_password);
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-eval {
-    # Connect and Create Database
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-    $dbh->disconnect() if $dbh;
-};
-if ($@) {
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
-print "Database and user installed successfully.\n";
-
-# Retrieve a password from the user while hiding it from the display
-sub retrieve_pw {
-    my $p;
-    print "Please enter your database 'root' password: ";
-    system("stty -echo");
-    chomp($p=<STDIN>);
-    print "\n";
-    system("stty echo");
-    return $p;
-}
-
-my $re_ip_num = qr{([01]?\d\d?|2[0-4]\d|25[0-5]|%)};
-my $re_ip = qr{^$re_ip_num\.$re_ip_num\.$re_ip_num\.$re_ip_num$};
-
-sub get_mgr_addr {
-    print "Will the database and the manager run on the same system? [yes] ";
-    while(1) {
-        my $in;
-        chomp($in = <STDIN>);
-        if ($in eq "" or $in eq "yes") {
-            return "";
-        }
-        elsif ($in eq "no") {
-            print "Enter the address the manager will connect from.\n".
-                "(wildcard is %): ";
-            while (1) {
-                my $addr;
-                chomp($addr = <STDIN>);
-                print "\n";
-                # TODO: Need to check for a valid IP address/netmask.
-                #if ($addr =~ /$re_ip/) {
-                    return $addr;
-                #}
-                print "Invalid Entry. Enter the manager address: ";
-            }
-        }
-        else {
-            print "Invalid Entry. (type yes or no): ";
-        }
-    }
-}

honeyclient/trunk/etc/honeyclient.xml

@@ -301 +301 @@
-        </enable>
-        <host description="The system providing the HoneyClient database.  If the database is installed on the same host system as the Manager, then localhost should be used." default="127.0.0.1">
-   
+    
-        </host>
-        <dbname description="The name of the HoneyClient database." default="HoneyClient">

honeyclient/trunk/etc/honeyclient_log.conf

@@ -63 +63 @@
-# Screen Logging Settings
-#log4perl.logger.HoneyClient.Agent.Integrity.Registry=DEBUG, Screen
+#log4perl.logger.HoneyClient.DB=DEBUG, Screen
-# Suppress Parser Debugging Messages
-#log4perl.logger.HoneyClient.Agent.Integrity.Registry.Parser=INFO, Screen

honeyclient/trunk/lib/HoneyClient/DB.pm

@@ -3 +3 @@
-# Package:     HoneyClient::DB
-# File:        DB.pm
-
+
+
-#
-# CVS: $Id$
@@ -15 +16 @@
-# 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
@@ -28 +29 @@
-#######################################################################
-
+=pod
+
-=head1 NAME
-
-
+
+
+
+
+
+
-
-=head1 SYNOPSIS
-
-
-
-
-
+
+
+
+
+
-  use HoneyClient::DB;
-  package HoneyClient::DB::SuperHero::Ability;
-  use base("HoneyClient::DB");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  package HoneyClient::DB::SuperHero;
-  use base("HoneyClient::DB");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  use HoneyClient::DB::SuperHero;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          {
-=> 'Super Strength
-=> 'More powerful than a locomotive'
+         => 'Flight
+  => "It's a bird, it's a plane."
-          },
-          {
-=> 'Flight
-description => 'It's a bird, it's a plane...',
+         => 'Heat Vision
+recharge_time => 5, # in seconds
-          },
-
-
-
-
-
+
-  };
-
-
+
+
+
+
+
+
+
+
-  
-
-
+
-  my $filter = {
-      name => 'Superman',
-  };
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-=head1 DESCRIPTION
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-=cut
@@ -135 +332 @@
-package HoneyClient::DB;
-
+use Data::Dumper qw(Dumper);
-use strict 'vars', 'subs';
-use warnings;
-
-BEGIN {
+
-    #Dependencies
-    use DBI;
@@ -144 +343 @@
-    use HoneyClient::Util::Config;
-    use DateTime::Format::ISO8601;
-
-
-
+
+
+
+
-
-    # Traps signals, allowing END: blocks to perform cleanup.
-    use sigtrap qw(die untrapped normal-signals error-signals);
-
+   
-
-    #Globals
-
+   
-    our @EXPORT = qw();
-    our @EXPORT_OK;
-    our $VERSION = 0.9;
-
-
-
+
+
+
+
+
-
-our $dbhandle;
+
-# To be used ONLY INTERNALLY!
-
+
+
-# %fields must be defined by all children classes
-our %fields;
-
-#constants
-
-
+
+
+
+
-our $debug = 0;
+
-# Initialize Connection
-our %config;
-$config{driver} = "mysql";
-= getVar(name => "host", namespace => "HoneyClient::DB"
-= getVar(name => "port", namespace => "HoneyClient::DB"
-= getVar(name => "user", namespace => "HoneyClient::DB"
-= getVar(name => "pass", namespace => "HoneyClient::DB"
-name => "dbname", namespace => "HoneyClient::DB"
-
-!db_exists(%config)
+  = getVar( name => "host", namespace => "HoneyClient::DB" 
+  = getVar( name => "port", namespace => "HoneyClient::DB" 
+  = getVar( name => "user", namespace => "HoneyClient::DB" 
+  = getVar( name => "pass", namespace => "HoneyClient::DB" 
+ name => "dbname", namespace => "HoneyClient::DB" 
+
+ !db_exists(%config) 
-    die;
-}
@@ -188 +396 @@
-}
-
+=pod
+
-=head1 METHODS
-
@@ -194 +404 @@
-=over 4
-
- HoneyClient::DB
-
-new 
+
+
+
-required fields contain the proper data, and returns the blessed object.
-
@@ -203 +413 @@
-
-  $my_obj = new HoneyClient::DB::SomeObj->new({
- 
- 
+        
+        
-  });
-
@@ -210 +420 @@
-
-sub new {
-
-
-
+
+
+
+
-    # Check if Schema has been imported
-
-
-
+
+
-    # Make sure required Attributes are set. Fail if not.
-
-
-
+
+
+
+
+
+
+
+
-    }
-
-    # Check if ref and array objects have been initialized. If not call new
-
-
-
-
+
+
+
+
+
-            }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-            my $childClass = $2;
-$childClass->can('new')
-   if( $ref eq 'HASH' and $childType eq 'ref'
-$self->{$key}
+ $childClass->can('new') 
+    if ( $ref eq 'HASH' and $childType eq 'ref' 
+ $self->{$key} 
-                }
-$ref eq 'ARRAY' and $childType eq 'array'
-       foreach my $obj (@{$self->{$key}}
-   
-   
+ $ref eq 'ARRAY' and $childType eq 'array' 
+        foreach my $obj ( @{ $self->{$key} } 
+    
+    
-                }
-           
+            
-            else {
-
+
+
-            }
-        }
@@ -258 +476 @@
-
-sub _check_required {
-
+ 
-    my $class = ref $self;
+
-    # make sure field is not undef if 'required' option is set
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-    return;
@@ -272 +492 @@
-
-sub _import_schema {
-
-
+
+
+
-    # Parase Attributes; store types and options.
-(my ($type,$attrib) = each(%$schema)
+ ( my ( $type, $attrib ) = each(%$schema) 
-        my $ref = ref $attrib;
+
-        # Attributes in array format use default options
-($ref eq 'ARRAY'
-@{$attrib}
-=
-$type =~ m/(ref|array)/
+ ( $ref eq 'ARRAY' 
+ @{$attrib} 
+ = 
+ $type =~ m/(ref|array)/ 
-                    delete $_types{$class};
-
-
+
+
+
+
-                }
- or
- 
+
+or
-            }
-        }
+
-        # Parse options for attributes in hash table format
-$ref eq 'HASH'
-my ($a,$opts) = each %$attrib
+ $ref eq 'HASH' 
+ my ( $a, $opts ) = each %$attrib 
-                $_types{$class}{$a} = $type;
-$opts->{required}
+ $opts->{required} 
-                    $_required{$class}{$a} = 1;
-                }
+
-                # array and ref types require the objclass option
-$type =~ m/^(array|ref)$/
-   die "$1 of unknown class: $a" if(!exists $opts->{objclass});
-if (!exists $_types{$opts->{objclass}}) {
-_import_schema($opts->{objclass})
+ $type =~ m/^(array|ref)$/ 
+    if ( !exists $opts->{objclass} ) {
+    $LOG->fatal("$1 of unknown class: $a");
+Carp::croak "$1 of unknown class: $a"
-                    }
-
+
+
+
+
-                }
+
-                # Check function will ensure data is of proper format
-$opts->{check_func}
+ $opts->{check_func} 
-                    $_check{$class}{$a} = $opts->{check_func};
-                }
-                else {
- or
- 
+
+or
-                }
+
-                # key option determines if attribute is an index
-$opts->{key}
-   
+ $opts->{key} 
+    
-                }
-$opts->{init_val}
-   
+ $opts->{init_val} 
+    
-                }
-            }
-        }
-        else {
-
-
-
+
+
+
+
-    # Add the table to the DB if necessary
-    # TODO: Move to install script??
-
-
+
+
+
+
-}
-
@@ -345 +579 @@
-  $my_obj->insert();
-
+B<Input>
+
+There are no parameters, however the calling object is used as input for the
+insert operation.
+
+B<Return Value>
+
+Returns the 'id' of the (parent) object inserted.
+
-=cut
-
-sub insert {
-    my $obj = shift;
-
-
+ 
+
-    $dbhandle = HoneyClient::DB::_connect(%config);
+
-    # Attempt insert; commit if succeeds, else rollback
-
-
-
-
-
-
+
+
+
+
+
-    }
-    else {
-
-
-
+
+
-    $dbhandle->disconnect() if $dbhandle;
-    return $id;
@@ -371 +613 @@
-
-sub _insert {
-$obj, $fk_col, $fk_id
+ $obj, $fk_col, $fk_id 
-    my $ref = ref $obj;
-
-$ref eq 'ARRAY'
-$obj, $fk_col, $fk_id
-
-exists $_types{$ref}
-$obj, $fk_col, $fk_id
+ $ref eq 'ARRAY' 
+ $obj, $fk_col, $fk_id 
+
+ exists $_types{$ref} 
+ $obj, $fk_col, $fk_id 
-    }
-    elsif ($ref) {
-Carp::carp 
+$LOG->warn
-    }
-    else {
-Carp::carp 
+$LOG->warn
-    }
-    return undef;
-}
+
-sub _insert_array {
-$obj, $fk_col, $fk_id
+ $obj, $fk_col, $fk_id 
-    my @entries;
-    foreach (@$obj) {
-$_, $fk_col, $fk_id
- ($id) eq 'ARRAY' ? push(@entries,@$id) : push(@entries,$id
-
+ $_, $fk_col, $fk_id 
+($id) eq 'ARRAY' ? push( @entries, @$id ) : push( @entries, $id 
+    
-    return \@entries;
-}
+
-sub _insert_obj {
-
-
-
-
-
-