summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch '501-gitaly-respect-parent-context' into 'main'Nick Thomas2021-05-1013-41/+39
|\ | | | | | | | | Respect parent context for Gitaly calls See merge request gitlab-org/gitlab-shell!469
| * Respect parent context for Gitaly callsNick Thomas2021-05-0513-41/+39
| | | | | | | | | | | | | | | | | | Without these changes, Gitaly calls would not be linked to a parent context. This means that they would have an unassociated correlationID, and Gitaly RPC calls would not be cancel()ed by parent context cancellation. Changelog: fixed
* | Merge branch '501-remove-chdir-call' into 'main'Igor Drozdov2021-05-061-6/+0
|\ \ | | | | | | | | | | | | Stop changing directory to the filesystem root See merge request gitlab-org/gitlab-shell!470
| * | Stop changing directory to the filesystem rootNick Thomas2021-05-061-6/+0
|/ / | | | | | | | | | | | | | | | | | | | | This behaviour dates from when Gitaly RPCs were executed in Ruby by a Go subprocess. It's not needed for gitlab-shell now that it's in Go, and it's a very strange thing for gitlab-sshd. Best just to remove it. If we wanted to retain this behaviour, we could have an `os.Chdir` call in the gitlab-shell binary, but I just don't think it's needed. Changelog: fixed
* | Merge branch '478-update-labkit' into 'main'Igor Drozdov2021-05-052-18/+371
|\ \ | | | | | | | | | | | | | | | | | | Update LabKit to v1.4.0 Closes #478 See merge request gitlab-org/gitlab-shell!468
| * | Update LabKit to v1.4.0478-update-labkitNick Thomas2021-04-302-18/+371
| |/
* | Merge branch '516-handle-ssl-cert-dir-correctly' into 'main'Nick Thomas2021-05-045-87/+97
|\ \ | | | | | | | | | | | | | | | | | | gitlab-sshd: Respect the ssl_cert_dir config Closes #516 See merge request gitlab-org/gitlab-shell!467
| * | gitlab-sshd: Respect the ssl_cert_dir config516-handle-ssl-cert-dir-correctlyNick Thomas2021-04-305-87/+97
| |/ | | | | | | Changelog: fixed
* | Merge branch 'dont-close-span-early' into 'main'Stan Hu2021-04-301-1/+0
|\ \ | |/ |/| | | | | Don't finish the opentracing span early See merge request gitlab-org/gitlab-shell!466
| * Don't finish the opentracing span earlydont-close-span-earlyNick Thomas2021-04-301-1/+0
|/ | | | | | | | | Calling finished() in `ContextWithCorrelationID` breaks opentracing, since it expects us to call it just before exiting, and this defer runs on function completion. All existing users of ContextWithCorrelationID already `defer finish()` themselves, so this call is entirely surplus to requirements.
* Merge branch 'release-13-18-0' into 'main'v13.18.0Nick Thomas2021-04-262-1/+7
|\ | | | | | | | | Release v13.18.0 See merge request gitlab-org/gitlab-shell!465
| * Release v13.18.0Nick Thomas2021-04-262-1/+7
|/
* Merge branch '511-be-safe-against-panics' into 'main'Igor Drozdov2021-04-263-3/+71
|\ | | | | | | | | | | | | sshd: Recover from per-session and per-connection panics Closes #511 See merge request gitlab-org/gitlab-shell!464
| * sshd: Recover from per-session and per-connection panics511-be-safe-against-panicsNick Thomas2021-04-233-3/+71
|/ | | | | | Without this, a failure in a single session could take out a whole connection, or a failure in a single connection could take out the whole server.
* Merge branch '511-extract-session' into 'main'Igor Drozdov2021-04-233-175/+257
|\ | | | | | | | | Extract sshd connections and sessions into their own files and structs See merge request gitlab-org/gitlab-shell!463
| * Extract sshd connections and sessions into their own files and structsNick Thomas2021-04-233-175/+257
|/
* Merge branch '491-support-proxy-protocol' into 'main'Igor Drozdov2021-04-127-5/+48
|\ | | | | | | | | | | | | gitlab-sshd: Support the PROXY protocol Closes #491 and gitlab-com/gl-infra/infrastructure#10954 See merge request gitlab-org/gitlab-shell!461
| * gitlab-sshd: Support the PROXY protocolNick Thomas2021-04-127-5/+48
|/
* Merge branch '518-fix-thread-safety' into 'main'Patrick Bajao2021-04-122-23/+23
|\ | | | | | | | | | | | | Fix thread-safety issues in gitlab-shell Closes #518 See merge request gitlab-org/gitlab-shell!462
| * Fix thread-safety issues in gitlab-shell518-fix-thread-safetyNick Thomas2021-04-092-23/+23
|/
* Merge branch 'id-refactor-cleanup' into 'main'Nick Thomas2021-03-1730-166/+116
|\ | | | | | | | | Replace cleanup functions with t.Cleanup See merge request gitlab-org/gitlab-shell!460
| * Replace cleanup functions with t.CleanupIgor Drozdov2021-03-1730-166/+116
|/ | | | | In this case we don't need to propagate cleanup function. It simplifies the code.
* Merge branch '500-gitlab-sshd-acceptance-tests' into 'main'Igor Drozdov2021-03-174-0/+197
|\ | | | | | | | | gitlab-sshd: Acceptance test for the discover command See merge request gitlab-org/gitlab-shell!457
| * gitlab-sshd: Acceptance test for the discover commandNick Thomas2021-03-174-0/+197
| | | | | | | | | | With this, we can start to build confidence in making changes to gitlab-sshd.
* | Merge branch '496-move-env-introspection-to-sshenv' into 'main'Nick Thomas2021-03-1621-213/+209
|\ \ | | | | | | | | | | | | chore: Move environment introspection to sshenv module See merge request gitlab-org/gitlab-shell!451
| * | chore: Refactor env introspection to rely on command initialization496-move-env-introspection-to-sshenvLucas Charles2021-03-1521-213/+209
|/ / | | | | | | | | | | | | Refactors introspection of execution environment to rely on per-connection state (`gitlab-shell`) or per request (`gitlab-sshd`) Relates to https://gitlab.com/gitlab-org/gitlab-shell/-/issues/496
* | Merge branch 'ashmckenzie/update-requirements' into 'main'Nick Thomas2021-03-151-0/+3
|\ \ | |/ |/| | | | | Clarify which versions of Go we support See merge request gitlab-org/gitlab-shell!459
| * Clarify which versions of Go we supportashmckenzie/update-requirementsAsh McKenzie2021-03-151-0/+3
| |
* | Merge branch 'update-golang-versions' into 'main'Ash McKenzie2021-03-151-6/+9
|\ \ | |/ |/| | | | | Compile against go 1.14-1.16 See merge request gitlab-org/gitlab-shell!458
| * Compile against go 1.14-1.16update-golang-versionsNick Thomas2021-03-131-6/+9
|/
* Merge branch '512-docker-20.10.3' into 'main'Nick Thomas2021-03-091-5/+1
|\ | | | | | | | | | | | | Use Docker 20.10.3 instead of 19.03.0 on build Closes #512 See merge request gitlab-org/gitlab-shell!456
| * Use Docker 20.10.3 instead of 19.03.0 on build512-docker-20.10.3Takuya Noguchi2021-02-271-5/+1
|/ | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* Merge branch 'sh-release-13.7.0' into 'main'v13.17.0Nick Thomas2021-02-262-1/+6
|\ | | | | | | | | Release v13.17.0 See merge request gitlab-org/gitlab-shell!455
| * Release v13.17.0Stan Hu2021-02-262-1/+6
|/
* Merge branch 'sh-fix-log-permission-error' into 'main'Nick Thomas2021-02-262-2/+23
|\ | | | | | | | | Fix gitlab-shell panic when log file not writable See merge request gitlab-org/gitlab-shell!453
| * Fix gitlab-shell panic when log file not writableStan Hu2021-02-262-2/+23
|/ | | | | | | | | Previously when the gitlab-shell log was not writable, gitlab-shell would attempt to fall back to the syslog to log an error. However, if the syslog logger creation succeeded, gitlab-shell would panic since `err` was `nil`. Relates to https://gitlab.com/gitlab-org/gitlab-shell/-/issues/510
* Merge branch '477-fix-flaky-test' into 'main'Nick Thomas2021-02-221-6/+11
|\ | | | | | | | | Resolve "Intermittent test failure in TestUploadPack" See merge request gitlab-org/gitlab-shell!452
| * Use eventually to assert log entriesJaime Martinez2021-02-221-6/+11
|/
* Merge branch 'bjk/monitoring' into 'main'Nick Thomas2021-02-176-19/+316
|\ | | | | | | | | Add monitoring endpoint to sshd See merge request gitlab-org/gitlab-shell!449
| * Add basic metrics to sshdbjk/monitoringBen Kochie2021-02-161-0/+48
| | | | | | | | | | | | | | | | | | * Counter for how many times the max concurrent sessions limit was hit. * Histogram for duration of each SSH connection. https://gitlab.com/gitlab-org/gitlab-shell/-/issues/121 Signed-off-by: Ben Kochie <superq@gmail.com>
| * Add monitoring endpoint to sshdBen Kochie2021-02-165-19/+268
|/ | | | | | | | | | | Add a basic monitoring endpoint to the sshd command. * Listen on localhost port 9122 by default. * Integrate build/version info. * Update example config. https://gitlab.com/gitlab-org/gitlab-shell/-/issues/121 Signed-off-by: Ben Kochie <superq@gmail.com>
* Merge branch 'bjk/refactor_config' into 'main'Nick Thomas2021-02-162-51/+33
|\ | | | | | | | | Refactor Config defaults See merge request gitlab-org/gitlab-shell!450
| * Refactor Config defaultsBen Kochie2021-02-162-51/+33
|/ | | | | | | | | | | Use "omitempty" to allow defaults in the config file to be correctly passed. Without this, explicitly setting an empty default like an empty string will not work. Needed in order to allow explicitly disabling some settings. Related to: https://gitlab.com/gitlab-org/gitlab-shell/-/issues/121 Signed-off-by: Ben Kochie <superq@gmail.com>
* Merge branch 'bjk/bump_mods' into 'main'Nick Thomas2021-02-112-13/+75
|\ | | | | | | | | Update Go modules See merge request gitlab-org/gitlab-shell!448
| * Update Go modulesbjk/bump_modsBen Kochie2021-02-112-13/+75
| | | | | | | | | | | | | | | | | | | | Some pre-work for adding Prometheus metrics to SSH server. * Update Go modules to latest. * Add Go 1.15 build. https://gitlab.com/gitlab-org/gitlab-shell/-/issues/121 Signed-off-by: Ben Kochie <superq@gmail.com>
* | Merge branch 'security-limit-fscanl' into 'main'Nick Thomas2021-02-054-2/+29
|\ \ | |/ |/| | | | | Read limited input for yes answer See merge request gitlab-org/security/gitlab-shell!1
| * Read limited input for yes answerIgor Drozdov2021-02-054-2/+29
|/
* Merge branch '505-draft-release-v13-16-0' into 'main'v13.16.0Patrick Bajao2021-02-022-1/+6
|\ | | | | | | | | Release v13.16.0 See merge request gitlab-org/gitlab-shell!446
| * Release v13.16.0Ash McKenzie2021-02-032-1/+6
|/
* Merge branch ↵Ash McKenzie2021-02-013-3/+3
|\ | | | | | | | | | | | | '504-remove-the-session-duration-information-from-the-output-of-2fa_verify-command' into 'main' Resolve "Remove the session duration information from the output of `2fa_verify` command" See merge request gitlab-org/gitlab-shell!445
View Lorry Controller Status