Skip to content

Commit 2476ce5

Browse files
authored
Merge pull request #20273 from JohannesLks/fix/post-windows-manage-remove-host-20157
fix(post/windows/manage/remove_host): handle whitespace parsing robustly
2 parents c4f2b9e + d9e96f9 commit 2476ce5

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

modules/post/windows/manage/remove_host.rb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,15 @@ def run
5959
fdray = fd.read.split("\r\n")
6060

6161
fdray.each do |line|
62-
unless line.match("\t#{hosttoremove}$")
62+
main_part = line.split('#', 2).first.to_s.strip
63+
parts = main_part.split(/\s+/)
64+
if parts[1..-1].to_a.include?(hosttoremove)
65+
parts.delete_if { |p| p.casecmp(hosttoremove).zero? }
66+
next if parts.size < 2
67+
rebuilt = parts.join(' ')
68+
rebuilt += " " + line.split('#', 2).last if line.include?('#')
69+
newfile += "#{rebuilt}\r\n"
70+
else
6371
newfile += "#{line}\r\n"
6472
end
6573
end

0 commit comments

Comments
 (0)