Skip to content

Cleaner fix using GIT_ALLOW_PROTOCOL. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
longboardcat merged 1 commit into from
Dec 14, 2015
Merged

Cleaner fix using GIT_ALLOW_PROTOCOL. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .rubocop_todo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Metrics/AbcSize:
# Offense count: 1
# Configuration parameters: CountComments.
Metrics/ClassLength:
Max: 125
Max: 124

# Offense count: 38
# Configuration parameters: AllowURI, URISchemes.
Expand Down
9 changes: 4 additions & 5 deletions lib/git-fastclone.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ class Runner

DEFAULT_REFERENCE_REPO_DIR = '/var/tmp/git-fastclone/reference'

DEFAULT_GIT_ALLOW_PROTOCOL = 'file:git:http:https:ssh'

attr_accessor :reference_dir, :prefetch_submodules, :reference_mutex, :reference_updated,
:options, :logger, :abs_clone_path, :using_local_repo

Expand Down Expand Up @@ -90,6 +92,8 @@ def initialize
def run
url, path, options = parse_inputs
logger.info("Cloning #{url} to #{path}") if logger
Cocaine::CommandLine.environment['GIT_ALLOW_PROTOCOL'] =
ENV['GIT_ALLOW_PROTOCOL'] || DEFAULT_GIT_ALLOW_PROTOCOL
clone(url, options[:branch], path)
end

Expand Down Expand Up @@ -247,11 +251,6 @@ def store_updated_repo(url, mirror, repo_name, fail_hard)
# moment means we only need to synchronize our own threads in case a single
# submodule url is included twice via multiple dependency paths
def with_git_mirror(url)
if url.lstrip.start_with?('ext::')
logger.info("Skipping #{url} for security purpose (CVE-2015-7545)") if logger
return
end

update_reference_repo(url, true)

# Sometimes remote updates involve re-packing objects on a different thread
Expand Down