nasl-pedant 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a6b4c22908b881b935d3f7a3c533b7dca735438
-  data.tar.gz: 44df11019465bd433a79877ace7df3f1d9fb53ea
+  metadata.gz: d41b8fcbe0898ca2aab9a2fcc9e1a7ef90ca900d
+  data.tar.gz: 0deb90491e2b59d9ebbd38f005306ae1b5aac425
 SHA512:
-  metadata.gz: 636d307ea833d5e34ebd7dad9582ecfd003961754ae44d9710c3be1e6bb1f86748355d63bf95a0887684f82581789d3ad0e0b6ab1a05326f52b2c26a0d2d5ba8
-  data.tar.gz: f31689c4a1a2920c099a3160e72fb672752420d70f1da1c97502caaf93fe0be28bd7d7865d0fc8895ef6400da27af95e380fb0d99aad142fc3893500ef9390df
+  metadata.gz: daa101baef76f0482ce3fec9dc479a40f7b03393bca55a53703a66efbd51debf6e0f6927ed394010f664450965e1f268b1e448d28bf787b276739f5369363103
+  data.tar.gz: 3f650035854cb18e97d652dba398db8e5352efac1386ba3a84551548f691242d58c4972295c89c7c153de612b54044afd49b0e66654e6c6bba29634084dc72e1

data/lib/pedant/checks/arity_of_builtins.rb

@@ -30,22 +30,46 @@ module Pedant
   class CheckArityOfBuiltins < Check
     @@anon_arity_of_one = Set.new [
       "isnull",
+      # Sockets
+      "get_port_state",
+      "get_tcp_port_state",
+      "get_udp_port_state",
+      "close",
+      # String functions
+      "strlen",
+      "int",
+      "uint",
+      "chomp",
+      "ord",
+      "hex",
+      "hexstr",
+      "tolower",
+      "toupper",
+      "xmlparse",
+      # Time
       "usleep",
       "sleep",
+      # Arrays and lists
       "keys",
       "max_index",
+      "sort",
+      # Runtime checks
       "typeof",
+      "typeof_ex",
       "defined_func",
+      # Bignum functions
       "bn_dec2raw",
       "bn_raw2dec",
       "bn_hex2raw",
       "bn_raw2hex",
       "bn_sqr",
+      # File system
       "fread",
       "unlink",
       "readdir",
       "mkdir",
       "rmdir",
+      # Unkeyed hashes (crypto)
       "SHA",
       "SHA1",
       "SHA224",
@@ -56,6 +80,7 @@ module Pedant
       "MD2",
       "MD4",
       "MD5",
+      # Knowledge base
       "get_kb_item",
       "get_kb_list",
       "get_global_kb_item",
@@ -68,20 +93,28 @@ module Pedant
 
     def check(file, tree)
       tree.all(:Call).each do |call|
-        next unless @@anon_arity_of_one.include? call.name.ident.name
         next unless call.name.indexes == []
-        next unless call.args.length != 1 or call.args.first.type != :anonymous
+        name = call.name.ident.name
 
-        fail
-        report(:error, "The builtin function '#{call.name.ident.name}' takes a single anonymous argument.")
+        if @@anon_arity_of_one.include? name
+          next if call.args.length == 1 and call.args.first.type == :anonymous
+          fail
+          report(:error, "The builtin function '#{name}' takes a single anonymous argument.")
+          # Pick the right thing to highlight.
+          if call.args.length == 0
+            report(:error, call.context(call))
+          elsif call.args.first.type != :anonymous
+            report(:error, call.args[0].context(call))
+          elsif call.args.length > 1
+            report(:error, call.args[1].context(call))
+          end
+        end
 
-        # Pick the right thing to highlight.
-        if call.args.length == 0
+        if name == "make_array"
+          next if call.args.length.even?
+          fail
+          report(:error, "The builtin function 'make_array()' takes an even number of arguments.")
           report(:error, call.context(call))
-        elsif call.args.first.type != :anonymous
-          report(:error, call.args[0].context(call))
-        elsif call.args.length > 1
-          report(:error, call.args[1].context(call))
         end
       end
     end

data/lib/pedant/commands/check.rb

@@ -109,7 +109,7 @@ module Pedant
 
     def self.run_all(opts, args)
       # Separate plugins and libraries from the rest of the arguments.
-      paths = args.select { |a| a =~ /(\/|\.(inc|nasl))$/ }
+      paths = args.select { |a| a =~ /(\/|\.(inc|nasl|pasl|tasl))$/ }
       args -= paths
 
       # If we have paths that aren't acceptable, there's a problem.
@@ -123,7 +123,7 @@ module Pedant
       paths.each do |path|
         begin
           Pathname.new(path).find do |dirent|
-            if dirent.file? && dirent.extname =~ /inc|nasl/
+            if dirent.file? && dirent.extname =~ /inc|nasl|pasl|tasl/
               dirents << dirent
             end
           end

data/lib/pedant/version.rb

@@ -1,3 +1,3 @@
 module Pedant
-  VERSION = '0.1.2'
+  VERSION = '0.1.4'
 end

data/test/unit/checks/test_arity_of_builtins.rb

@@ -82,4 +82,20 @@ class TestArityOfBuiltins < Test::Unit::TestCase
       %q|get_kb_item("hello/", index:index);|
     )
   end
+
+  def test_make_array_odd
+    check(
+      :fail,
+      :CheckArityOfBuiltins,
+      %q|make_array(1, 2, 3);|
+    )
+  end
+
+  def test_make_array_even
+    check(
+      :pass,
+      :CheckArityOfBuiltins,
+      %q|make_array(1, 2, 3, 4);|
+    )
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nasl-pedant
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Mak Kolybabi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake