Changeset 123 for honeyclient/branches/bug/42/lib/HoneyClient/Agent/Integrity/Registry

Timestamp:

12/17/06 15:39:43 (2 years ago)

Author:

kindlund

Message:

Completed alpha version of bug fix. Still have to test it out on our test VM network.

Files:

• honeyclient/branches/bug/42/lib/HoneyClient/Agent/Integrity/Registry/Parser.pm (modified) (4 diffs)
• honeyclient/branches/bug/42/lib/HoneyClient/Agent/Integrity/Registry/Parser.yp (modified) (4 diffs)

honeyclient/branches/bug/42/lib/HoneyClient/Agent/Integrity/Registry/Parser.pm

@@ -597 +597 @@
-    $LOG->debug("Resetting parser.");
-
-
+
+
+
+
+
+
+
+
+
-
-    # Check the offset.
@@ -806 +814 @@
-    }
-
+    # Save the file name.
+    $parser->YYData->{'filename'} = $args{'input_file'};
+
-    # Save the file handle.
-    $parser->YYData->{'file_handle'} = $fh;
@@ -1012 +1023 @@
-    $LOG->debug(Dumper(\%args));
-
+    # Reopen the file_handle, if it's been closed.
+    if (!defined($self->YYData->{'file_handle'})) {
+        $self->_reset();   
+    }
+
-    if ($self->YYData->{'input_pos'} == 0) {
-        $LOG->debug("Beginning parse of input stream.");
@@ -1162 +1178 @@
-
-    return $self->YYData->{'file_handle'}; 
+}
+
+=pod
+
+=head2 $object->getFilename()
+
+=over 4
+
+Returns the file name associated with the current Parser B<$object>.
+
+I<Output>: Returns the file name in use.
+
+=back
+
+=begin testing
+
+my ($filename);
+my $test_registry_file = $ENV{PWD} . "/" . getVar(name      => "registry_file",
+                                                  namespace => "HoneyClient::Agent::Integrity::Registry::Parser::Test");
+
+# Create a generic Parser object, with test state data.
+my $parser = HoneyClient::Agent::Integrity::Registry::Parser->init(input_file => $test_registry_file);
+
+$filename = $parser->getFilename();
+
+is($filename, $test_registry_file, "getFilename()") or diag("The getFilename() call failed.");
+
+=end testing
+
+=cut
+
+sub getFilename {
+    # Extract arguments.
+    my ($self, %args) = @_;
+
+    # Log resolved arguments.
+    # Make Dumper format more terse.
+    $Data::Dumper::Terse = 1;
+    $Data::Dumper::Indent = 0;
+    $LOG->debug(Dumper(\%args));
+
+    return $self->YYData->{'filename'}; 
+}
+
+=pod
+
+=head2 $object->closeFileHandle()
+
+=over 4
+
+Closes the file handle associated with the current Parser B<$object>.
+
+=back
+
+=begin testing
+
+my ($handle);
+my $test_registry_file = $ENV{PWD} . "/" . getVar(name      => "registry_file",
+                                                  namespace => "HoneyClient::Agent::Integrity::Registry::Parser::Test");
+
+# Create a generic Parser object, with test state data.
+my $parser = HoneyClient::Agent::Integrity::Registry::Parser->init(input_file => $test_registry_file);
+$parser->closeFileHandle();
+
+# Verify Test Group #1
+my $nextGroup = $parser->nextGroup();
+my $expectedGroup = {
+    key     => 'HKEY_CURRENT_USER\]Testing Group 1[',
+    entries => [ {
+        name  => '@',
+        value => 'Default',
+    }, {
+        name  => 'Foo',
+        value => 'Bar',
+    }, ],
+};
+is_deeply($nextGroup, $expectedGroup, "closeFileHandle()") or diag("The closeFileHandle() call failed.");
+
+=end testing
+
+=cut
+
+sub closeFileHandle {
+    # Extract arguments.
+    my ($self, %args) = @_;
+
+    # Log resolved arguments.
+    # Make Dumper format more terse.
+    $Data::Dumper::Terse = 1;
+    $Data::Dumper::Indent = 0;
+    $LOG->debug(Dumper(\%args));
+
+    $self->YYData->{'file_handle'} = undef; 
-}
-

