Changeset 596

Timestamp:

06/21/07 16:02:55 (1 year ago)

Author:

kindlund

Message:

sc: merging branch using tags svn+ssh://kindlund@www.honeyclient.org/home/svn/honeyclient/honeyclient/tags/exp/UP7-mbriggs-db and svn+ssh://kindlund@www.honeyclient.org/home/svn/honeyclient/honeyclient/trunk

Files:

• honeyclient/branches/exp/mbriggs-db/etc/honeyclient.xml (modified) (1 diff)
• honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Agent/Driver/Browser.pm (modified) (6 diffs)
• honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Agent/Integrity/Filesystem.pm (modified) (5 diffs)
• honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Manager.pm (modified) (1 diff)
• honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Manager/VM.pm (modified) (3 diffs)
• honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Manager/VM/Clone.pm (modified) (17 diffs)
• honeyclient/branches/exp/mbriggs-db/t/honeyclient_manager_vm.t (modified) (3 diffs)
• honeyclient/branches/exp/mbriggs-db/t/honeyclient_manager_vm_clone.t (modified) (3 diffs)
• honeyclient/branches/exp/mbriggs-db/t/test_vm/nvram (modified) (previous)
• honeyclient/branches/exp/mbriggs-db/t/test_vm/winXPPro.vmx (modified) (1 diff)

honeyclient/branches/exp/mbriggs-db/etc/honeyclient.xml

@@ -430 +430 @@
-        <!-- HoneyClient::Manager::VM Options -->
-        <VM>
-
-
+
+
+
+
-                8089
-            </port>

honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Agent/Driver/Browser.pm

@@ -904 +904 @@
-the "DEFAULT PARAMETER LIST" section.
-
- 
- 
+
+
-browser.
-
@@ -1278 +1278 @@
-sub _scoreLinks {
-    my ($base, $content, %wordlists) = @_;
-    
-    
+   
+   
-    my %links = ();
-    my $url;
@@ -1285 +1285 @@
-    # If the page is blank, there is no point trying to parse it
-    if (!$content) {
-%links
+keys(%links)
-    }
-
-
-
-
-
+
+
+
+
+
+
+
-        my $score = 0;
-
-        # Look for the link in the attribute data
-       
-
-                       
-                       
-                       
-                       
-                       
-                       
-                       
-                       
-                    }xi
-       
+        
+
+                    
+                    
+                  
+                  
+                  
+                  
+                  
+                    
+            }six
+       
-            $url = $+;
-
@@ -1320 +1323 @@
-            $url = url($url, $base)->abs;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            }
+            if ($attr =~ /\b HEIGHT\s*=\s*.(\d+)/xi) {
+                $height = $1;
+            }
+            if ($width && $height) {
+                $score += int(($width*$height)/($default_display_size)*100);
+            }
+            elsif ($width) {
+                $score += int($width/10);
+            }
+            elsif ($height) {
+                $score += int($height/10);
+            }
+
+            # Score length of link text. These are arbitrary lengths, but
+            # the reasoning is that really short text links are not too
+            # visible (we are excluding image links from this criteria),
+            # and really long text would be weird or abnormal to the human
+            # web surfer.
+            if ($text !~ /img /i &&
+                length($text) > $min_text_length &&
+                length($text) < $max_text_length) {
+                $score += length($text);
+            }
+
+            # Score the image content, if it exists
+            # We score the size proportional to a 1024 X 768 display
+            # Image bonus
+            if ($text =~ /img /i) {
+                $score += $image_bonus;
+            }
+            # Score image size
+            $width = undef;
+            $height = undef;
+            if ($text =~ /\b WIDTH\s*=\s*.(\d+)/xi) {
+                $width = $1;
+            }
+            if ($text =~ /\b HEIGHT\s*=\s*.(\d+)/xi) {
+                $height = $1;
+            }
+            if ($width && $height) {
+                $score += int(($width*$height)/($default_display_size)*100);
+            }
+            elsif ($width) {
+                $score += int($width/10);
+            }
+            elsif ($height) {
+                $score += int($height/10);
+            }
+
+            # Good word bonus
+            foreach (@good_words) {
+                if ($text =~ /$_/i) {
+                    $score += $word_value;
+                }
+            }
+
+            # Bad word penalty
+            foreach (@bad_words) {
+                if ($text =~ /$_/i) {
+                    $score -= $word_value;
+                }
+            }
+
+            # Put it in the return value hash and zero the score
+            $links{$url} = $score;
+            $url = undef;
-        }
-    }
@@ -1392 +1411 @@
-=over 4
-
-  
+
-process to all possible links it has found within its hashtables
-and is unable to navigate the browser further without additional, external
@@ -1504 +1523 @@
-    my $next_link_is_set = 0;
-    if (defined($self->next_link_to_visit)) {
- 
+
-    }
-

