Code review: 340750043: Fixed yara option parsing log2timeline#1702

Onager · Mar 6, 2018 · 79dc824 · 79dc824
1 parent faa6128
commit 79dc824
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/config/dpkg/changelog b/config/dpkg/changelog
@@ -2,4 +2,4 @@ plaso (20180306-1) unstable; urgency=low
 
   * Auto-generated
 
- -- Log2Timeline <log2timeline-dev@googlegroups.com>  Tue, 06 Mar 2018 12:12:00 +0100
+ -- Log2Timeline <log2timeline-dev@googlegroups.com>  Tue, 06 Mar 2018 12:18:10 +0100
diff --git a/plaso/cli/log2timeline_tool.py b/plaso/cli/log2timeline_tool.py
@@ -363,7 +363,7 @@ def ParseOptions(self, options):
 
     argument_helper_names = [
         'artifact_definitions', 'extraction', 'filter_file', 'status_view',
-        'storage_file', 'storage_format', 'text_prepend']
+        'storage_file', 'storage_format', 'text_prepend', 'yara_rules']
     helpers_manager.ArgumentHelperManager.ParseOptions(
         options, self, names=argument_helper_names)
 

diff --git a/tests/cli/log2timeline_tool.py b/tests/cli/log2timeline_tool.py
@@ -114,9 +114,12 @@ def testParseOptions(self):
     options.source = self._GetTestFilePath(['testdir'])
     options.storage_file = 'storage.plaso'
     options.storage_format = definitions.STORAGE_FORMAT_SQLITE
+    options.yara_rules_path = self._GetTestFilePath(['yara.rules'])
 
     test_tool.ParseOptions(options)
 
+    self.assertIsNotNone(test_tool._yara_rules_string)
+
     options = test_lib.TestOptions()
     options.artifact_definitions_path = self._GetTestFilePath(['artifacts'])