nasl 0.3.0 → 0.4.0

data/test/unit/parser/test_switch.rb

@@ -0,0 +1,96 @@
+################################################################################
+# Copyright (c) 2011-2018, Tenable Network Security
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+################################################################################
+
+class TestSwitch < Test::Unit::TestCase
+  include Nasl::Test
+
+  def test_each
+    tree = parse(
+      <<-EOF
+switch (value)
+{
+  case 0:
+    b = 1;
+    break;
+  case 3:
+    break;
+  default:
+    a = 0;
+}
+switch [=~] (value1)
+{
+  case "^abc.*":
+    rtrn = 1;
+    break;
+  case "^cde.*":
+    rtrn = 2;
+    break;
+  default:
+    rtrn = 1;
+}
+switch (value2)
+{
+  case [=~] "^abc.*":
+    rtrn = 1;
+    break;
+  case [==] "cde":
+    rtrn = 2;
+    break;
+  default:
+    rtrn = 1;
+}
+      EOF
+    )
+    assert_not_nil(tree)
+  
+    cases = tree.all(:Case)
+    assert_not_nil(cases)
+    assert_equal(9, cases.length)
+
+    assert_equal(cases[0].case_op, nil)
+    assert_equal(cases[6].case_op.to_s, "=~")
+
+    assert_equal(cases[0].case_val.value, 0)
+    assert_equal(cases[4].case_val.text, "^cde.*")
+    assert_equal(cases[2].case_val, nil)
+
+    assert_equal(cases[6].case_type, "normal_with_op")
+    assert_equal(cases[0].case_type, "normal")
+    assert_equal(cases[2].case_type, "default")
+    assert_equal(cases[6].case_type, "normal_with_op")
+
+    switches = tree.all(:Switch)
+    assert_not_nil(switches)
+    assert_equal(3, switches.length)
+
+    assert_equal(switches[1].switch_op.to_s, "=~")
+    assert_equal(switches[0].switch_op, nil)
+
+    assert_equal(switches[0].switch_expr.tokens[0].name, "value")
+    assert_equal(switches[1].switch_expr.tokens[0].name, "value1")
+    assert_equal(switches[2].switch_expr.tokens[0].name, "value2")
+  end
+end

data/test/unit/tokenizer/test_comment.rb

@@ -99,6 +99,81 @@ class TestTokenizerComment < Test::Unit::TestCase
     verify(code, [[:COMMENT, "# Comment 1"]])
   end
 
+  def test_c_style_multiline_beginning_of_statement
+    code = "/* Simple */a=1;"
+
+    assign = [
+      [:COMMENT, "/* Simple */"],
+      [:IDENT, "a"],
+      [:ASS_EQ, "="],
+      [:INT_DEC, "1"],
+      [:SEMICOLON, ";"],
+    ]
+
+    verify(code, assign)
+  end
+
+  def test_c_style_multiline_in_middle_of_statement
+    code = <<-EOF
+      hello = 1/*
+        comment here */;
+    EOF
+
+    assign = [
+      [:IDENT, "hello"],
+      [:ASS_EQ, "="],
+      [:INT_DEC, "1"],
+      [:SEMICOLON, ";"],
+    ]
+
+    verify(code, assign)
+  end
+
+  def test_c_style_empty
+    verify("//", [[ :COMMENT, "//" ]])
+    verify("/**/", [[ :COMMENT, "/**/" ]])
+  end
+
+  def test_c_style_multiline_after_statement
+    code = <<-EOF
+      hello = 1;/* comment here */
+    EOF
+
+    assign = [
+      [:IDENT, "hello"],
+      [:ASS_EQ, "="],
+      [:INT_DEC, "1"],
+      [:SEMICOLON, ";"],
+    ]
+
+    verify(code, assign)
+  end
+
+  def test_c_style_single_line_after_statement
+    code = <<-EOF
+      hello = 1;// comment here
+    EOF
+
+    assign = [
+      [:IDENT, "hello"],
+      [:ASS_EQ, "="],
+      [:INT_DEC, "1"],
+      [:SEMICOLON, ";"],
+    ]
+
+    verify(code, assign)
+  end
+
+  def test_c_style_unterminated
+    code = <<-EOF
+      hello = 1; /* hello
+    EOF
+
+    assert_raise Nasl::TokenException do
+      tokenize(code).get_tokens
+    end
+  end
+
   def test_hidden_before
     code = <<-EOF
       foo = TRUE;
@@ -116,7 +191,7 @@ class TestTokenizerComment < Test::Unit::TestCase
     verify(code, assign + assign) 
   end
 
-  def test_hidden_aften
+  def test_hidden_after
     code = <<-EOF
       foo = TRUE;
 

data/test/unit/tokenizer/test_operator_lookahead.rb

@@ -0,0 +1,75 @@
+################################################################################
+# Copyright (c) 2011-2014, Tenable Network Security
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+################################################################################
+
+# Test that operators which could be interpreted as two separate operators... are not.
+class TestOperatorLookahead < Test::Unit::TestCase
+  include Nasl::Test
+
+  def assert_lookahead str
+    assert_equal(tokenize(str).get_token.last.to_s, str)
+  end
+
+  def test_arithmetic
+    assert_lookahead("/=")
+    assert_lookahead("+=")
+    assert_lookahead("-=")
+    assert_lookahead("*=")
+    assert_lookahead("%=")
+  end
+
+  def test_equality
+    assert_lookahead(">=")
+    assert_lookahead("<=")
+    assert_lookahead("==")
+    assert_lookahead("!=")
+  end
+
+  def test_substr_and_regex
+    assert_lookahead(">!<")
+    assert_lookahead("><")
+    assert_lookahead("!~")
+    assert_lookahead("=~")
+  end
+
+  def test_shifts
+    assert_lookahead(">>=")
+    assert_lookahead(">>>=")
+    assert_lookahead("<<=")
+    assert_lookahead(">>>")
+    assert_lookahead("<<")
+    assert_lookahead(">>")
+  end
+
+  def test_prefix_postfix
+    assert_lookahead("--")
+    assert_lookahead("++")
+  end
+
+  def logical
+    assert_lookahead("||")
+    assert_lookahead("&&")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nasl
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mak Kolybabi
@@ -10,64 +10,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2018-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A language parser for the Nessus Attack Scripting Language. Supporting
   NASL v5.2.
 email:
@@ -79,10 +93,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
-- Gemfile.ci
 - README.md
 - Rakefile
 - bin/nasl-parse
@@ -104,6 +117,7 @@ files:
 - lib/nasl/parser/block.rb
 - lib/nasl/parser/break.rb
 - lib/nasl/parser/call.rb
+- lib/nasl/parser/case.rb
 - lib/nasl/parser/comment.rb
 - lib/nasl/parser/continue.rb
 - lib/nasl/parser/decrement.rb
@@ -125,13 +139,17 @@ files:
 - lib/nasl/parser/list.rb
 - lib/nasl/parser/local.rb
 - lib/nasl/parser/lvalue.rb
+- lib/nasl/parser/namespace.rb
 - lib/nasl/parser/node.rb
+- lib/nasl/parser/obj_var.rb
+- lib/nasl/parser/object.rb
 - lib/nasl/parser/parameter.rb
 - lib/nasl/parser/reference.rb
 - lib/nasl/parser/repeat.rb
 - lib/nasl/parser/repetition.rb
 - lib/nasl/parser/return.rb
 - lib/nasl/parser/string.rb
+- lib/nasl/parser/switch.rb
 - lib/nasl/parser/tree.rb
 - lib/nasl/parser/undefined.rb
 - lib/nasl/parser/while.rb
@@ -159,15 +177,19 @@ files:
 - test/unit/parser/test_ip.rb
 - test/unit/parser/test_list.rb
 - test/unit/parser/test_local.rb
+- test/unit/parser/test_namespace.rb
+- test/unit/parser/test_object.rb
 - test/unit/parser/test_repetition.rb
 - test/unit/parser/test_return.rb
 - test/unit/parser/test_string.rb
+- test/unit/parser/test_switch.rb
 - test/unit/parser/test_while.rb
 - test/unit/parser/test_whitespace.rb
 - test/unit/test_context.rb
 - test/unit/tokenizer/test_comment.rb
 - test/unit/tokenizer/test_empty.rb
 - test/unit/tokenizer/test_integer.rb
+- test/unit/tokenizer/test_operator_lookahead.rb
 - test/unit/tokenizer/test_references.rb
 - test/unit/tokenizer/test_string.rb
 homepage: http://github.com/tenable/nasl
@@ -180,17 +202,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: nasl
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A language parser for the Nessus Attack Scripting Language.
@@ -214,14 +236,18 @@ test_files:
 - test/unit/parser/test_ip.rb
 - test/unit/parser/test_list.rb
 - test/unit/parser/test_local.rb
+- test/unit/parser/test_namespace.rb
+- test/unit/parser/test_object.rb
 - test/unit/parser/test_repetition.rb
 - test/unit/parser/test_return.rb
 - test/unit/parser/test_string.rb
+- test/unit/parser/test_switch.rb
 - test/unit/parser/test_while.rb
 - test/unit/parser/test_whitespace.rb
 - test/unit/test_context.rb
 - test/unit/tokenizer/test_comment.rb
 - test/unit/tokenizer/test_empty.rb
 - test/unit/tokenizer/test_integer.rb
+- test/unit/tokenizer/test_operator_lookahead.rb
 - test/unit/tokenizer/test_references.rb
 - test/unit/tokenizer/test_string.rb