f82d549d26
1. Starting version 2.11, git changed the way the pre-receive flow works.
- Previously, the new potential objects would be added to the main repo. If the
pre-receive passes, the new objects stay in the repo but are linked up. If
the pre-receive fails, the new objects stay orphaned in the repo, and are
cleaned up during the next `git gc`.
- In 2.11, the new potential objects are added to a temporary "alternate object
directory", that git creates for this purpose. If the pre-receive passes, the
objects from the alternate object directory are migrated to the main repo. If
the pre-receive fails the alternate object directory is simply deleted.
2. In our workflow, the pre-recieve script (in `gitlab-shell) calls the
`/allowed` endpoint, which calls out directly to git to perform
various checks. These direct calls to git do _not_ have the necessary
environment variables set which allow access to the "alternate object
directory" (explained above). Therefore these calls to git are not able to
access any of the new potential objects to be added during this push.
3. We fix this by accepting the relevant environment variables
(GIT_ALTERNATE_OBJECT_DIRECTORIES, GIT_OBJECT_DIRECTORY) on the
`/allowed` endpoint, and then include these environment variables while
calling out to git.
4. This commit includes (whitelisted) these environment variables while making
the "force push" check. A `Gitlab::Git::RevList` module is extracted to
prevent `ForcePush` from being littered with these checks.
65 lines
1.7 KiB
Ruby
65 lines
1.7 KiB
Ruby
module API
|
|
module Helpers
|
|
module InternalHelpers
|
|
# Project paths may be any of the following:
|
|
# * /repository/storage/path/namespace/project
|
|
# * /namespace/project
|
|
# * namespace/project
|
|
#
|
|
# In addition, they may have a '.git' extension and multiple namespaces
|
|
#
|
|
# Transform all these cases to 'namespace/project'
|
|
def clean_project_path(project_path, storage_paths = Repository.storages.values)
|
|
project_path = project_path.sub(/\.git\z/, '')
|
|
|
|
storage_paths.each do |storage_path|
|
|
storage_path = File.expand_path(storage_path)
|
|
|
|
if project_path.start_with?(storage_path)
|
|
project_path = project_path.sub(storage_path, '')
|
|
break
|
|
end
|
|
end
|
|
|
|
project_path.sub(/\A\//, '')
|
|
end
|
|
|
|
def project_path
|
|
@project_path ||= clean_project_path(params[:project])
|
|
end
|
|
|
|
def wiki?
|
|
@wiki ||= project_path.end_with?('.wiki') &&
|
|
!Project.find_with_namespace(project_path)
|
|
end
|
|
|
|
def project
|
|
@project ||= begin
|
|
# Check for *.wiki repositories.
|
|
# Strip out the .wiki from the pathname before finding the
|
|
# project. This applies the correct project permissions to
|
|
# the wiki repository as well.
|
|
project_path.chomp!('.wiki') if wiki?
|
|
|
|
Project.find_with_namespace(project_path)
|
|
end
|
|
end
|
|
|
|
def ssh_authentication_abilities
|
|
[
|
|
:read_project,
|
|
:download_code,
|
|
:push_code
|
|
]
|
|
end
|
|
|
|
def parse_allowed_environment_variables
|
|
return if params[:env].blank?
|
|
|
|
JSON.parse(params[:env])
|
|
|
|
rescue JSON::ParserError
|
|
end
|
|
end
|
|
end
|
|
end
|