nasl 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 199cd9a0ada92765a2e1812786f7b41eb22c3724
-  data.tar.gz: 0b8ff7ebf8d1b4b166dd7ffb4f71fa52d884e1aa
+  metadata.gz: 8dbfbd10777b11f9eb32bfa1852b114e4ba027b8
+  data.tar.gz: 3adae20946d690b72b6cce0378ec3bb36cf6ec90
 SHA512:
-  metadata.gz: 1cd9093af658c23660d9d662e3da33ab2ecaf97aececd1402832a92a7d779e245c2a64c7cfe1be8d71793f2f08b2f51388e03de1d2a5be0da7712bc541a6a8ab
-  data.tar.gz: 749a6d9e4fea7edb88eb34113496988d7cba0cfe6baffb00eeabc154a4f81ffddd2d93eccbff44b142f645d2f190f7c88559bf77d892cd9bacd5f2ac42d9801e
+  metadata.gz: 3f58cb329f9293ef5e32f130864af3e48fd07d66555866c1ede44c719fcbc88d8c6e1781a9bcac5b261a2b26a320b5231c865697126d4853276c7bb7decf7225
+  data.tar.gz: 4fb81fb4ba0a4c54d2df014a423578bb53cb3eb6ba1acda35e24df4cb3440e40a7eee2070b07dc98790f98757ecc03079392cb1dfb13e2cf8fc4f5c3c1fed18a

data/lib/nasl/grammar.racc

@@ -168,6 +168,8 @@ rule
              { val[0] }
              | foreach
              { val[0] }
+             | do_while
+             { val[0] }
              | if
              { val[0] }
              | repeat
@@ -295,7 +297,7 @@ rule
              ;
 
   case_expr_list : case_expr
-                 { val[0] }
+                 { [val[0]] }
                  | case_expr COMMA case_expr_list
                  { [val[0]] + val[2] }
                  ;
@@ -314,6 +316,16 @@ rule
              { n(:Foreach, val[0], val[1], val[3], val[5]) }
              | FOREACH LPAREN ident IN expr RPAREN statement
              { n(:Foreach, val[0], val[2], val[4], val[6]) }
+             | FOREACH LPAREN VAR ident IN expr RPAREN statement
+             { n(:Foreach, val[0], val[3], val[5], val[7]) }
+             | FOR LPAREN VAR ident IN expr RPAREN statement
+             { n(:Foreach, val[0], val[3], val[5], val[7]) }
+             | FOR LPAREN ident IN expr RPAREN statement
+             { n(:Foreach, val[0], val[2], val[4], val[6]) }
+             ;
+
+  do_while   : DO statement WHILE LPAREN expr RPAREN
+             { n(:DoWhile, *val) }
              ;
 
   if         : IF LPAREN expr RPAREN statement
@@ -482,11 +494,11 @@ rule
              { val[0] } 
              ;
  
- 
   ident_ex   : ident
              { val[0] }
              | VAR 
              { val[0] }
+             ; 
 
   ##############################################################################
   # Named Components
@@ -532,6 +544,10 @@ rule
 
   ref        : AT_SIGN ident
              { n(:Reference, val[1]) }
+	     | FUNCTION LPAREN params RPAREN block
+	     { n(:FunctionReference, val[2], val[4]) }
+	     | FUNCTION LPAREN RPAREN block
+	     { n(:FunctionReference, val[3]) }
              ;
 
   ##############################################################################
@@ -582,6 +598,8 @@ rule
 
   list_elems : list_elem COMMA list_elems
              { [val[0]] + val[2] }
+             | list_elem COMMA
+             { [val[0]] }
              | list_elem
              { [val[0]] }
              ;
@@ -644,6 +662,16 @@ rule
              { n(:Identifier, *val) }
              | IN
              { n(:Identifier, *val) }
+             | OBJECT
+             { n(:Identifier, *val) }
+             | CONTINUE
+             { n(:Identifier, *val) }
+             | PUBLIC
+             { n(:Identifier, *val) }
+             | PRIVATE
+             { n(:Identifier, *val) }
+             | DEFAULT
+             { n(:Identifier, *val) }
              ;
 
   int        : INT_DEC
@@ -716,6 +744,8 @@ require 'nasl/parser/object'
 require 'nasl/parser/switch'
 require 'nasl/parser/case'
 require 'nasl/parser/obj_var'
+require 'nasl/parser/do_while'
+require 'nasl/parser/function_ref'
 
 ---- inner ----
 

data/lib/nasl/parser/do_while.rb

@@ -0,0 +1,43 @@
+################################################################################
+# 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.
+################################################################################
+
+require 'nasl/parser/node'
+
+module Nasl
+  class DoWhile < Node
+    attr_reader :body, :cond
+
+    def initialize(tree, *tokens)
+      super
+
+      @cond = @tokens[4]
+      @body = @tokens[1]
+
+      @children << :cond
+      @children << :body
+    end
+  end
+end

data/lib/nasl/parser/function.rb

@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2011-2014, Tenable Network Security
+# Copyright (c) 2011-2018, Tenable Network Security
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

data/lib/nasl/parser/function_ref.rb

@@ -0,0 +1,52 @@
+################################################################################
+# 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.
+################################################################################
+
+require 'nasl/parser/node'
+
+module Nasl
+  class FunctionReference < Node
+    attr_reader :body, :params
+
+    def initialize(tree, *tokens)
+      super
+
+      @body = @tokens.last
+
+      if @tokens.length == 5 
+        @params = @tokens[0]
+      else
+        @params = []
+      end
+
+      @children << :params
+      @children << :body
+    end
+
+    def each
+      @body.each{ |stmt| yield stmt }
+    end
+  end
+end

data/lib/nasl/token.rb

@@ -43,7 +43,8 @@ module Nasl
       case @type
       when *[:BREAK, :CONTINUE, :ELSE, :EXPORT, :FOR, :FOREACH, :FUNCTION,
             :GLOBAL, :IF, :IMPORT, :INCLUDE, :LOCAL, :REPEAT, :RETURN, :UNTIL,
-            :REP, :WHILE, :NAMESPACE, :OBJECT, :VAR, :PUBLIC, :PRIVATE, :CASE, :SWITCH, :DEFAULT]
+            :REP, :WHILE, :NAMESPACE, :OBJECT, :VAR, :PUBLIC, :PRIVATE, :CASE,
+            :SWITCH, :DEFAULT, :DO]
         "a keyword"
       when :UNDEF
         "an undefined constant"

data/lib/nasl/tokenizer.rb

@@ -50,6 +50,7 @@ module Nasl
       'until'      => :UNTIL,
       'x'          => :REP,
       'while'      => :WHILE,
+      'do'         => :DO,
       'namespace'  => :NAMESPACE,
       'object'     => :OBJECT,
 #      'new'        => :NEW,
@@ -220,7 +221,8 @@ module Nasl
     def get_identifier
       # Identifiers are composed of letters, digits, and underscores.
       #ident = @line[/^[_a-z][_a-z0-9]*/i]
-      ident = @line[/^[_a-z]([_a-z0-9]*::[_a-z0-9]+)*[_a-z0-9]*/i]
+#      ident = @line[/^[_a-z]([_a-z0-9]*::[_a-z0-9]+)*[_a-z0-9]*/i]
+      ident = @line[/^(::|[_a-z])([_a-z0-9]*::[_a-z0-9]+)*[_a-z0-9]*/i]
       consume(ident.length)
 
       # Assume that we've got an identifier until proven otherwise.
@@ -371,7 +373,7 @@ module Nasl
       @mark = @point
 
       # Try to parse token at the point.
