Delete file: validation on normalization again

bug/bundler_fix
jvazquez-r7 2015-04-20 23:52:17 -05:00
parent 57df5c4f4f
commit 66d23e3b5e
No known key found for this signature in database
GPG Key ID: 38D99152B9352D83
3 changed files with 7 additions and 26 deletions

View File

@ -14,21 +14,18 @@ class OptAddressRange < OptBase
def normalize(value)
return nil unless value.kind_of?(String)
if (value =~ /^file:(.*)/)
path = $1
return false if not File.exists?(path) or File.directory?(path)
return File.readlines(path).map{ |s| s.strip}.join(" ")
elsif (value =~ /^rand:(.*)/)
if value =~ /^rand:(.*)/
count = $1.to_i
return false if count < 1
ret = ''
count.times {
ret << " " if not ret.empty?
ret << [ rand(0x100000000) ].pack("N").unpack("C*").map{|x| x.to_s }.join(".")
}
count.times do
ret << ' ' if not ret.empty?
ret << [ rand(0x100000000) ].pack('N').unpack('C*').map{|x| x.to_s }.join('.')
end
return ret
end
return value
value
end
def valid?(value)

View File

@ -13,14 +13,6 @@ class OptRaw < OptBase
end
def normalize(value)
if (value =~ /^file:(.*)/)
path = $1
begin
value = File.read(path)
rescue ::Errno::ENOENT, ::Errno::EISDIR
value = nil
end
end
value
end

View File

@ -13,14 +13,6 @@ class OptString < OptBase
end
def normalize(value)
if (value =~ /^file:(.*)/)
path = $1
begin
value = File.read(path)
rescue ::Errno::ENOENT, ::Errno::EISDIR
value = nil
end
end
value
end