summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Remove repo_path from GitlabShellzj-remove-repo-pathZeger-Jan van de Weg2018-08-164-43/+7
|/ | | | | | | | | | | | | | | The internal api returns '/' from gitlab, since `8fad07383ada021fc995294fd0fe0f77fe37da35` from GitLab CE. To clean up later, https://gitlab.com/gitlab-org/gitlab-shell/issues/135 was created. This change closes that issue, making it possible to remove the field from the response on GitLab-CE too. Given the Rails app always returns `/` as the repository_path, the associated checks are basically a noop too. The tests are updated and at times look a little fishy, but those are testing code that is to be removed in another MR. Closes https://gitlab.com/gitlab-org/gitlab-shell/issues/135
* Merge branch 'rs-rspec' into 'master'Nick Thomas2018-08-1619-319/+303
|\ | | | | | | | | | | | | Update to RSpec 3 Closes #54 See merge request gitlab-org/gitlab-shell!229
| * Disable WEBrick logging in HTTPUNIXServer to reduce spec output noisers-rspecRobert Speicher2018-08-151-0/+6
| |
| * Fix a RuboCop warningRobert Speicher2018-08-151-1/+1
| |
| * Update webmock to 3.4.2Robert Speicher2018-08-154-7/+10
| |
| * Reorganize spec_helper; add support files for VCR and HTTPUNIXServerRobert Speicher2018-08-153-35/+40
| |
| * Use `output` matcher in one testRobert Speicher2018-08-151-4/+1
| |
| * Require gitlab_init from spec_helperRobert Speicher2018-08-151-0/+2
| | | | | | | | This defines `ROOT_PATH`, which we later stub.
| * Use secure RubyGems sourceRobert Speicher2018-08-152-2/+2
| |
| * Override `ROOT_PATH` in specs in a less insane wayRobert Speicher2018-08-152-3/+7
| |
| * Remove usages of `its` in specsRobert Speicher2018-08-153-16/+27
| |
| * Update rspec to 3.8.0; remove rspec-itsRobert Speicher2018-08-153-17/+15
| |
| * Autocorrect specs via `transpec -k its -v stub_with_hash`Robert Speicher2018-08-1510-195/+195
| |
| * Remove guard and guard-rspecRobert Speicher2018-08-153-42/+0
| |
| * Update VCR to 4.0.0Robert Speicher2018-08-152-3/+3
|/
* Merge branch '148-merge-8-1-1-to-master' into 'master'Robert Speicher2018-08-156-3/+176
|\ | | | | | | | | | | | | Resolve "gitlab-shell 8.1.1 not on master" Closes #148 and #145 See merge request gitlab-org/gitlab-shell!230
| * Merge remote-tracking branch 'upstream/8-1-stable' into ↵Nick Thomas2018-08-146-3/+176
| |\ |/ / | | | | 148-merge-8-1-1-to-master
| * Release v8.1.1v8.1.18-1-stableNick Thomas2018-08-092-1/+4
| |
| * Merge branch 'fix-ssh-certificate-regressions-8-1' into '8-1-stable'Stan Hu2018-08-094-2/+172
| |\ | | | | | | | | | | | | Fix two regressions in SSH certificate support (8.1) See merge request gitlab-org/gitlab-shell!226
| | * Guard discovery by username or key against bad API responsesNick Thomas2018-08-091-1/+1
| | |
| | * Harden gitlab-shell against arguments following the gl_id parameter in the ↵Nick Thomas2018-08-092-4/+4
| | | | | | | | | | | | command line
| | * Fix two regressions in SSH certificate supportÆvar Arnfjörð Bjarmason2018-08-084-2/+172
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix two regressions in my 2e8b670 ("Add support for SSH certificate authentication", 2018-06-14) merged in gitlab-org/gitlab-shell!207. This fixes the issue noted in gitlab-org/gitlab-shell#145 where the command-line contains things other than the key/user/username, and also a regression where SSH certificates are being used, and the username presented in the key is unknown to GitLab. In that case, we should log the user in as "Anonymous" (on an instance that allows public access), but because of how the error checking around api.discover() was implemented we ended up erroring out instead.
* | Merge branch 'revert-refactor' into 'master'Robert Speicher2018-08-1466-2084/+1177
|\ \ | | | | | | | | | | | | | | | | | | Revert refactor Closes #147 See merge request gitlab-org/gitlab-shell!228
| * | Restore "Pass custom git_config_options to Gitalyo"Nick Thomas2018-08-1412-275/+473
| | | | | | | | | | | | This reverts commit 764f6f47fa6a8698ae033532ae49875a87030518.
| * | Revert "Merge branch 'ash.mckenzie/srp-refactor' into 'master'"Nick Thomas2018-08-1466-2077/+1164
| | | | | | | | | | | | | | | This reverts commit 3aaf4751e09262c53544a1987f59b1308af9b6c1, reversing changes made to c6577e0d75f51b017f2f332838b97c3ca5b497c0.
| * | Revert "Pass custom git_config_options to Gitalyo"Nick Thomas2018-08-1411-468/+276
|/ / | | | | | | This reverts commit f4ce4a3c31a9a7fb2fa0bb7daa185d34b8c03c00.
* | Merge branch 'sh-add-require-create-hooks' into 'master'Rémy Coutable2018-08-091-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Add missing require statement in create-hooks Closes gitlab-ce#50160 See merge request gitlab-org/gitlab-shell!225
| * | Add missing require statement in create-hooksStan Hu2018-08-091-0/+1
|/ / | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50160
* | Merge branch 'rd-support-git-config-options' into 'master'Robert Speicher2018-08-0811-276/+468
|\ \ | | | | | | | | | | | | Pass custom git_config_options to Gitaly See merge request gitlab-org/gitlab-shell!221
| * | Pass custom git_config_options to GitalyoRubén Dávila2018-08-0711-276/+468
| | | | | | | | | | | | | | | The /api/internal/allowed endpoint on GitLab has been updated to return some custom git options that can be used with git commands, we need to pass these received options to Gitaly.
* | | Merge branch 'ash.mckenzie/srp-refactor' into 'master'Robert Speicher2018-08-0866-1164/+2077
|\ \ \ | |_|/ |/| | | | | | | | Refactor that focuses on SRP improvements See merge request gitlab-org/gitlab-shell!214
| * | Typo fixAsh McKenzie2018-08-081-1/+1
| |/
| * Actor::Base audit_usernames? now an aliasAsh McKenzie2018-08-031-4/+2
| |
| * Merge remote-tracking branch 'origin/master' into ash.mckenzie/srp-refactorAsh McKenzie2018-08-0210-13/+34
| |\ | |/ |/|
* | Merge branch 'release-gitlab-8-1' into 'master'v8.1.0Nick Thomas2018-08-012-2/+4
|\ \ | | | | | | | | | | | | Release v8.1.0 See merge request gitlab-org/gitlab-shell!219
| * | Release v8.1.0Nick Thomas2018-08-012-2/+4
|/ /
* | Merge branch 'add-protocol-v2-logic' into 'master'Nick Thomas2018-08-016-39/+61
|\ \ | | | | | | | | | | | | Add Git protocol v2 See merge request gitlab-org/gitlab-shell!217
| * | use GIT_PROTOCOL env variable in gitlab_shell#execJames Lopez2018-08-012-2/+6
| | |
| * | update gitlab shell to remove git_protocol env varJames Lopez2018-08-012-2/+0
| | |
| * | Add Git protocol v2James Lopez2018-08-016-40/+60
|/ /
| * Added TODO to fixup whatever namingAsh McKenzie2018-08-011-0/+2
| |
| * Fixed comments in bin/gitlab-shell-authorized*Ash McKenzie2018-08-012-4/+4
| |
| * GitlatNet#discover only parse JSON if a 200Ash McKenzie2018-08-013-2/+54
| |
| * Update Actor::Username, add specsAsh McKenzie2018-08-014-5/+96
| |
| * Actor::Base#label now describes the class nicelyAsh McKenzie2018-08-011-1/+5
| |
| * Merge remote-tracking branch 'origin/master' into ash.mckenzie/srp-refactorAsh McKenzie2018-08-0119-103/+211
| |\ | |/ |/|
* | Merge branch 'release-version-8' into 'master'v8.0.0Nick Thomas2018-07-312-1/+4
|\ \ | | | | | | | | | | | | Release GitLab Shell v8.0.0 See merge request gitlab-org/gitlab-shell!218
| * | Release GitLab Shell v8.0.0Nick Thomas2018-07-312-1/+4
|/ /
* | Merge branch 'user-argument-2/upstream' into 'master'Nick Thomas2018-07-319-55/+192
|\ \ | | | | | | | | | | | | | | | | | | Add support for ssh certificates Closes gitlab-ce#34572 See merge request gitlab-org/gitlab-shell!207
| * | Add support for SSH certificate authenticationÆvar Arnfjörð Bjarmason2018-07-269-55/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This along with the code submitted to gitlab-ce in the gitlab-org/gitlab-ce! MR implements SSH certificate authentication. See the docs added to gitlab-ce for why and how to enable this. This, along with that MR, closes gitlab-org/gitlab-ce#3457 Implementation notes: - Because it's easy to do, and because an earlier nascent version of this would pass user-ID to gitlab-shell, that's now supported, even though the SSH certificate authentication uses username-USERNAME. - The astute reader will notice that not all the API calls in gitlab-ce's lib/api/internal.rb support a "username" argument, some only support "user_id". There's a few reasons for this: a) For this to be efficient, I am bending over backwards to avoid extra API calls when using SSH certificates. Therefore the /allowed API call will now return a "user id" to us if we're allowed to proceed further. This is then fed to existing APIs that would only be called after a successful call to /allowed. b) Not all of the git-shell codepaths go through /internal/allowed, or ever deal with a repository, e.g. the argument-less "Welcome to GitLab", and /internal/2fa_recovery_codes. These need to use /internal/discover to figure out details about the user, so support looking that up by username. c) Once we have the "user id", the GL_ID gets passed down to e.g. user-authored hooks. I don't want to have those all break by having to handle a third GL_ID mode of "username" in addition to the current "key id" and "user id".
View Lorry Controller Status