-      token = if @char =~ /[_a-z]/i
+      token = if @char =~ /[_a-z]/i or @line =~ /^::/
         get_identifier
       elsif @char =~ /['"]/
         get_string

data/lib/nasl/version.rb

@@ -25,5 +25,5 @@
 ################################################################################
 
 module Nasl
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/test/unit/parser/test_call.rb

@@ -30,7 +30,6 @@ class TestCall < Test::Unit::TestCase
   def test_keyword_prefix
     # We never want to have a function with the same name as a keyword.
     fail_parse("break();")
-    fail_parse("continue();")
     fail_parse("else();")
     fail_parse("export();")
     fail_parse("for();")

data/test/unit/parser/test_do_while.rb

@@ -0,0 +1,46 @@
+################################################################################
+# 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 TestDoWhile < Test::Unit::TestCase
+  include Nasl::Test
+
+  def test_each
+    tree = parse(
+      <<-EOF
+x = 0;
+do
+{
+  x ++;
+  display(x);
+}
+while (x < 10)
+      EOF
+    )
+    do_whiles = tree.all(:DoWhile)
+    assert_not_nil(tree)
+    assert_equal(1, do_whiles.length) 
+  end
+end

data/test/unit/parser/test_function.rb

@@ -30,7 +30,6 @@ class TestFunction < Test::Unit::TestCase
   def test_keyword_prefix
     # We never want to have a function with the same name as a keyword.
     fail_parse("function break() {}")
-    fail_parse("function continue() {}")
     fail_parse("function else() {}")
     fail_parse("function export() {}")
     fail_parse("function for() {}")

data/test/unit/parser/test_switch.rb

@@ -61,6 +61,13 @@ switch (value2)
     break;
   default:
     rtrn = 1;
+}
+switch (value3)
+{
+  case ' ', '\n', '\t', '\r':
+    return TRUE;
+  default:
+    return FALSE;
 }
       EOF
     )
@@ -68,14 +75,16 @@ switch (value2)
   
     cases = tree.all(:Case)
     assert_not_nil(cases)
-    assert_equal(9, cases.length)
+    assert_equal(11, 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[0].case_val[0].value, 0)
+    assert_equal(cases[4].case_val[0].text, "^cde.*")
+    assert_equal(cases[9].case_val[0].text, " ")
     assert_equal(cases[2].case_val, nil)
+    assert_equal(cases[9].case_val[2].text, "\t")
 
     assert_equal(cases[6].case_type, "normal_with_op")
     assert_equal(cases[0].case_type, "normal")
@@ -84,7 +93,7 @@ switch (value2)
 
     switches = tree.all(:Switch)
     assert_not_nil(switches)
-    assert_equal(3, switches.length)
+    assert_equal(4, switches.length)
 
     assert_equal(switches[1].switch_op.to_s, "=~")
     assert_equal(switches[0].switch_op, nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nasl
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Mak Kolybabi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -121,12 +121,14 @@ files:
 - lib/nasl/parser/comment.rb
 - lib/nasl/parser/continue.rb
 - lib/nasl/parser/decrement.rb
+- lib/nasl/parser/do_while.rb
 - lib/nasl/parser/empty.rb
 - lib/nasl/parser/export.rb
 - lib/nasl/parser/expression.rb
 - lib/nasl/parser/for.rb
 - lib/nasl/parser/foreach.rb
 - lib/nasl/parser/function.rb
+- lib/nasl/parser/function_ref.rb
 - lib/nasl/parser/global.rb
 - lib/nasl/parser/identifier.rb
 - lib/nasl/parser/if.rb
@@ -166,6 +168,7 @@ files:
 - test/unit/parser/test_call.rb
 - test/unit/parser/test_comment.rb
 - test/unit/parser/test_constant.rb
+- test/unit/parser/test_do_while.rb
 - test/unit/parser/test_empty.rb
 - test/unit/parser/test_expressions.rb
 - test/unit/parser/test_foreach.rb
@@ -225,6 +228,7 @@ test_files:
 - test/unit/parser/test_call.rb
 - test/unit/parser/test_comment.rb
 - test/unit/parser/test_constant.rb
+- test/unit/parser/test_do_while.rb
 - test/unit/parser/test_empty.rb
 - test/unit/parser/test_expressions.rb
 - test/unit/parser/test_foreach.rb