Commit a3191463 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Add path sanitization to `StringPath`

[ci skip]
parent 3de8a462
...@@ -5,15 +5,12 @@ module Gitlab ...@@ -5,15 +5,12 @@ module Gitlab
# This is IO-operations safe class, that does similar job to # This is IO-operations safe class, that does similar job to
# Ruby's Pathname but without the risk of accessing filesystem. # Ruby's Pathname but without the risk of accessing filesystem.
# #
# TODO, better support for '../' and './'
#
class StringPath class StringPath
attr_reader :path, :universe attr_reader :path, :universe
def initialize(path, universe, metadata = []) def initialize(path, universe, metadata = [])
@path = prepare(path) @path = sanitize(path)
@universe = universe.map { |entry| prepare(entry) } @universe = universe.map { |entry| sanitize(entry) }
@universe << './' unless @universe.include?('./')
@metadata = metadata @metadata = metadata
end end
...@@ -60,15 +57,16 @@ module Gitlab ...@@ -60,15 +57,16 @@ module Gitlab
def descendants def descendants
return [] unless directory? return [] unless directory?
children = @universe.select { |entry| entry =~ /^#{@path}.+/ } select { |entry| entry =~ /^#{@path}.+/ }
children.map { |path| new(path) }
end end
def children def children
return [] unless directory? return [] unless directory?
return @children if @children return @children if @children
children = @universe.select { |entry| entry =~ %r{^#{@path}[^/]+/?$} }
@children = children.map { |path| new(path) } @children = select do |entry|
self.class.child?(@path, entry)
end
end end
def directories def directories
...@@ -104,9 +102,26 @@ module Gitlab ...@@ -104,9 +102,26 @@ module Gitlab
self.class.new(path, @universe) self.class.new(path, @universe)
end end
def prepare(path) def select
return path if path =~ %r{^(/|\.|\.\.)} selected = @universe.select { |entry| yield entry }
path.dup.prepend('./') selected.map { |path| new(path) }
end
def sanitize(path)
self.class.sanitize(path)
end
def self.sanitize(path)
# It looks like Pathname#new doesn't touch a file system,
# neither Pathname#cleanpath does, so it is, hopefully, filesystem safe
clean = Pathname.new(path).cleanpath.to_s
raise ArgumentError, 'Invalid path' if clean.start_with?('../')
clean + (path.end_with?('/') ? '/' : '')
end
def self.child?(path, entry)
entry =~ %r{^#{path}[^/\s]+/?$}
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment