As we reevaluate how to best support and maintain Staging Ref in the future, we encourage development teams using this environment to highlight their use cases in the following issue: https://gitlab.com/gitlab-com/gl-infra/software-delivery/framework/software-delivery-framework-issue-tracker/-/issues/36.

Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • idrozdov/gitlab-shell
  • mmj/gitlab-shell
2 results
Show changes
Commits on Source (4)
  • Timothy Andrew's avatar
    Pass relevant git environment variables while calling `/allowed` · 752536bb
    Timothy Andrew authored
    
    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 calls the `/allowed` endpoint on the
       rails server. This `/allowed` endpoint 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 passing the relevant environment variables
       (GIT_ALTERNATE_OBJECT_DIRECTORIES, GIT_OBJECT_DIRECTORY, and
       GIT_QUARANTINE_PATH) to the `/allowed` endpoint, which will then include
       these environment variables while calling out to git.
    
    Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
    Unverified
    752536bb
  • Rémy Coutable's avatar
    Add 3.6.7 CHANGELOG · a812dc29
    Rémy Coutable authored
    
    Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
    Unverified
    a812dc29
  • Rémy Coutable's avatar
    Bump VERSION to 3.6.7 · f85d650e
    Rémy Coutable authored
    
    Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
    Unverified
    f85d650e
  • Rémy Coutable's avatar
    Merge branch 'backport-112-to-3-6-stable' into '3-6-stable' · bb4b8091
    Rémy Coutable authored
    Backport "Pass relevant git environment variables while calling `/allowed`" to 3-6-stable
    
    See merge request !120
    bb4b8091
v3.6.7
- Send (a selection of) git environment variables while making the API call to `/allowed`, !112
v3.6.6
- Re-use the default logger when logging metrics data
Loading
Loading
3.6.6
3.6.7
Loading
Loading
@@ -21,7 +21,12 @@ class GitlabAccess
end
def exec
status = api.check_access('git-receive-pack', @repo_name, @actor, @changes, @protocol)
env = {
"GIT_ALTERNATE_OBJECT_DIRECTORIES" => ENV["GIT_ALTERNATE_OBJECT_DIRECTORIES"],
"GIT_OBJECT_DIRECTORY" => ENV["GIT_OBJECT_DIRECTORY"]
}
status = api.check_access('git-receive-pack', @repo_name, @actor, @changes, @protocol, env: env.to_json)
raise AccessDeniedError, status.message unless status.allowed?
Loading
Loading
Loading
Loading
@@ -15,14 +15,15 @@ class GitlabNet
CHECK_TIMEOUT = 5
READ_TIMEOUT = 300
def check_access(cmd, repo, actor, changes, protocol)
def check_access(cmd, repo, actor, changes, protocol, env: {})
changes = changes.join("\n") unless changes.kind_of?(String)
params = {
action: cmd,
changes: changes,
project: project_name(repo),
protocol: protocol
protocol: protocol,
env: env
}
if actor =~ /\Akey\-\d+\Z/
Loading
Loading