root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Improve invalid build artifacts metadata path matcher

This commit is contained in:
Grzegorz Bizon 2016-01-11 12:50:21 +01:00
parent f80d7a868e
commit ffee05c242
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/gitlab/ci/build/artifacts/metadata.rb
View File

@ -43,6 +43,7 @@ module Gitlab
def match_entries(gz)
paths, metadata = [], []
match_pattern = %r{^#{Regexp.escape(@path)}[^/\s]*/?$}
invalid_pattern = %r{(^\.?\.?/)|(/\.?\.?/)}
until gz.eof? do
begin
@ -50,7 +51,7 @@ module Gitlab
meta = read_string(gz)
next unless path =~ match_pattern
next unless path_valid?(path)
next if path =~ invalid_pattern
paths.push(path)
metadata.push(JSON.parse(meta.chomp, symbolize_names: true))
@ -62,10 +63,6 @@ module Gitlab
[paths, metadata]
end
def path_valid?(path)
!(path.start_with?('/') || path =~ %r{\.?\./})
end
def read_version
gzip do|gz|
version_string = read_string(gz)