• Douglas Barbosa Alexandre's avatar
    Merge branch '25301-git-2.11-force-push-bug' into 'master' · 022242c3
    Douglas Barbosa Alexandre authored
    Accept environment variables from the `pre-receive` script
    
    ## Summary
    
    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`, and
       `GIT_QUARANTINE_PATH`) on the `/allowed` endpoint, and then include
       these environment variables while calling out to git.
    
    4. This commit includes these environment variables while making the "force
       push" check.
    
    ## Issue Numbers
    
    - Closes #25301 (assuming the corresponding `gitlab-shell` MR has been merged in first)
    - Corresponding `gitlab-shell` MR: gitlab-org/gitlab-shell!112
    - Corresponding EE MR: gitlab-org/gitlab-ee!964
    
    ## Tasks
    
    -  [#25301/!7967/!112] Git version 2.11.0 - Can't push to protected branch as master or developer
        - [x]  Investigate
        - [x]  Implementation
            - [x]  `force_push.rb` should use the relevant environment variables
            - [x]  Any other instances of `/allowed` calling out to git directly? 
            - [x]  Verify that the fix works over SSH as well
            - [x]  Can we trim the number of env variables? Do we need all 3?
            - [x]  Whitelist variables. Server shouldn't pass through _any_ env variable passed in
            - [x]  Any security implications?
            - [x]  Check for force push return code
            - [x]  Shouldn't be able to opt-out from the force push check by passing an env variable
        - [x]  Tests
            - [x]  CE
                - [x]  Added
                - [x]  Passing
            - [x]  Shell
                - [x]  Added
                - [x]  Passing
        - [x]  Meta
            - [x]  CHANGELOG entry created
            - [x]  Branch has no merge conflicts with `master`
            - [x]  Squashed related commits together
            - [x]  EE merge request
        - [x]  Review
            - [x]  Endboss
        - [ ]  Follow-up
            - [x]  Make sure EE is working as expected
            - [x]  [CE] Gitlab changes without gitlab-shell changes shouldn't raise any exceptions
            - [x]  [CE] Gitlab-shell changes without gitlab changes shouldn't raise any exceptions
            - [x]  [EE] Gitlab changes without gitlab-shell changes shouldn't raise any exceptions
            - [x]  [EE] Gitlab-shell changes without gitlab changes shouldn't raise any exceptions
        - [ ]  Wait for merge
            - [ ]  CE
            - [ ]  EE
            - [x]  Shell
    
    
    See merge request !7967
    022242c3
Name
Last commit
Last update
..
api Loading commit data...
assets Loading commit data...
backup Loading commit data...
banzai Loading commit data...
bitbucket Loading commit data...
ci Loading commit data...
constraints Loading commit data...
container_registry Loading commit data...
generators/rails/post_deployment_migration Loading commit data...
gitlab Loading commit data...
json_web_token Loading commit data...
mattermost Loading commit data...
omni_auth Loading commit data...
omniauth/strategies Loading commit data...
rouge Loading commit data...
support Loading commit data...
tasks Loading commit data...
banzai.rb Loading commit data...
disable_email_interceptor.rb Loading commit data...
email_template_interceptor.rb Loading commit data...
event_filter.rb Loading commit data...
expand_variables.rb Loading commit data...
extracts_path.rb Loading commit data...
file_size_validator.rb Loading commit data...
file_streamer.rb Loading commit data...
gitlab.rb Loading commit data...
gt_one_coercion.rb Loading commit data...
repository_cache.rb Loading commit data...
static_model.rb Loading commit data...
unfold_form.rb Loading commit data...
uploaded_file.rb Loading commit data...
version_check.rb Loading commit data...