Skip to content

Commit 3a0383b

Browse files
authored
Merge pull request #120 from IceBear2k/fix_os_detection
Fix os detection
2 parents 48adbed + a427b8a commit 3a0383b

File tree

1 file changed

+38
-38
lines changed

1 file changed

+38
-38
lines changed

libraries/ssh_crypto.rb

+38-38
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,32 @@ def valid_ciphers # rubocop:disable Metrics/CyclomaticComplexity, Metrics/Method
4040
end
4141
when 'debian'
4242
case inspec.os[:release]
43-
when /6\./, /7\./
43+
when /^6\./, /^7\./
4444
ciphers = ciphers53
45-
when /8\./, /9\./
45+
when /^8\./, /^9\./
4646
ciphers = ciphers66
4747
end
4848
when 'redhat', 'centos', 'oracle'
4949
case inspec.os[:release]
50-
when /6\./
50+
when /^6\./
5151
ciphers = ciphers53
52-
when /7\./
52+
when /^7\./
5353
ciphers = ciphers66
5454
end
5555
when 'amazon', 'fedora', 'alpine'
5656
ciphers = ciphers66
5757
when 'opensuse'
5858
case inspec.os[:release]
59-
when /13\.2/
59+
when /^13\.2/
6060
ciphers = ciphers66
61-
when /42\./
61+
when /^42\./
6262
ciphers = ciphers66
6363
end
6464
when 'mac_os_x'
6565
case inspec.os[:release]
66-
when /10.9\./
66+
when /^10.9\./
6767
ciphers = ciphers53
68-
when /10.10\./, /10.11\./, /10.12\./
68+
when /^10.10\./, /^10.11\./, /^10.12\./
6969
ciphers = ciphers66
7070
end
7171
end
@@ -90,34 +90,34 @@ def valid_kexs # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLen
9090
end
9191
when 'debian'
9292
case inspec.os[:release]
93-
when /6\./
93+
when /^6\./
9494
kex = nil
95-
when /7\./
95+
when /^7\./
9696
kex = kex59
97-
when /8\./, /9\./
97+
when /^8\./, /^9\./
9898
kex = kex66
9999
end
100100
when 'redhat', 'centos', 'oracle'
101101
case inspec.os[:release]
102-
when /6\./
102+
when /^6\./
103103
kex = nil
104-
when /7\./
104+
when /^7\./
105105
kex = kex66
106106
end
107107
when 'amazon', 'fedora', 'alpine'
108108
kex = kex66
109109
when 'opensuse'
110110
case inspec.os[:release]
111-
when /13\.2/
111+
when /^13\.2/
112112
kex = kex66
113-
when /42\./
113+
when /^42\./
114114
kex = kex66
115115
end
116116
when 'mac_os_x'
117117
case inspec.os[:release]
118-
when /10.9\./
118+
when /^10.9\./
119119
kex = kex59
120-
when /10.10\./, /10.11\./, /10.12\./
120+
when /^10.10\./, /^10.11\./, /^10.12\./
121121
kex = kex66
122122
end
123123
end
@@ -143,34 +143,34 @@ def valid_macs # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLen
143143
end
144144
when 'debian'
145145
case inspec.os[:release]
146-
when /6\./
146+
when /^6\./
147147
macs = macs53
148-
when /7\./
148+
when /^7\./
149149
macs = macs59
150-
when /8\./, /9\./
150+
when /^8\./, /^9\./
151151
macs = macs66
152152
end
153153
when 'redhat', 'centos', 'oracle'
154154
case inspec.os[:release]
155-
when /6\./
155+
when /^6\./
156156
macs = macs53
157-
when /7\./
157+
when /^7\./
158158
macs = macs66
159159
end
160160
when 'amazon', 'fedora', 'alpine'
161161
macs = macs66
162162
when 'opensuse'
163163
case inspec.os[:release]
164-
when /13\.2/
164+
when /^13\.2/
165165
macs = macs66
166-
when /42\./
166+
when /^42\./
167167
macs = macs66
168168
end
169169
when 'mac_os_x'
170170
case inspec.os[:release]
171-
when /10.9\./
171+
when /^10.9\./
172172
macs = macs59
173-
when /10.10\./, /10.11\./, /10.12\./
173+
when /^10.10\./, /^10.11\./, /^10.12\./
174174
macs = macs66
175175
end
176176
end
@@ -191,20 +191,20 @@ def valid_privseparation
191191
case inspec.os[:name]
192192
when 'debian'
193193
case inspec.os[:release]
194-
when /6\./
194+
when /^6\./
195195
ps = ps53
196196
end
197197
when 'redhat', 'centos', 'oracle'
198198
case inspec.os[:release]
199199
# redhat/centos/oracle 6.x has ssh 5.3
200-
when /6\./
200+
when /^6\./
201201
ps = ps53
202-
when /7\./
202+
when /^7\./
203203
ps = ps59
204204
end
205205
when 'ubuntu'
206206
case inspec.os[:release]
207-
when /18\./
207+
when /^18\./
208208
ps = ps75
209209
end
210210
when 'fedora', 'alpine'
@@ -231,32 +231,32 @@ def valid_algorithms # rubocop:disable Metrics/CyclomaticComplexity, Metrics/Met
231231
end
232232
when 'debian'
233233
case inspec.os[:release]
234-
when /7\./
234+
when /^7\./
235235
alg = alg60
236-
when /8\./, /9\./
236+
when /^8\./, /^9\./
237237
alg = alg66
238238
end
239239
when 'redhat', 'centos', 'oracle'
240240
case inspec.os[:release]
241-
when /6\./
241+
when /^6\./
242242
alg = alg53
243-
when /7\./
243+
when /^7\./
244244
alg = alg66
245245
end
246246
when 'amazon', 'fedora', 'alpine'
247247
alg = alg66
248248
when 'opensuse'
249249
case inspec.os[:release]
250-
when /13\.2/
250+
when /^13\.2/
251251
alg = alg66
252-
when /42\./
252+
when /^42\./
253253
alg = alg66
254254
end
255255
when 'mac_os_x'
256256
case inspec.os[:release]
257-
when /10.9\./
257+
when /^10.9\./
258258
alg53
259-
when /10.10\./, /10.11\./, /10.12\./
259+
when /^10.10\./, /^10.11\./, /^10.12\./
260260
alg66
261261
end
262262
end

0 commit comments

Comments
 (0)