nasl 0.3.0 → 0.4.0

data/lib/nasl/parser/namespace.rb

@@ -0,0 +1,50 @@
+################################################################################
+# 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 Namespace < Node
+    attr_reader :name, :body
+
+    include Enumerable
+
+    def initialize(tree, *tokens)
+      super
+
+      @body = if @tokens.length == 5 then @tokens[3] else [] end
+      @name = @tokens[1]
+
+      @children << :name
+      @children << :body
+    end
+
+    def each
+      @body.each{ |stmt| yield stmt }
+    end
+
+  end
+end

data/lib/nasl/parser/node.rb

@@ -39,15 +39,24 @@ module Nasl
       # Store all of the tokens that made up this node.
       @tokens = tokens
 
+      # handle empty token set
+
       # Extract the context object from the first token.
-      @ctx = @tokens.first.ctx
+      if(!@tokens.nil? and @tokens.length>0 and !@tokens.first.nil?)
+        @ctx = @tokens.first.ctx
+      end
     end
 
     def context(*args)
-      @ctx.context(region, *args)
+      if(!@ctx.nil?)
+        @ctx.context(region, *args)
+      end
     end
 
     def region
+      if(@tokens.flatten.first.nil?)
+        return []
+      end
       @tokens.flatten.first.region.begin..@tokens.flatten.last.region.end
     end
 

data/lib/nasl/parser/obj_var.rb

@@ -0,0 +1,41 @@
+################################################################################
+# 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 ObjVar < Node
+    attr_reader :idents
+
+    def initialize(tree, *tokens)
+      super
+
+      @idents = @tokens[1]
+
+      @children << :idents
+    end
+  end
+end

data/lib/nasl/parser/object.rb

@@ -0,0 +1,50 @@
+################################################################################
+# 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 Object < Node
+    attr_reader :name, :body
+
+    include Enumerable
+
+    def initialize(tree, *tokens)
+      super
+
+      @body = if @tokens.length == 5 then @tokens[3] else [] end
+      @name = @tokens[1]
+
+      @children << :name
+      @children << :body
+    end
+
+    def each
+      @body.each{ |stmt| yield stmt }
+    end
+
+  end
+end

data/lib/nasl/parser/switch.rb

@@ -0,0 +1,51 @@
+################################################################################
+# 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 Switch < Node
+    attr_reader :switch_expr, :switch_op, :body
+
+    def initialize(tree, *tokens)
+      super
+
+      if @tokens.length == 5
+        @switch_op = nil
+        @switch_expr = @tokens[2]
+        @body = @tokens[4]
+      else
+        @switch_op = @tokens[2] 
+        @switch_expr = @tokens[5]
+        @body = @tokens[7]
+      end
+
+      @children << :switch_op
+      @children << :switch_expr
+      @children << :body
+    end
+  end
+end

data/lib/nasl/token.rb

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

data/lib/nasl/tokenizer.rb

@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2011-2014, Tenable Network Security
+# Copyright (c) 2011-2016, Tenable Network Security
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -50,12 +50,25 @@ module Nasl
       'until'      => :UNTIL,
       'x'          => :REP,
       'while'      => :WHILE,
+      'namespace'  => :NAMESPACE,
+      'object'     => :OBJECT,
+#      'new'        => :NEW,
+      'var'        => :VAR,
+      'public'     => :PUBLIC,
+      'private'    => :PRIVATE,
+      'switch'    => :SWITCH,
+      'case'    => :CASE,
+      'default'    => :DEFAULT,
 
       'FALSE'      => :FALSE,
       'NULL'       => :UNDEF,
       'TRUE'       => :TRUE
     }
 
+    @@operator_lengths = []
+
+    # These are all of the operators defined in NASL. Their order is vitally
+    # important.
     @@operators = [
       ["><",   :SUBSTR_EQ],
       [">!<",  :SUBSTR_NE],
@@ -122,16 +135,23 @@ module Nasl
     @@annotated = [
       :EXPORT,
       :FUNCTION,
-      :GLOBAL
+      :GLOBAL,
+      :PUBLIC,
+      :PRIVATE
     ]
 
     def initialize!
       return if @@initialized
 
-      # Convert the operators into a regex-compatible form.
-      @@operators = @@operators.map do |op, type|
-        [Regexp.new("^#{Regexp.escape(op)}"), op, type]
+      @@operator_lengths = @@operators.map { |op, type| op.length }.uniq
+
+      # Convert the operators into a form that's fast to access.
+      tmp = {}
+      @@operators.each_with_index do |op_and_type, index|
+        op, type = op_and_type
+        tmp[op] = [op, type, index]
       end
+      @@operators = tmp
 
       @@initialized = true
     end
@@ -199,7 +219,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]*/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.
@@ -308,16 +329,30 @@ module Nasl
       return [:COMMENT, block.join("\n")]
     end
 