honeyclient/branches/exp/mbriggs-db/lib/HoneyClient/Agent/Integrity/Filesystem.pm

@@ -433 +433 @@
-}
-
-@
-
+$
+reference 
-#
-# Input: none
@@ -444 +444 @@
-    # Create a new entry.
-    my $entry = {
-$File::Find::name
-$attr[7]
-$attr[9]
+defined($File::Find::name) ? $File::Find::name : 'UNKNOWN'
+defined($attr[7]) ? $attr[7] : 0
+defined($attr[9]) ? $attr[9] : 0
-    };
-
@@ -935 +935 @@
-                    next;
-
+                # If the entry is a symlink.
+                } elsif (-l $fh) {
+                    $type = "symlink";
+                    undef $fh;
+
+                    # XXX: We currently skip all entries that
+                    # only correspond to symlinks.
+                    # This is a known limitation.
+                    next;
+
-                # If the entry is a file.
-                } else {
@@ -990 +1000 @@
-# Output: absolute windows filename path
-sub _convertFilename {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1413 +1437 @@
-
-This library also only monitors B<FILE> changes.  Thus, if malware
-n the system, then this library will
-
+r B<SYMLINKS> on the system, then
+this library will 
-
-=head1 SEE ALSO

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

@@ -722 +722 @@
-                        my $vmCfg = $vmCloneConfig;
-                        $vmCloneConfig = undef;
-destroy
-destroyVM(config => $vmCf
+suspend
+suspendVM(config => $vmCloneConfi
-                        print "Done!\n";
-                        _cleanup();

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

@@ -355 +355 @@
-=begin testing
-
+# Make sure ExtUtils::MakeMaker loads.
+BEGIN { use_ok('ExtUtils::MakeMaker', qw(prompt)) or diag("Can't load ExtUtils::MakeMaker package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('ExtUtils::MakeMaker');
+can_ok('ExtUtils::MakeMaker', 'prompt');
+use ExtUtils::MakeMaker qw(prompt);
+
-# Generate a notice, to clarify our assumptions.
-
+
+
+
+
+
+
+
+
-
-# Make sure Log::Log4perl loads
@@ -500 +513 @@
-use Thread::Semaphore;
-
-
-
-
-
+
-# Generate a notice, to inform the tester that these tests are not
-# exactly quick.
-
+
+
+
+
+
+
-
-=end testing
@@ -3888 +3903 @@
-    # this question, if need be.
-    if ($som->result == VM_EXECUTION_STATE_STUCK) {
-clone
+master
-    }
-

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

@@ -112 +112 @@
-use strict;
-use warnings;
+use Config;
-use Carp ();
-
@@ -153 +154 @@
-    # Symbols to autoexport (:DEFAULT tag)
-    @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+
+    # Check to see if ithreads are compiled into this version of Perl.
+    if (!$Config{useithreads}) {
+        Carp::croak "Error: Recompile Perl with ithread support, in order to use this module.\n";
+    }
-
-    $SIG{PIPE} = 'IGNORE'; # Do not exit on broken pipes.
@@ -196 +202 @@
-use HoneyClient::Util::Config qw(getVar);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-# Make sure the module loads properly, with the exportable
-# functions shared.
-
-
-
-
-
-
-
-
+
+
+
-
-# Suppress all logging messages, since we need clean output for unit testing.
@@ -223 +239 @@
-use Storable qw(dclone);
-
+# Make sure threads loads.
+BEGIN { use_ok('threads') or diag("Can't load threads package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('threads');
+use threads;
+
+# Make sure threads::shared loads.
+BEGIN { use_ok('threads::shared') or diag("Can't load threads::shared package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('threads::shared');
+use threads::shared;
+
+# Make sure File::Basename loads.
+BEGIN { use_ok('File::Basename', qw(dirname basename)) or diag("Can't load File::Basename package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('File::Basename');
+can_ok('File::Basename', 'dirname');
+can_ok('File::Basename', 'basename');
+use File::Basename qw(dirname basename);
+
-=end testing
-
@@ -228 +261 @@
-
-#######################################################################
+
+# Include Threading Library
+use threads;
+use threads::shared;
-
-# Include Global Configuration Processing Library
-use HoneyClient::Util::Config qw(getVar);
-
+# Include SOAP Library
+use HoneyClient::Util::SOAP qw(getClientHandle);
+
+# Include VM Libraries
+use VMware::VmPerl qw(VM_EXECUTION_STATE_ON
+                      VM_EXECUTION_STATE_OFF
+                      VM_EXECUTION_STATE_STUCK
+                      VM_EXECUTION_STATE_SUSPENDED);
+use HoneyClient::Manager::VM;
+
-# Use Storable Library
-use Storable qw(dclone);
@@ -243 +290 @@
-# The global logging object.
-our $LOG = get_logger();
+
+# The global variable, used to count the number of
+# Clone objects that have been created.
+our $OBJECT_COUNT = 0;
-
-=pod
@@ -259 +310 @@
-  $object->{key} = $value;    # Sets key's value.
-
-bypass_clone
+master_vm_config
-
-=over 4
-
-
-
-
+
+
-
-=back
@@ -272 +322 @@
-
-my %PARAMS = (
-
-
-
-
+
+
+
+
+
+
+
-);
-
@@ -340 +393 @@
-# mechanism.
-sub DESTROY {
+    # Decrement our global object count.
+    $OBJECT_COUNT--;
+
+    # Upon last use, destroy the global instance of the VM manager.
+    if ($OBJECT_COUNT <= 0) {
+        HoneyClient::Manager::VM->destroy();
+    }
-}
-
@@ -352 +412 @@
-The following functions have been implemented by any Clone object.
-
-Agent::Driver
+Manager::VM::Clone
-
-=over 4
@@ -358 +418 @@
-Creates a new Clone object, which contains a hashtable
-containing any of the supplied "param => value" arguments.
-Upon creation, the Clone object clones the supplied master VM.
-
-I<Inputs>:
@@ -373 +432 @@
-=begin testing
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-=end testing
@@ -420 +533 @@
-    bless $self, $class;
-
-
-
-
-
-
+
+
+
-    }
+
+    # Set a valid handle for the VM daemon.
+    $self->{'_vm_handle'} = getClientHandle(namespace => "HoneyClient::Manager::VM");
+
+    # Set the master VM.
+    $LOG->info("Setting VM (" . $self->{'master_vm_config'} . ") as master.");
+    my $som = $self->{'_vm_handle'}->setMasterVM(config => $self->{'master_vm_config'});
+    if (!$som->result()) {
+        $LOG->fatal("Unable to set VM (" . $self->{'master_vm_config'} . ") as a master VM.");
+        Carp::croak "Unable to set VM (" . $self->{'master_vm_config'} . ") as a master VM.";
+    }
+
+    # Update our global object count.
+    $OBJECT_COUNT++;
-
-    # Finally, return the blessed object.
@@ -433 +558 @@
-=pod
-
-drive
+start
-
-=over 4
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-=back
-
-
-
+
+
+
-# Create a generic driver, with test state data.
-
-
-
-
+#
+#
+
+#
-
-=cut
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -483 +624 @@
-=back
-
-
-
+#
+
-# Create a generic driver, with test state data.
-
-
-
-
+#
+#
+
+#
-
-=cut
@@ -568 +709 @@
-=back
-
-
-
+#
+
-# Create a generic driver, with test state data.
-
-
-
-
+#
+#
+
+#
-
-=cut
@@ -651 +792 @@
-=back
-
-
-
+#
+
-# Create a generic driver, with test state data.
-
-
-
-
+#
+#
+
+#
-
-=cut

honeyclient/branches/exp/mbriggs-db/t/honeyclient_manager_vm.t

@@ -9 +9 @@
-# =begin testing
-{
+# Make sure ExtUtils::MakeMaker loads.
+BEGIN { use_ok('ExtUtils::MakeMaker', qw(prompt)) or diag("Can't load ExtUtils::MakeMaker package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('ExtUtils::MakeMaker');
+can_ok('ExtUtils::MakeMaker', 'prompt');
+use ExtUtils::MakeMaker qw(prompt);
+
-# Generate a notice, to clarify our assumptions.
-
+
+
+
+
+
+
+
+
-
-# Make sure Log::Log4perl loads
@@ -154 +167 @@
-use Thread::Semaphore;
-
-
-
-
-
+
-# Generate a notice, to inform the tester that these tests are not
-# exactly quick.
-
+
+
+
+
+
+
-}
-
@@ -1159 +1174 @@
-    # this question, if need be.
-    if ($som->result == VM_EXECUTION_STATE_STUCK) {
-clone
+master
-    }
-

honeyclient/branches/exp/mbriggs-db/t/honeyclient_manager_vm_clone.t

@@ -43 +43 @@
-use HoneyClient::Util::Config qw(getVar);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-# Make sure the module loads properly, with the exportable
-# functions shared.
-
-
-
-
-
-
-
-
+
+
+
-
-# Suppress all logging messages, since we need clean output for unit testing.
@@ -69 +79 @@
-can_ok('Storable', 'dclone');
-use Storable qw(dclone);
+
+# Make sure threads loads.
+BEGIN { use_ok('threads') or diag("Can't load threads package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('threads');
+use threads;
+
+# Make sure threads::shared loads.
+BEGIN { use_ok('threads::shared') or diag("Can't load threads::shared package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('threads::shared');
+use threads::shared;
+
+# Make sure File::Basename loads.
+BEGIN { use_ok('File::Basename', qw(dirname basename)) or diag("Can't load File::Basename package.  Check to make sure the package library is correctly listed within the path."); }
+require_ok('File::Basename');
+can_ok('File::Basename', 'dirname');
+can_ok('File::Basename', 'basename');
+use File::Basename qw(dirname basename);
-}
-
@@ -75 +102 @@
-# =begin testing
-{
-Create a generic clone, with test state data
-$clone = HoneyClient::Manager::VM::Clone->new(test => 1, bypass_clone => 1
-
-isa_ok($clone, 'HoneyClient::Manager::VM::Clone', "new(test => 1, bypass_clone => 1)") or diag("The new() call failed.
+Shared test variables
+($stub, $som, $URL
+
+                                      namespace => "HoneyClient::Manager::VM::Test
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-
-
-# =begin testing
-{
-# Create a generic driver, with test state data.
-my $driver = HoneyClient::Agent::Driver->new(test => 1);
-dies_ok {$driver->drive()} 'drive()' or diag("The drive() call failed.  Expected drive() to throw an exception.");
-}
-
-
-
-# =begin testing
-{
-# Create a generic driver, with test state data.
-my $driver = HoneyClient::Agent::Driver->new(test => 1);
-dies_ok {$driver->isFinished()} 'isFinished()' or diag("The isFinished() call failed.  Expected isFinished() to throw an exception.");
-}
-
-
-
-# =begin testing
-{
-# Create a generic driver, with test state data.
-my $driver = HoneyClient::Agent::Driver->new(test => 1);
-dies_ok {$driver->next()} 'next()' or diag("The next() call failed.  Expected next() to throw an exception.");
-}
-
-
-
-# =begin testing
-{
-# Create a g