kscript 1.1.1 → 1.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/kscript/plugins/kk_port_scan_utils.rb +15 -20
  3. data/lib/kscript/version.rb +1 -1
  4. metadata +57 -41
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9858f96cfbf2ee112ddc38885f50d0e2dec2247536c0611de542641b4865cbcf
4
- data.tar.gz: e3fec35b64539ed8a87d24fc4d4b647d6ff3f202f9844d61e9801b95d846aec2
3
+ metadata.gz: 29d10d822185ae11ba6256352e357068bb95a26a5400e18182c08831d7dc955f
4
+ data.tar.gz: bd8acb2d087a1818a1cd8b60e60f2c4eb0951b6eb1e50311a8d8bfa9ba736ec9
5
5
  SHA512:
6
- metadata.gz: 46ed820b66174793117e203f24a50b65c274247992f29283753b13f6c5f25026651bdb8222898636e2962477e78ecd66cbad311d8dcf54deff21dc4555051f82
7
- data.tar.gz: 36468f99eaccf8f268faf3de72201d435af545407bdab20e9601a898717bdd6f2b0dc7f1570d0c7700b0e98e3224724fbc8119485b8dbee8c6297029ad527f5a
6
+ metadata.gz: ffd635c5898e3a7362ca4a6b16f3f483a69d61478aee895d90d58cdf403f181a3a0a0b7195cb844c8c77d677d10e51449378d5447d328a520f1feb222ea9405b
7
+ data.tar.gz: 4542801758b3d3e9b910f63cfa4e5f5ed389a5bfd180fafa23801813d9f029431484846215d5ff9d0d648c1a566af3884a62b5e8656f7dfc25f1ea6dc4e0ad90
data/lib/kscript/plugins/kk_port_scan_utils.rb CHANGED
@@ -6,6 +6,7 @@
6
6
  # https://opensource.org/licenses/MIT
7
7
 
8
8
  # require 'kscript'
9
+ require 'concurrent-ruby'
9
10
 
10
11
  module Kscript
11
12
  class KkPortScanUtils < Kscript::Base
@@ -36,29 +37,23 @@ module Kscript
36
37
  def scan
37
38
  msg = "Scanning #{@target} ports #{@ports} with concurrency=#{@thread_count}"
38
39
  logger.kinfo(msg)
39
- queue = Queue.new
40
- @ports.each { |port| queue << port }
41
- threads = []
42
- @thread_count.times do
43
- threads << Thread.new do
44
- until queue.empty?
45
- port = nil
46
- begin
47
- port = queue.pop(true)
48
- rescue ThreadError
49
- break
50
- end
51
- begin
52
- Socket.tcp(@target, port, connect_timeout: 0.5) do |_sock|
53
- logger.kinfo('Port open', port: port)
54
- end
55
- rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, SocketError
56
- # closed or filtered
57
- end
40
+ pool = Concurrent::ThreadPoolExecutor.new(
41
+ min_threads: [2, @thread_count].min,
42
+ max_threads: @thread_count,
43
+ max_queue: @ports.size,
44
+ fallback_policy: :caller_runs
45
+ )
46
+ @ports.each do |port|
47
+ pool.post do
48
+ Socket.tcp(@target, port, connect_timeout: 0.5) do |_sock|
49
+ logger.kinfo('Port open', port: port)
58
50
  end
51
+ rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, SocketError
52
+ # closed or filtered
59
53
  end
60
54
  end
61
- threads.each(&:join)
55
+ pool.shutdown
56
+ pool.wait_for_termination
62
57
  end
63
58
 
64
59
  # 支持多种端口参数格式: 22,80,443 或 1..1024
data/lib/kscript/version.rb CHANGED
@@ -6,5 +6,5 @@
6
6
  # https://opensource.org/licenses/MIT
7
7
 
8
8
  module Kscript
9
- VERSION = '1.1.1'
9
+ VERSION = '1.1.2'
10
10
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kscript
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kk
@@ -14,126 +14,142 @@ dependencies:
14
14
  name: aws-sdk-s3
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '1.130'
19
+ version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: '1.130'
26
+ version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
- name: bcrypt
28
+ name: concurrent-ruby
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '3.1'
34
- - - "<"
35
- - !ruby/object:Gem::Version
36
- version: '4.0'
33
+ version: '0'
37
34
  type: :runtime
38
35
  prerelease: false
39
36
  version_requirements: !ruby/object:Gem::Requirement
40
37
  requirements:
41
38
  - - ">="
42
39
  - !ruby/object:Gem::Version
43
- version: '3.1'
44
- - - "<"
45
- - !ruby/object:Gem::Version
46
- version: '4.0'
40
+ version: '0'
47
41
  - !ruby/object:Gem::Dependency
48
42
  name: dotenv
49
43
  requirement: !ruby/object:Gem::Requirement
50
44
  requirements:
51
- - - "~>"
45
+ - - ">="
52
46
  - !ruby/object:Gem::Version
53
- version: '3.0'
47
+ version: '0'
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
51
  requirements:
58
- - - "~>"
52
+ - - ">="
59
53
  - !ruby/object:Gem::Version
60
- version: '3.0'
54
+ version: '0'
61
55
  - !ruby/object:Gem::Dependency
62
56
  name: httpx
63
57
  requirement: !ruby/object:Gem::Requirement
64
58
  requirements:
65
- - - "~>"
59
+ - - ">="
66
60
  - !ruby/object:Gem::Version
67
- version: '1.5'
61
+ version: '0'
68
62
  type: :runtime
69
63
  prerelease: false
70
64
  version_requirements: !ruby/object:Gem::Requirement
71
65
  requirements:
72
- - - "~>"
66
+ - - ">="
73
67
  - !ruby/object:Gem::Version
74
- version: '1.5'
68
+ version: '0'
75
69
  - !ruby/object:Gem::Dependency
76
70
  name: nokogiri
77
71
  requirement: !ruby/object:Gem::Requirement
78
72
  requirements:
79
73
  - - ">="
80
74
  - !ruby/object:Gem::Version
81
- version: '1.13'
82
- - - "<"
83
- - !ruby/object:Gem::Version
84
- version: '2.0'
75
+ version: '0'
85
76
  type: :runtime
86
77
  prerelease: false
87
78
  version_requirements: !ruby/object:Gem::Requirement
88
79
  requirements:
89
80
  - - ">="
90
81
  - !ruby/object:Gem::Version
91
- version: '1.13'
92
- - - "<"
82
+ version: '0'
83
+ - !ruby/object:Gem::Dependency
84
+ name: parallel
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - ">="
88
+ - !ruby/object:Gem::Version
89
+ version: '0'
90
+ type: :runtime
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - ">="
93
95
  - !ruby/object:Gem::Version
94
- version: '2.0'
96
+ version: '0'
95
97
  - !ruby/object:Gem::Dependency
96
98
  name: rake
97
99
  requirement: !ruby/object:Gem::Requirement
98
100
  requirements:
99
- - - "~>"
101
+ - - ">="
100
102
  - !ruby/object:Gem::Version
101
- version: '13.0'
103
+ version: '0'
102
104
  type: :runtime
103
105
  prerelease: false
104
106
  version_requirements: !ruby/object:Gem::Requirement
105
107
  requirements:
106
- - - "~>"
108
+ - - ">="
107
109
  - !ruby/object:Gem::Version
108
- version: '13.0'
110
+ version: '0'
109
111
  - !ruby/object:Gem::Dependency
110
112
  name: thor
111
113
  requirement: !ruby/object:Gem::Requirement
112
114
  requirements:
113
- - - '='
115
+ - - ">="
116
+ - !ruby/object:Gem::Version
117
+ version: '0'
118
+ type: :runtime
119
+ prerelease: false
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ requirements:
122
+ - - ">="
123
+ - !ruby/object:Gem::Version
124
+ version: '0'
125
+ - !ruby/object:Gem::Dependency
126
+ name: tty-prompt
127
+ requirement: !ruby/object:Gem::Requirement
128
+ requirements:
129
+ - - ">="
114
130
  - !ruby/object:Gem::Version
115
- version: 1.3.2
131
+ version: '0'
116
132
  type: :runtime
117
133
  prerelease: false
118
134
  version_requirements: !ruby/object:Gem::Requirement
119
135
  requirements:
120
- - - '='
136
+ - - ">="
121
137
  - !ruby/object:Gem::Version
122
- version: 1.3.2
138
+ version: '0'
123
139
  - !ruby/object:Gem::Dependency
124
140
  name: rubocop
125
141
  requirement: !ruby/object:Gem::Requirement
126
142
  requirements:
127
- - - "~>"
143
+ - - ">="
128
144
  - !ruby/object:Gem::Version
129
- version: '1.21'
145
+ version: '0'
130
146
  type: :development
131
147
  prerelease: false
132
148
  version_requirements: !ruby/object:Gem::Requirement
133
149
  requirements:
134
- - - "~>"
150
+ - - ">="
135
151
  - !ruby/object:Gem::Version
136
- version: '1.21'
152
+ version: '0'
137
153
  description: Kscript provides a set of handy Ruby scripts for system administration,
138
154
  development, and automation.
139
155
  email: