summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'id-ctx-for-auth-check' into 'main'Nick Thomas2021-07-274-56/+157
|\ \ | | | | | | | | | | | | Log same correlation_id on auth keys check of ssh connections See merge request gitlab-org/gitlab-shell!501
| * | Sshd: Log same correlation_id on auth keysIgor Drozdov2021-07-274-56/+157
|/ /
* | Merge branch 'sh-update-go-proxyproto' into 'main'Nick Thomas2021-07-273-4/+8
|\ \ | | | | | | | | | | | | Update go-proxyproto to v0.6.0 See merge request gitlab-org/gitlab-shell!499
| * | Set a 90-second timeout on proxy headersStan Hu2021-07-261-9/+12
| | |
| * | Update go-proxyproto to v0.6.0Stan Hu2021-07-262-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From https://github.com/pires/go-proxyproto/releases: Prevent potentially malicious client(s) from opening connections and not send the proxy protocol header, which could lead to DoS as the server would hold those socket descriptors open indefinitely, eventually running out of resources. The solution is to set a read deadline when waiting for the PROXY protocol header: https://github.com/pires/go-proxyproto/pull/74
* | | Merge branch 'sh-fix-gofmt' into 'main'Nick Thomas2021-07-2710-25/+26
|\ \ \ | |/ / |/| | | | | | | | Make gofmt check fail if there are any matching files See merge request gitlab-org/gitlab-shell!500
| * | Fix formatting via make fmtStan Hu2021-07-269-24/+22
| | |
| * | Make gofmt check fail if there are any matching filesStan Hu2021-07-261-1/+4
|/ / | | | | | | | | | | | | | | gofmt doesn't return an exit code 1 if there are matching files: https://github.com/golang/go/issues/24230 To fix this, use the same trick we use in Workhorse to parse output. Also add a `make fmt` step to format all the code properly.
* | Merge branch 'id-switch-logging-to-labkit' into 'main'Patrick Bajao2021-07-238-48/+46
|\ \ | | | | | | | | | | | | Switch to labkit/log for logging functionality See merge request gitlab-org/gitlab-shell!498
| * | Switch to labkit/log for logging functionalityIgor Drozdov2021-07-228-48/+46
| | |
* | | Merge branch '521-test-connection-dot-go' into 'main'Patrick Bajao2021-07-221-5/+73
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Unit tests for internal/sshd/connection.go Closes #521 See merge request gitlab-org/gitlab-shell!497
| * | Unit tests for internal/sshd/connection.goNick Thomas2021-07-221-5/+73
|/ /
* | Merge branch 'id-prometheus-metrics-for-http' into 'main'Nick Thomas2021-07-214-40/+101
|\ \ | | | | | | | | | | | | Prometheus metrics for HTTP requests See merge request gitlab-org/gitlab-shell!496
| * | Prometheus metrics for HTTP requestsIgor Drozdov2021-07-214-40/+101
|/ / | | | | | | | | A RoundTripper for tracking the duration of an http request is introduced
* | Merge branch 'igorwwwwwwwwwwwwwwwwwwww-main-patch-84756' into 'main'Nick Thomas2021-07-202-11/+6
|\ \ | | | | | | | | | | | | Add tracing instrumentation to http client See merge request gitlab-org/gitlab-shell!495
| * | remove tracing.NewRoundTripper from internal/Config, now that NewHTTPClient ↵Igor Wiedler2021-07-201-10/+4
| | | | | | | | | | | | already includes it
| * | Add tracing instrumentation to http clientIgor2021-07-201-1/+2
|/ /
* | Merge branch 'id-kubernetes-probes' into 'main'Nick Thomas2021-07-194-15/+115
|\ \ | | | | | | | | | | | | Provide liveness and readiness probes See merge request gitlab-org/gitlab-shell!494
| * | Provide liveness and readiness probesIgor Drozdov2021-07-194-15/+115
|/ / | | | | | | | | They are going to be used to determine whether a server is alive and ready to accept traffic
* | Merge branch 'id-cancelable-sshd' into 'main'Nick Thomas2021-07-154-23/+159
|\ \ | | | | | | | | | | | | Shutdown sshd gracefully See merge request gitlab-org/gitlab-shell!484
| * | Shutdown sshd gracefullyIgor Drozdov2021-07-154-23/+159
|/ / | | | | | | | | | | | | | | When interruption signal is sent, we are closing ssh listener to prevent it from accepting new connections Then after configured grace period, we cancel the context to cancel all ongoing operations
* | Merge branch 'id-refactor-test-helper' into 'main'Nick Thomas2021-07-145-41/+14
|\ \ | | | | | | | | | | | | Refactor testhelper.PrepareTestRootDir using t.Cleanup See merge request gitlab-org/gitlab-shell!493
| * | Refactor testhelper.PrepareTestRootDir using t.CleanupIgor Drozdov2021-07-145-41/+14
| | |
* | | Merge branch 'change_log_format' into 'main'Patrick Bajao2021-07-132-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Change default logging format to JSON See merge request gitlab-org/gitlab-shell!476
| * | | log_format changed from 'text' to 'json'listout2021-05-261-3/+3
| | | | | | | | | | | | | | | | Edited log_format description comment, if for 'text' if a user need 'text' logging
| * | | changed filename extension to .log as json can operate on .log filelistout2021-05-262-2/+2
| | | |
| * | | default log format changed to json, making it reflect in example configlistout2021-05-241-5/+5
| | | |
| * | | changed the format of log file to json from textlistout2021-05-241-2/+2
| | | |
* | | | Merge branch 'ashmckenzie/gitlab-shell-13-20-0-release' into 'main'v13.20.0Patrick Bajao2021-07-072-1/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Release v13.20.0 See merge request gitlab-org/gitlab-shell!492
| * | | | Release v13.20.0Ash McKenzie2021-07-072-1/+9
|/ / / /
* | | | Merge branch '330494-geo-ssh-push-proxy-hanging-bug' into 'main'Ash McKenzie2021-07-075-8/+76
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Fix the Geo SSH push proxy hanging See merge request gitlab-org/gitlab-shell!487
| * | | Fix the Geo SSH push proxy hangingValery Sizov2021-07-015-8/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Geo SSH proxy push currently impossible when the only action that happens is branch removal. This fix works in a way that it waits for flush packet from git and then checks pkt lines to determine is pack data is expected. The thing is that git doesnt send pack data when only branch removal happens. Explanation is in https://gitlab.com/gitlab-org/gitlab/-/issues/330494
* | | | Merge branch 'remove-bin-authorized-keys' into 'main'Ash McKenzie2021-07-051-9/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove bin/authorized_keys See merge request gitlab-org/gitlab-shell!491
| * | | | Remove bin/authorized_keysNick Thomas2021-07-011-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We committed to removing this script in the 13.x release cycle, and it was announced then, but we never actually got around to it. Its functionality is completely replicated, in a safer manner, by the bin/gitlab-shell-authorized-keys script. Changelog: removed
* | | | | Merge branch '475-make-install' into 'main'Igor Drozdov2021-07-012-7/+38
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add a make install command Closes #475 See merge request gitlab-org/gitlab-shell!490
| * | | | Add a make install commandNick Thomas2021-07-012-7/+38
| |/ / / | | | | | | | | | | | | Changelog: added
* | | | Merge branch 'fix-failing-spec' into 'main'Patrick Bajao2021-06-301-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Fix a failing spec See merge request gitlab-org/gitlab-shell!489
| * | | Fix a failing specNick Thomas2021-06-291-1/+1
|/ / / | | | | | | | | | | | | | | | | | | When the shell environment includes SSH_CONNECTION, one spec fails as the way we're stubbing the environment to the subprocess doesn't wipe out the pre-existing variable. This commit changes how we do it so the spec passes even in this environment.
* | | Merge branch 'id-create-process-page' into 'main'Nick Thomas2021-06-292-21/+46
|\ \ \ | |_|/ |/| | | | | | | | Create PROCESS.md page with Security release process See merge request gitlab-org/gitlab-shell!488
| * | Create PROCESS.md page with Security release processIgor Drozdov2021-06-232-21/+46
|/ /
* | Merge branch '140-standardize-logging-timestamp-format' into 'main'Patrick Bajao2021-06-212-1/+38
|\ \ | | | | | | | | | | | | | | | | | | Standardize logging timestamp format Closes #140 See merge request gitlab-org/gitlab-shell!485
| * | Adding a UTC converter and testGary Holtz2021-06-182-1/+38
|/ /
* | Merge branch 'brad-tense-correction' into 'main'Ash McKenzie2021-06-081-1/+1
|\ \ | | | | | | | | | | | | "Limits" to "Limit" on line 10 to align tenses See merge request gitlab-org/gitlab-shell!483
| * | "Limits" to "Limit" on line 10 to align tensesBrad Sevy2021-06-071-1/+1
|/ /
* | Merge branch 'release-13-19-0' into 'main'v13.19.0Nick Thomas2021-06-042-1/+8
|\ \ | | | | | | | | | | | | Release v13.19.0 See merge request gitlab-org/gitlab-shell!482
| * | Release v13.19.0Nick Thomas2021-06-042-1/+8
|/ /
* | Merge branch '500_git_upload_pack_test' into 'main'Patrick Bajao2021-06-041-0/+23
|\ \ | | | | | | | | | | | | Add acceptance test for git-upload-pack See merge request gitlab-org/gitlab-shell!477
| * | Add acceptance test for git-upload-packVasilii Iakliushin2021-06-011-0/+23
| | | | | | | | | | | | Contributes to https://gitlab.com/gitlab-org/gitlab-shell/-/issues/500
* | | Merge branch 'ps-upgrade-gitaly' into 'main'Nick Thomas2021-06-0411-29/+84
|\ \ \ | | | | | | | | | | | | | | | | fix: upgrade of the gitaly dependency See merge request gitlab-org/gitlab-shell!481
| * | | fix: upgrade of the gitaly dependencyPavlo Strokov2021-06-0211-29/+84
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly project now properly respects module release flow and includes a module suffix in the package name. It requires to re-write all non-suffixed imports with suffixed of a specific version of tha module. With proper module versioning we don't need to use a 'replace' directive to point to specific commit and can use semantic versioning for the gitaly dependency. Part of: https://gitlab.com/gitlab-org/gitaly/-/issues/3177
View Lorry Controller Status