kscript 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a72c639d7028f3032a3ab8d6508308cd174a1174f698d5099f86356b1bef9f31
-  data.tar.gz: 898a2845e93a58bb1760a92850b091b84fcd374d92b138c13022e85dc6868877
+  metadata.gz: 812d19779e0fadd4fc72f94999c3d8776a2391147c467c14067d203050c94c01
+  data.tar.gz: adad5fb5f74798030650f6595f8e90fc86eacfb490a4b7bb5c2fefca1d4552d7
 SHA512:
-  metadata.gz: 869a3dfa24680f0c6e95cbdb82f0d8e6f981f5868d5f5c30b0183b7d2490b64ee2ce670e08190f095eea1291f26c31293e215759ee9545eab2a1d602b36a9bba
-  data.tar.gz: 5d24ef70c21851e42b337fd8e0222d50bb9f0def1e61a0121e2edaac8eb5fd16d4233adb8560e428eada8ee5e312a2c717f5ce30826c93891988861a38ee6260
+  metadata.gz: e2fff6ee0202f526fb11452d3848ce5d2c0f872bb6c457ebbf8dec4f55e45c0532fbd1b8daddc0d58133814c83553ef6a9f8e063c1ef4812bdf9bd4c869ec364
+  data.tar.gz: 6866406cb4c5fd9c74b079c636d778171099db330309f38e13dcfd85f2adbdcd3aa2d96a453b8ad46f46fc505353d4c175b0c40a41732743da7073ce386f2c43

data/lib/kscript/cli.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require 'kscript'
-require 'io/console'
 require 'kscript/banner'
-require 'thor'
 
 module Kscript
   class CLI < Thor

data/lib/kscript/logger.rb

@@ -55,7 +55,7 @@ module Kscript
       @logger.send(level, entry.to_json)
     end
 
-    # 极客风格终端输出
+    # 终端输出
     def klog(level, message, context = {})
       if human_output?
         puts "[#{level.to_s.upcase}] #{message} #{context.map { |k, v| "#{k}=#{v}" }.join(' ')}".strip

data/lib/kscript/plugins/kk_ip_utils.rb

@@ -7,9 +7,6 @@
 
 require 'kscript'
 
-require 'http'
-require 'json'
-
 module Kscript
   class KkIpUtils < Base
     IP_API_BASE_URL = 'http://ip-api.com/json'

data/lib/kscript/plugins/kk_jenkins_utils.rb

@@ -6,12 +6,6 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
-require 'http'
-require 'base64'
-require 'rexml/document'
-require 'json'
-require 'fileutils'
-require 'kscript/base'
 
 module Kscript
   class KkJenkinsUtils < Base

data/lib/kscript/plugins/kk_kibana_utils.rb

@@ -6,7 +6,6 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
-require 'securerandom'
 
 module Kscript
   class KkKibanaUtils < Base

data/lib/kscript/plugins/kk_optimize_utils.rb

@@ -6,7 +6,6 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
-require 'open3'
 
 module Kscript
   class KkOptimizeUtils < Base

data/lib/kscript/plugins/kk_portscan_utils.rb

@@ -6,8 +6,6 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
-require 'socket'
-require 'timeout'
 
 module Kscript
   class KkPortscanUtils < Base
@@ -17,10 +15,11 @@ module Kscript
     # @param host [String] target host to scan
     # @param ports [Array<Integer>] list of ports to scan
     # @param thread_count [Integer] number of concurrent threads
-    def initialize(target = nil, ports = (1..1024), *_args, **opts)
+    def initialize(target = nil, ports = (1..1024), thread_count = 50, *_args, **opts)
       super(**opts.merge(service: 'kk_port_scanner'))
       @target = target
-      @ports = ports.is_a?(Range) ? ports : (1..1024)
+      @ports = parse_ports(ports)
+      @thread_count = (opts[:thread_count] || thread_count || 50).to_i
     end
 
     def run
@@ -31,23 +30,62 @@ module Kscript
 
     # Execute port scanning using multiple threads
     def scan
-      msg = "Scanning #{@target} ports #{@ports}"
+      msg = "Scanning #{@target} ports #{@ports} with concurrency=#{@thread_count}"
       if human_output?
         puts msg
       else
         logger.kinfo(msg)
       end
-      @ports.each do |port|
-        Socket.tcp(@target, port, connect_timeout: 0.5) do |_sock|
-          if human_output?
-            puts "Port #{port} is open"
-          else
-            logger.kinfo('Port open', port: port)
-            logger.kinfo("Port #{port} is open")
+      queue = Queue.new
+      @ports.each { |port| queue << port }
+      threads = []
+      @thread_count.times do
+        threads << Thread.new do
+          until queue.empty?
+            port = nil
+            begin
+              port = queue.pop(true)
+            rescue ThreadError
+              break
+            end
+            begin
+              Socket.tcp(@target, port, connect_timeout: 0.5) do |_sock|
+                if human_output?
+                  puts "Port #{port} is open"
+                else
+                  logger.kinfo('Port open', port: port)
+                  logger.kinfo("Port #{port} is open")
+                end
+              end
+            rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, SocketError
+              # closed or filtered
+            end
           end
         end
-      rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, SocketError
-        # closed or filtered
+      end
+      threads.each(&:join)
+    end
+
+    # 支持多种端口参数格式: 22,80,443 或 1..1024
+    def parse_ports(ports)
+      return ports.to_a if ports.is_a?(Range)
+
+      if ports.is_a?(String)
+        if ports.include?(',')
+          ports.split(',').map(&:to_i)
+        elsif ports.include?('..')
+          begin
+            eval(ports).to_a
+          rescue StandardError
+            (1..1024).to_a
+          end
+        else
+          [ports.to_i]
+        end
+      elsif ports.is_a?(Array)
+        ports.map(&:to_i)
+      else
+        (1..1024).to_a
       end
     end
 
@@ -56,11 +94,11 @@ module Kscript
     end
 
     def self.arguments
-      '<target_host>'
+      '<target_host> [ports] [thread_count]'
     end
 
     def self.usage
-      "kscript portscan 192.168.1.1\nkscript portscan example.com --ports=22,80,443"
+      "kscript portscan 192.168.1.1\nkscript portscan example.com 22,80,443 100\nkscript portscan 192.168.1.1 1..1024 200"
     end
 
     def self.group

data/lib/kscript/plugins/kk_projscan_utils.rb

@@ -6,7 +6,6 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
-require 'json'
 
 module Kscript
   class KkProjscanUtils < Base

data/lib/kscript/plugins/kk_sh_utils.rb

@@ -6,7 +6,6 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
-require 'nokogiri'
 
 module Kscript
   class KkShUtils < Base

data/lib/kscript/plugins/kk_wg_pass_utils.rb

@@ -6,7 +6,6 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
-require 'bcrypt'
 
 module Kscript
   class KkWgPassUtils < Base

data/lib/kscript/utils.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'yaml'
-require 'fileutils'
-
 module Kscript
   module Utils
     class Config

data/lib/kscript/version.rb

@@ -6,5 +6,5 @@
 # https://opensource.org/licenses/MIT
 
 module Kscript
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kscript
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Kk