-    def get_operator
-      # These are all of the operators defined in NASL. Their order is vitally
-      # important.
-      @@operators.each do |regex, op, type|
-        next if @line !~ regex
-        consume(op.length)
-        return [type, op]
+    def get_comment_c_style
+      if @code[@point+1] == '/'
+        comment = @line[/^\/\/.*$/]
+      # Multi-line: /* comment here */
+      else
+        newline = @code[@point..-1]
+        comment = newline[/^\/\*.*?\*\//m]
+        die("Unterminated multiline comment") if comment.nil?
       end
 
-      return nil
+      consume(comment.length)
+      skip
+
+      return [:COMMENT, comment]
+    end
+
+    def get_operator
+      line_prefixes = @@operator_lengths.map { |len| @line[0, len] }
+      operators_that_matched = line_prefixes.map { |prefix| @@operators[prefix] }
+      operators_that_matched.reject!(&:nil?)
+      return nil if operators_that_matched.empty?
+      op, type = operators_that_matched.sort { |a, b| a[2] <=> b[2] }.first
+      consume(op.length)
+      return [type, op]
     end
 
     def get_token
@@ -344,6 +379,8 @@ module Nasl
         get_integer
       elsif @char == '#'
         get_comment
+      elsif (@char == '/') && ["/", "*"].include?(@code[@point+1])
+        get_comment_c_style
       else
         get_operator
       end

data/lib/nasl/version.rb

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

data/nasl.gemspec

@@ -48,9 +48,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'racc', '~>1.4'
-  s.add_development_dependency 'rake', '~>10.1'
+  s.add_development_dependency 'racc', '~> 1.4'
+  s.add_development_dependency 'rake', '~> 10.3'
 
-  s.add_runtime_dependency 'builder', '~> 3.1'
+  s.add_runtime_dependency 'builder', '~> 3.2'
   s.add_runtime_dependency 'rainbow', '~> 2.0'
+  s.add_runtime_dependency 'test-unit-minitest'
 end

data/test/unit/parser/test_namespace.rb

@@ -0,0 +1,45 @@
+################################################################################
+# 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 TestNamespace < Test::Unit::TestCase
+  include Nasl::Test
+
+  def test_empty
+    same("namespace foo {}", "<tree><namespace><identifier name=\"foo\"/></namespace></tree>")
+  end
+
+  def test_inner_fn
+    same("namespace foo { function fn(){} }", "<tree><namespace><identifier name=\"foo\"/><function><identifier name=\"fn\"/><block></block><fn_type>normal</fn_type></function></namespace></tree>")
+  end
+
+  def test_nested_namespace
+    same("namespace foo { namespace bar {} }", "<tree><namespace><identifier name=\"foo\"/><namespace><identifier name=\"bar\"/></namespace></namespace></tree>")
+  end
+
+  def test_namespace_indent
+    same("foo::bob();", "<tree><call><lvalue><identifier name=\"foo::bob\"/></lvalue></call></tree>");
+  end
+end

data/test/unit/parser/test_object.rb

@@ -0,0 +1,75 @@
+################################################################################
+# 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 TestObject < Test::Unit::TestCase
+  include Nasl::Test
+
+  def test_each
+    tree = parse(
+      <<-EOF
+namespace test {
+  namespace test_inner {
+    object foo {
+      var bob = 1;
+      var a1,b1;
+      # foo
+      public function bar_pub() {}
+      # foo
+      function bar_priv_default() { a = 1; return a; }
+      private function bar_priv() {}
+      # foo
+      function test_var()
+      {
+        var test = 'a';
+        var x,y,z,t;
+      }
+    }
+  }
+  # foo!
+  function foo(){}
+}
+# foo!
+function foo(){}
+      EOF
+    )
+    assert_not_nil(tree)
+
+    objects = tree.all(:Object)
+    assert_equal(1, objects.length)
+    assert_equal(objects[0].name.name, "foo")
+
+    functions = tree.all(:Function)
+    assert_equal(6, functions.length)
+
+    assert_equal(functions[0].tokens[0].type.to_s, "PUBLIC")
+    assert_equal(functions[1].tokens[0], nil)
+    assert_equal(functions[2].tokens[0].type.to_s, "PRIVATE")
+
+    obj_vars = tree.all(:ObjVar)
+    assert_equal(2, obj_vars.length)
+  end
+
+end