summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Release 13.23.2Igor Drozdov2022-02-112-1/+8
|/
* Merge branch 'id-update-labkit-version' into 'main'Ash McKenzie2022-02-112-26/+115
|\ | | | | | | | | Bump labkit version to 1.12.0 See merge request gitlab-org/gitlab-shell!569
| * Bump labkit version to 1.12.0Igor Drozdov2022-02-112-26/+115
|/ | | | It also bumps minor versions of its dependencies
* Merge branch 'dfrhodes-main-patch-08696' into 'main'Igor Drozdov2022-02-031-10/+6
|\ | | | | | | | | Add title and correct copyright notice to license See merge request gitlab-org/gitlab-shell!568
| * Add title and correct c.right notice to licenseDan Rhodes2022-02-031-10/+6
|/
* Merge branch 'sean_carroll-main-patch-51330' into 'main'Igor Drozdov2022-02-031-1/+1
|\ | | | | | | | | Update LICENSE to 2022 See merge request gitlab-org/gitlab-shell!566
| * Update LICENSE to 2022Sean Carroll2022-02-021-1/+1
| |
* | Merge branch 'id-handle-unhandled-errs' into 'main'Patrick Bajao2022-02-033-11/+23
|\ \ | |/ |/| | | | | Handle and log unhandled errors See merge request gitlab-org/gitlab-shell!564
| * Handle and log unhandled errorsIgor Drozdov2022-02-023-11/+23
| | | | | | | | | | | | | | | | | | Currently, we don't process the results of this execution, because it's not really imprortant Let's at least log the err if the execution went wrong That will also make Vulnerability report happy
* | Merge branch 'id-bump-go-proxyproto' into 'main'Ash McKenzie2022-02-022-3/+3
|\ \ | | | | | | | | | | | | Bump go-proxyproto package See merge request gitlab-org/gitlab-shell!563
| * | Bump go-proxyproto packageIgor Drozdov2022-02-012-3/+3
| |/
* | Merge branch '539-problem-with-upgrading' into 'main'Patrick Bajao2022-02-022-14/+15
|\ \ | | | | | | | | | | | | | | | | | | When building, ignore the vendor/ directory if present Closes #539 See merge request gitlab-org/gitlab-shell!565
| * | Ignore vendor/ directory even if presentAsh McKenzie2022-02-021-1/+1
| | |
| * | Ignore vendor directoryAsh McKenzie2022-02-021-0/+1
| | |
| * | Alpha sort .gitignoreAsh McKenzie2022-02-021-13/+13
|/ /
* | Merge branch '547-update-go-to-1176' into 'main'Ash McKenzie2022-02-011-1/+1
|\ \ | |/ |/| | | | | | | | | Update Go to version 1.17.6 Closes #547 See merge request gitlab-org/gitlab-shell!562
| * Update Go to version 1.17.6Dustin Collins2022-02-011-1/+1
|/
* Merge branch 'id-release-new-tag' into 'main'v13.23.1Igor Drozdov2022-01-312-1/+5
|\ | | | | | | | | Release 13.23.1 See merge request gitlab-org/gitlab-shell!561
| * Release 13.23.1Igor Drozdov2022-01-312-1/+5
|/
* Merge branch 'id-add-gitlab-golang-crypto' into 'main'Ash McKenzie2022-01-312-33/+6
|\ | | | | | | | | Replace golang.org/x/crypto with gitlab-org/golang-crypto See merge request gitlab-org/gitlab-shell!560
| * Replace golang.org/x/crypto with gitlab-org/golang-cryptoIgor Drozdov2022-01-282-33/+6
|/ | | | | | | This fork contains a fix for handling ssh-rsa public keys of gitlab-sshd Issue: https://gitlab.com/gitlab-org/gitlab-shell/-/issues/543
* Merge branch 'cmaxim-main-patch-05177' into 'main'Igor Drozdov2022-01-281-1/+1
|\ | | | | | | | | Update link for gitlab-workhorse project location See merge request gitlab-org/gitlab-shell!559
| * Update link for gitlab-workhorse project locationCostel Maxim2022-01-281-1/+1
| |
* | Merge branch 'update-bundler' into 'main'Ash McKenzie2022-01-282-2/+2
|\ \ | |/ |/| | | | | Update bundler to 2.3.6 because 2.1.4 is too old See merge request gitlab-org/gitlab-shell!554
| * Update bundler to 2.3.6Lin Jen-Shin2022-01-272-2/+2
|/
* Merge branch 'jv-release-13.23.0' into 'main'v13.23.0Igor Drozdov2022-01-252-1/+6
|\ | | | | | | | | Release 13.23.0 See merge request gitlab-org/gitlab-shell!558
| * Release 13.23.0Jacob Vosmaer2022-01-252-1/+6
|/
* Merge branch 'jv-ssh-sidechannel' into 'main'Igor Drozdov2022-01-2513-89/+511
|\ | | | | | | | | Add support for SSHUploadPackWithSidechannel RPC See merge request gitlab-org/gitlab-shell!557
| * Optionally use SSHUploadPackWithSidechannelJacob Vosmaer2022-01-258-16/+134
| | | | | | | | | | | | | | If the GitLab API returns an allowed response with use_sidechannel set to true, gitlab-shell will establish a sidechannel connection and use SSHUploadPackWithSidechannel instead of SSHUploadPack. This is an efficiency improvement.
| * Update gitaly/v14/client to 2e398afa0490ccdf5a82e1a7c7d824ae491eba16Jacob Vosmaer2022-01-253-25/+274
| | | | | | | | | | | | This updates the Gitaly client go.mod dependency to Gitaly commit 2e398afa0490ccdf5a82e1a7c7d824ae491eba16. This causes a grpc-go version bump, and hence a minor change in some of our test code.
| * Support parsing `use_sidechannel` API response fieldJacob Vosmaer2022-01-253-4/+63
| | | | | | | | | | | | This field will act as a feature flag that controls whether gitlab-shell uses the old SSHUploadPack RPC or the new SSHUploadPackWithSidechannel.
| * Refactor client response testsJacob Vosmaer2022-01-201-44/+40
| | | | | | | | | | | | | | | | | | | | This reduces coupling between tests in internal/gitlabnet/accessverifier/client_test.go, and will make it easier to add new test cases in the future. Note that the test server had a special behavior for the username "second", but this was never used. So we removed that behavior in this commit.
* | Merge branch 'rate-limiting-docs' into 'main'Igor Drozdov2022-01-191-1/+11
|\ \ | | | | | | | | | | | | Rate limiting documentation See merge request gitlab-org/gitlab-shell!556
| * | Rate limiting documentationSean Carroll2022-01-191-1/+11
|/ /
* | Merge branch 'sh-release-13.22.2' into 'main'v13.22.2Ash McKenzie2022-01-162-1/+9
|\ \ | | | | | | | | | | | | Release v13.22.2 See merge request gitlab-org/gitlab-shell!555
| * | Release v13.22.2Stan Hu2022-01-162-1/+9
|/ /
* | Merge branch 'sh-update-ruby-2.7.5' into 'main'Ash McKenzie2022-01-142-2/+2
|\ \ | |/ |/| | | | | Update to Ruby 2.7.5 See merge request gitlab-org/gitlab-shell!553
| * Update to Ruby 2.7.5Stan Hu2022-01-132-2/+2
|/ | | | | We don't need Ruby 2.7.4 cluttering our GDK when everything else has been upgraded to 2.7.5.
* Merge branch 'id-deprecate-self-signed-cert' into 'main'Ash McKenzie2022-01-132-1/+9
|\ | | | | | | | | Deprecate self_signed_cert config setting See merge request gitlab-org/gitlab-shell!552
| * Deprecate self_signed_cert config settingid-deprecate-self-signed-certIgor Drozdov2022-01-122-1/+9
|/ | | | | | | | | The option isn't required to accept self-signed certs On the other hand, if the option set to true it makes machine-in-the-middle attack possible Let's clarify it in the code that the option is deprecated
* Merge branch 'wc-intern-err' into 'main'Igor Drozdov2022-01-051-1/+6
|\ | | | | | | | | Suppress internal errors in client output See merge request gitlab-org/gitlab-shell!549
| * Suppress internal errors in client outputwc-intern-errWill Chandler2021-12-281-1/+6
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until recently, Gitaly was silently swallowing any errors returned by SSH `git upload-pack` processes. Clients would still receive stderr output and a non-zero return code, but Gitlab-Shell would receive error as nil and log success. With 9deaf47f1ecb00f0f36d18ee4a0fb1576f5a0efe Gitaly will now return an error when git fails, but this causes Gitlab-Shell to print out the GRPC error code as a message to the client: > fatal: couldn't find remote ref not-a-real-ref > fatal: the remote end hung up unexpectedly > remote: > remote: > ======================================================================== > remote: > remote: rpc error: code = Internal desc = SSHUploadPack: exit status 128 > remote: > remote: > ======================================================================== > remote: The `remote:` text gives no additional context for the user and adds clutter. This commit suppresses the additional message added by Gitlab-Shell on failure when the error type is `Internal`, returning client output to the format it was prior to the Gitaly change.
* Merge branch 'wc-sshd-upload-pack' into 'main'Igor Drozdov2021-12-281-8/+42
|\ | | | | | | | | Send full git request/response in SSHD tests See merge request gitlab-org/gitlab-shell!550
| * Send full git request/response in SSHD testswc-sshd-upload-packWill Chandler2021-12-221-8/+42
|/ | | | | | | | | | | | | | | Before 9deaf47f1ecb00f0f36d18ee4a0fb1576f5a0efe, Gitaly would return success for `SSHUploadPack` and `SSHUploadArchive` regardless of the exit code of the `git upload-pack|archive` process. As a result, the gitlab-sshd acceptance tests could rely on no errors being returned from Gitaly. Currently these tests send the minimum request needed to start a session, causing the server git process to fail as the `0000` flush packet to end the session is never sent. This commit fixes the tests by sending the full request/response needed for a successful git operation.
* Merge branch 'sh-bump-go-1.16.12' into 'main'Ash McKenzie2021-12-101-1/+1
|\ | | | | | | | | Bump .tool_versions to use Go v1.16.12 See merge request gitlab-org/gitlab-shell!548
| * Bump .tool_versions to use Go v1.16.12sh-bump-go-1.16.12Stan Hu2021-12-091-1/+1
|/ | | | Part of https://gitlab.com/groups/gitlab-org/-/epics/7111
* Merge branch 'id-release-13-22-1' into 'main'v13.22.1Igor Drozdov2021-11-242-1/+5
|\ | | | | | | | | Release v13.22.1 See merge request gitlab-org/gitlab-shell!547
| * Release v13.22.1Igor Drozdov2021-11-242-1/+5
|/
* Merge branch 'id-remove-ssl-cert-dir-logging' into 'main'Ash McKenzie2021-11-241-4/+0
|\ | | | | | | | | Remove SSL_CERT_DIR logging See merge request gitlab-org/gitlab-shell!546
| * Remove SSL_CERT_DIR loggingid-remove-ssl-cert-dir-loggingIgor Drozdov2021-11-231-4/+0
|/ | | | | This log entry doesn't respect log level, because the log level is configured after this logging happens
View Lorry Controller Status