l-tools 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9eb6b4a8fca9a19f2ea318a0183d89552fd917a2949c7238a48a35ec422e59f
-  data.tar.gz: d976226b46ef89712d57b217c636fa6bc3ff84588de5d714310a4d590246ff29
+  metadata.gz: ccdd5035905c71206c23c250d80cc02537f20e77f261c1857b8fcba1e1267002
+  data.tar.gz: 77d587a78592e701095ed8c028a33b66bf0914ecb4f8b28f885d98d97f874ed3
 SHA512:
-  metadata.gz: 8ba5b0192edb76cf5bec9d1fea39c458f4b2d354d851d9b8da9398175e12b4ea4760c60503b4da3191e25861049ec115c55492da71abab9ca7d42bd428c5c097
-  data.tar.gz: 4fd9649d94db1fdf0bdf97a07408a892dfe48948b756e145be70edb5dbdd5b4d6f2b8ecad5c9c5389658c0fde5d66b04b88a5f8121715b0838a2f70d16b4feee
+  metadata.gz: f06fc28f33a40886f6b69a174b4c2bc58045c09c729c1f00973c0c960103065b1e14cef3a4797eafc14b709a3aa13234cea36c13d0b314f804d981f9340a1c75
+  data.tar.gz: 95cd3a893be065f6d9afaadbf38fbd6e96870483e073a087651bf9afff127873a92b7c0e08e153759f36829a07d6151ec9aa906cb0a3914a2428f4922356964a

data/lib/core/opts.rb

@@ -0,0 +1,37 @@
+
+module LTools
+  class Tool
+		class ToolOpts
+      def self.build(&block)
+        new(&block).to_s
+      end
+
+			def initialize
+				@args = []
+				yield self if block_given?
+			end
+
+			def on(opt, value, &block)
+				if value
+					value = block.call(value) if block
+					if value
+            @args << opt if opt
+            @args << value
+					end
+				end
+			end
+
+			def to_s
+        to_str
+			end
+
+      def to_str
+				" #{Shellwords.join(@args)} "
+      end
+
+			def to_a
+				@args
+			end
+		end
+	end
+end

data/lib/{tools → core}/tool.rb

@@ -7,11 +7,12 @@ ChildProcess.posix_spawn = true
 
 module LTools
   autoload :Shellwords, 'shellwords'
+  autoload :Tempfile,   'tempfile'
 
   class Tool
     extend Forwardable
 
-    attr_reader :stdin, :stdout, :stderr
+    attr_reader :stdin, :stdout, :stderr, :cmd
     attr_accessor :verbose
 
     def_delegators :@process, :stop, :pid, :exited?, \
@@ -53,7 +54,7 @@ module LTools
       @stdin = @process.io.stdin unless @inherit
       if @verbose
         puts "[#{'+'.light_green.bold}] #{self.class.to_s.light_yellow} (pid: #{pid})"
-        puts "  #{?$.light_red.bold} #{@cmd.join(' ')}"
+        puts "  #{?$.light_red.bold} #{command}"
         puts
       end
     end
@@ -70,6 +71,20 @@ module LTools
       @stderr_w.close
     end
 
+    def command
+      @cmd.map{|str|
+        if str.include?(' ')
+          if str.include? '"'
+            "'#{str}'"
+          else
+            "\"#{str}\""
+          end
+        else
+          str
+        end
+      }.join ' '
+    end
+
     def io_inherit!
       @inherit = true
       @process.io.inherit!

data/lib/l-tools.rb

@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
 
 module LTools
-  autoload :Tool,   'tools/tool'
-  autoload :Tshark, 'tools/tshark'
-  autoload :Nmap,   'tools/nmap'
+  autoload :Tool,     'core/tool'
+  autoload :ToolOpts, 'core/opts'
+
+  autoload :Tshark,   'tools/tshark'
+  autoload :Nmap,     'tools/nmap'
 
   @tools = []
 

data/lib/tools/nmap.rb

@@ -3,13 +3,46 @@ module LTools
   class Nmap < Tool
     @name = 'nmap'
 
-    def self.portscan(targets, ports: nil, mode: 'S', speed: 5, append: nil)
+    # TODO 非正常退出的情况, Root权限问题
+    def self.portscan(targets, ports: nil, mode: 'S', speed: 5, xml_report: nil, append: nil)
       cmd = "nmap -Pn -n -T#{speed} -s#{mode}"
-      cmd << " -p #{ports} " if ports
-      targets = targets.join(' ') if targets.is_a? Array
-      cmd << targets
-      cmd << append               if append
+      cmd << ToolOpts.build {|opts|
+        opts.on('-p', ports)
+        opts.on('-oX', xml_report){ |file|
+          break file unless file == :auto
+          @nmap_xml_report = Tempfile.new('ltools-nmap-xml-report')
+          @nmap_xml_report.close
+          @nmap_xml_report.to_path
+        }
+      }
+      cmd << self.targets_cmd(targets)
+      cmd << append if append
       new cmd
     end
+
+    def self.targets_cmd(targets)
+      case targets
+      when Array
+        if targets.size < 8
+          targets.join ' '
+        else
+          infile = Tempfile.new('ltools-nmap-')
+          infile.puts targets
+          infile.close
+          "-iL #{infile.to_path}"
+        end
+      when String
+        File.file?(targets) ? "-iL #{targets}" : targets
+      end
+    end
+
+    def xml_report
+      require 'nmap/xml'
+      if index = @cmd.index('-oX')
+        file = @cmd[index+1]
+        puts File.binread(file)
+        ::Nmap::XML.new(file)
+      end
+    end
   end
 end

data/lib/tools/tshark.rb

@@ -5,9 +5,11 @@ module LTools
 
     def self.capture(interface: nil, bpf: nil, fields:nil, filter: nil, append: nil)
       cmd = 'tshark'
-      cmd << " -i '#{interface}'" if interface
-      cmd << " -f '#{bpf}'"       if bpf
-      cmd << " -Y '#{filter}'"    if filter
+      cmd << ToolOpts.build {|opts|
+        opts.on('-i', interface)
+        opts.on('-f', bpf)
+        opts.on('-Y', filter)
+      }
       if fields
         fields = fields.split if fields.is_a? String
         fields.unshift ' -T fields'

data/lib/version.rb

@@ -1,4 +1,4 @@
 
 module LTools
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: l-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - L
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-29 00:00:00.000000000 Z
+date: 2018-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -62,9 +62,10 @@ files:
 - ".gitignore"
 - Gemfile
 - l-tools.gemspec
+- lib/core/opts.rb
+- lib/core/tool.rb
 - lib/l-tools.rb
 - lib/tools/nmap.rb
-- lib/tools/tool.rb
 - lib/tools/tshark.rb
 - lib/version.rb
 homepage: https://github.com/l-codes/l-tools