Change method names for sub-patterns

LTe · Jun 8, 2012 · 626bf54 · dmajda · Jun 11, 2012 · LTe
1 parent 3c6cd8c
commit 626bf54
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/lib/scanny/checks/xss/xss_flash_check.rb b/lib/scanny/checks/xss/xss_flash_check.rb
@@ -6,8 +6,8 @@ module Checks
     class XssFlashCheck < Check
       def pattern
         [
-          flash_warning_assignment_from_params,
-          flash_warning_assignment_from_dynamic_string
+          pattern_params,
+          pattern_dynamic_string
         ].join("|")
       end
 
@@ -26,7 +26,7 @@ def include_node?(node, klass)
         end
 
         #high            CWE-79                  flash\[\:warning\]\s*=\s*.*params\s*\[
-        def flash_warning_assignment_from_params
+        def pattern_params
           <<-EOT
             ElementAssignment<
               arguments = ActualArguments<
@@ -48,7 +48,7 @@ def flash_warning_assignment_from_params
         end
 
         #medium          CWE-79                  flash\[\:warning\]\s*=\s*.*#\{
-        def flash_warning_assignment_from_dynamic_string
+        def pattern_dynamic_string
           <<-EOT
             ElementAssignment<
               arguments = ActualArguments<

diff --git a/lib/scanny/checks/xss/xss_logger_check.rb b/lib/scanny/checks/xss/xss_logger_check.rb
@@ -5,8 +5,8 @@ module Checks
     class XssLoggerCheck < Check
       def pattern
         [
-          send_params_to_logger,
-          send_dynamic_string_to_logger,
+          pattern_params,
+          pattern_dynamic_string,
         ].join("|")
       end
 
@@ -17,7 +17,7 @@ def check(node)
       private
 
         #low             CWE-79                  logger.*params\s*\[
-        def send_params_to_logger
+        def pattern_params
           <<-EOT
             SendWithArguments<
               arguments = ActualArguments<
@@ -36,7 +36,7 @@ def send_params_to_logger
         end
 
         #low             CWE-79                  logger.*#\{
-        def send_dynamic_string_to_logger
+        def pattern_dynamic_string
           <<-EOT
             SendWithArguments<
               arguments = ActualArguments<

diff --git a/lib/scanny/checks/xss/xss_mark_check.rb b/lib/scanny/checks/xss/xss_mark_check.rb
@@ -4,7 +4,7 @@ module Checks
     # that are called and can mark dangerous string as safe for html.
     class XssMarkCheck < Check
       def pattern
-        mark_as_check
+        pattern_mark_as
       end
 
       def check(node)
@@ -14,7 +14,7 @@ def check(node)
       private
 
         #info           CWE-000                 (mark_as_xss_protected|mark_methods_as_xss_safe)
-        def mark_as_check
+        def pattern_mark_as
           <<-EOT
             Send<
               name = :mark_as_xss_protected | :mark_methods_as_xss_safe

diff --git a/lib/scanny/checks/xss/xss_render_api_check.rb b/lib/scanny/checks/xss/xss_render_api_check.rb
@@ -6,8 +6,8 @@ module Checks
     class XssRenderApiCheck < Check
       def pattern
         [
-          render_api_error_with_params,
-          render_api_error_with_dynamic_string
+          pattern_params,
+          pattern_dynamic_string
         ].join("|")
       end
 
@@ -26,7 +26,7 @@ def include_node?(node, klass)
         end
 
         #high            CWE-79                  render_api_error.*params\s*\[
-        def render_api_error_with_params
+        def pattern_params
           <<-EOT
             SendWithArguments<
               name = :render_api_error,
@@ -44,7 +44,7 @@ def render_api_error_with_params
         end
 
         #medium          CWE-79                  render_api_error.*#\{
-        def render_api_error_with_dynamic_string
+        def pattern_dynamic_string
           <<-EOT
             SendWithArguments<
               arguments = ActualArguments<

diff --git a/lib/scanny/checks/xss/xss_send_check.rb b/lib/scanny/checks/xss/xss_send_check.rb
@@ -6,7 +6,7 @@ module Checks
     # command includes unescaped input.
     class XssSendCheck < Check
       def pattern
-        send_file_and_data
+        pattern_send
       end
 
       def check(node)
@@ -17,7 +17,7 @@ def check(node)
 
         #medium          CWE-79                  send_file.*:disposition\s*=>\s*\'inline\'
         #medium          CWE-79                  send_data.*:disposition\s*=>\s*\'inline\'
-        def send_file_and_data
+        def pattern_send
           <<-EOT
           SendWithArguments<
             name = :send_file | :send_data,