Changeset 163

Timestamp:

01/19/07 14:01:41 (2 years ago)

Author:

mbriggs

Message:

DB bug fixes

Files:

• honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Manager/DB.pm (modified) (17 diffs)

honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Manager/DB.pm

@@ -9 +9 @@
-##############################################################################
-# Package:     HoneyClient::Manager::DB 
-5
+6
-# File:        DB.pm
-# Description: A module server that provides an interface to the Honeyclient DB
-# Author:      mbriggs
-#
-5 2007-01-16 13:06:53
+6 2007-01-19 18:45:32
-#
-# Copyright (C) 2006 The MITRE Corporation.  All rights reserved.
@@ -73 +73 @@
-    use Relations::Query;
-    use Relations::Abstract;
+    use Data::Dumper;
-
-    # Traps signals, allowing END: blocks to perform cleanup.
@@ -129 +130 @@
-                name    => 1,
-                new_val => 1,
-1
+0
-            },
-            datecreated => 0,
-            notes       => 0,
-        },
-undef
+\&_SelectRegKeys
-        insertFunc => \&_InsertRegKey,
-    },
@@ -160 +161 @@
-# Returns ID of Inserted File
-
+sub _quote {
+    my ($self,$ref) = @_;
+    if (!ref $ref) {
+        return $self->{dbh}->quote($ref);
+    }
+    elsif (ref $ref eq 'HASH') {
+        my %hash = %$ref;
+        foreach (keys %hash) {
+            $hash{$_} = $self->_quote($hash{$_});
+        }
+        return \%hash;
+    }
+    elsif (ref $ref eq 'ARRAY') {
+        my @arr = @$ref;
+        foreach (@arr) {
+            $_ = $self->_quote($_);
+        }
+    }
+    elsif (ref $ref eq 'SCALAR') { $ref = $self->_quote($$ref);}
+    else {Carp::croak(__PACKAGE__."->_quote was passed an illegal reference type: ".ref $ref);}
+}
+
-sub _InsertFile {
-    my ($self,$h_file,$serial) = @_;
-
+,%file
-    eval {
-        
-        if (!$self->_VerifyHash($h_file,$tables{Files}{fields},1)) {return;}
-
+
+
-        
-        my $abstract = new Relations::Abstract($self->{dbh});
@@ -178 +202 @@
-        # If content found, record instance only and link to file content
-        if (defined($row) && $row > 0) {
-    $contentid
+   $file{contentid} 
-        }
-        else {
-contentid
+file{contentid}
-                -id    => 'id',
-                -table => 'FileContent',
-                -set   => \%fileContent);
-        }
-
-
-
+
-        $rc = $abstract->insert_id(
-                -id    => 'id',
@@ -211 +233 @@
-        my $abstract = new Relations::Abstract($self->{dbh});
-        
-        my %proc = map { $_ => $self->{dbh}->quote($h_proc->{$_}) } (keys %$h_proc)
-rial
+       my %proc = %{$self->_quote($h_proc)}
+lf->_quote($serial)
-    
-        $rc = $abstract->insert_id(
@@ -236 +258 @@
-        my $abstract = new Relations::Abstract($self->{dbh});
-        
-        my %regkey = map { $_ => $self->{dbh}->quote($h_regkey->{$_}) } ('key_name','status','datecreated','notes')
-rial
-
+       my %regkey = %{$self->_quote($h_regkey)}
+lf->_quote($serial)
+
-        $id = $abstract->insert_id(
-            -id    => 'id',
@@ -244 +266 @@
-            -set   => \%regkey
-        );
-{$h_regkey->{entries}}
-my %entry = map { $_ => $self->{dbh}->quote($entry->{$_}) } (keys %$entry)
+entries
+$entry{rkid} = $id
-            $abstract->insert_id(
-                -id     => 'id',
-egKey
+K
-                -set    => \%entry
-            ) or Carp::croak __PACKAGE__."->_InsertRegKey Failed: Insert returned a NULL ID";
@@ -293 +315 @@
-    my %fields = %$h_fields;
-    my $key;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        elsif (exists $fields{$key}) {
-            delete $fields{$key};
-        }
-        else {
-
+\n
-        }
-    }
@@ -376 +412 @@
-    while ($dbname = $sth->fetchrow_array()) {
-        if ($dbname eq 'HoneyClient') {
-            print "It thinks DB exists!\n";#TODO: Delete Debug statement
-            return 1;
-        }
@@ -435 +470 @@
-    "); # or die "Failed Creating RegKeys Table"; not necessary because of RaiseError??
-    $abstract->run_query("
-egKey
+K
-        (
-            id INT UNSIGNED AUTO_INCREMENT,
-egkey
+k
-            name VARCHAR(255) NOT NULL,
-            new_val VARCHAR(255) NOT NULL,
- NOT NULL
+
-            PRIMARY KEY (id)
-        ) ENGINE=InnoDB
@@ -680 +715 @@
-    
-    eval {
-{dbh}->
+_
-        $fingerprint->{numfiles}   = ref $fpData->{Files} eq 'ARRAY' ? scalar(@{$fpData->{Files}}) : 0;
-        $fingerprint->{numregkeys} = ref $fpData->{RegKeys} eq 'ARRAY' ? scalar(@{$fpData->{RegKeys}}) : 0;
@@ -812 +847 @@
-    my ($i,$rows,$r,$serial);
-    for ($i = 0; $i < $numfiles; $i++) {
-        
-    }
-        $rows = $self->Select({
-            table => 'Files',
-
+
+
+
+
+
+
-        });
-
-
-
-
+
+
+
+
+
+
-    for ($i = 0; $i < $numregkeys; $i++) {
-        $rows = $self->Select({
-            table => 'RegKeys',
-
-
-
+
+
-            }
-        });
@@ -901 +940 @@
-
-sub Select {
-    
+
-    if (!exists $tables{$h_query->{table}}){
-        Carp::carp("Attempted query on non-existent table: $h_query->{table}");
-        return;
-    }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-    else {
-        my $query = new Relations::Query(
-
-
-
-
-
+
+
-        );
+        foreach ('order_by','limit') {
+            $query->set("-$_" => $h_query->{$_}) if (defined $h_query->{$_});
+        }
+        if ( defined $h_query->{where} ) {
+            my %where = %{$self->_quote($h_query->{where})};
+            $query->set(-where => \%where);
+        }
-        return $self->{dbh}->selectall_arrayref($query->get(),{ Slice => {} });
-    }
@@ -933 +975 @@
-sub _SelectFiles {
-    my ($self,$q) = @_;
-
-
-
+
+
+
+
-    ];
-    #map {$q->{where}->{$_} = $self->{dbh}->quote($q->{where}->{$_})} (keys %{$q->{where}});
-    my $query = new Relations::Query(
-q->{'select'}
+select
-       -from   => 'Files JOIN FileContent on Files.contentid=FileContent.id',
-    );
-
-
+
+
+
+
+
+
+
+
-    }
-    my $sth = $self->{dbh}->prepare($query->get());
-    $sth->execute();
-    
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    while ($sth->fetch) {
-
-
+
+
+
+
+
-    return \@files;
-}
@@ -968 +1025 @@
-    #TODO: _SelectRegKeys function
-    my ($self,$q) = @_;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
-    }
-    else {
-        $query->set(
-            -select => "*",
-            -from   => "RegKeys",
-            -where  => $q->{where}
-        );
-        @regkeys = @{$self->{dbh}->selectall_arrayref($query->get(),{ Slice => {} })};
-        foreach my $row (@regkeys) {
-            my $subquery = new Relations::Query(
-                -select => ['name','new_val','old_val'],
-                -from   => 'RKEntries',
-                -where  => {rkid => $row->{id}}
-            );
-            $rowE = $self->{dbh}->selectall_arrayref($query->get(),{ Slice => {} });
-            if(scalar @{$rowE}) { $row->{entries} = $rowE; }
-        }
-    }
@@ -1023 +1082 @@
-sub _SelectFingerprint {
-    my ($self,$q) = @_;
-    map {$q->{where}->{$_} = $self->{dbh}->quote($q->{where}->{$_})} (keys %{$q->{where}});
-    my $query = new Relations::Query(
-        -select => '*',
-        -from   => 'Fingerprints',
-        -where  => $q->where,
-        -limit  => 1
-    );
+    if (exists $q->{where} ) {
+        my %where = %{$self->_quote($q->{where})};
+        $query->set(-where => \%where);
+    }
-    my $fingerprint = $self->{dbh}->selectrow_hashref($query->get()) or return undef;
-    # Get Files