honeyclient/branches/bug/42/lib/HoneyClient/Agent/Integrity/Registry/Parser.yp

@@ -442 +442 @@
-    $LOG->debug("Resetting parser.");
-
-
+
+
+
+
+
+
+
+
+
-
-    # Check the offset.
@@ -651 +659 @@
-    }
-
+    # Save the file name.
+    $parser->YYData->{'filename'} = $args{'input_file'};
+
-    # Save the file handle.
-    $parser->YYData->{'file_handle'} = $fh;
@@ -857 +868 @@
-    $LOG->debug(Dumper(\%args));
-
+    # Reopen the file_handle, if it's been closed.
+    if (!defined($self->YYData->{'file_handle'})) {
+        $self->_reset();   
+    }
+
-    if ($self->YYData->{'input_pos'} == 0) {
-        $LOG->debug("Beginning parse of input stream.");
@@ -1007 +1023 @@
-
-    return $self->YYData->{'file_handle'}; 
+}
+
+=pod
+
+=head2 $object->getFilename()
+
+=over 4
+
+Returns the file name associated with the current Parser B<$object>.
+
+I<Output>: Returns the file name in use.
+
+=back
+
+=begin testing
+
+my ($filename);
+my $test_registry_file = $ENV{PWD} . "/" . getVar(name      => "registry_file",
+                                                  namespace => "HoneyClient::Agent::Integrity::Registry::Parser::Test");
+
+# Create a generic Parser object, with test state data.
+my $parser = HoneyClient::Agent::Integrity::Registry::Parser->init(input_file => $test_registry_file);
+
+$filename = $parser->getFilename();
+
+is($filename, $test_registry_file, "getFilename()") or diag("The getFilename() call failed.");
+
+=end testing
+
+=cut
+
+sub getFilename {
+    # Extract arguments.
+    my ($self, %args) = @_;
+
+    # Log resolved arguments.
+    # Make Dumper format more terse.
+    $Data::Dumper::Terse = 1;
+    $Data::Dumper::Indent = 0;
+    $LOG->debug(Dumper(\%args));
+
+    return $self->YYData->{'filename'}; 
+}
+
+=pod
+
+=head2 $object->closeFileHandle()
+
+=over 4
+
+Closes the file handle associated with the current Parser B<$object>.
+
+=back
+
+=begin testing
+
+my ($handle);
+my $test_registry_file = $ENV{PWD} . "/" . getVar(name      => "registry_file",
+                                                  namespace => "HoneyClient::Agent::Integrity::Registry::Parser::Test");
+
+# Create a generic Parser object, with test state data.
+my $parser = HoneyClient::Agent::Integrity::Registry::Parser->init(input_file => $test_registry_file);
+$parser->closeFileHandle();
+
+# Verify Test Group #1
+my $nextGroup = $parser->nextGroup();
+my $expectedGroup = {
+    key     => 'HKEY_CURRENT_USER\]Testing Group 1[',
+    entries => [ {
+        name  => '@',
+        value => 'Default',
+    }, {
+        name  => 'Foo',
+        value => 'Bar',
+    }, ],
+};
+is_deeply($nextGroup, $expectedGroup, "closeFileHandle()") or diag("The closeFileHandle() call failed.");
+
+=end testing
+
+=cut
+
+sub closeFileHandle {
+    # Extract arguments.
+    my ($self, %args) = @_;
+
+    # Log resolved arguments.
+    # Make Dumper format more terse.
+    $Data::Dumper::Terse = 1;
+    $Data::Dumper::Indent = 0;
+    $LOG->debug(Dumper(\%args));
+
+    $self->YYData->{'file_handle'} = undef; 
-}
-