summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Remove session duration information from output of 2fa_verify command504-remove-the-session-duration-information-from-the-output-of-2fa_verify-commandManoj M J2021-01-293-3/+3
|/ | | | | This change removes session duration information from output of 2fa_verify command
* Merge branch 'add-gitlab-sshd-to-gitignore' into 'main'Igor Drozdov2021-01-191-0/+1
|\ | | | | | | | | Add gitlab-sshd to .gitignore See merge request gitlab-org/gitlab-shell!444
| * Add gitlab-sshd to .gitignoreadd-gitlab-sshd-to-gitignoreNick Thomas2021-01-181-0/+1
|/
* Merge branch 'master' into 'main'Nick Thomas2021-01-1821-309/+460
|\ | | | | | | | | | | | | RFC: Simple built-in SSH server Closes #165 See merge request gitlab-org/gitlab-shell!394
| * RFC: Simple built-in SSH serverLorenz Brun2021-01-1821-309/+460
|/
* Merge branch 'remove-default-branch-docs' into 'main'Igor Drozdov2021-01-071-7/+0
|\ | | | | | | | | | | | | Remove default branch statement in docs Closes #489 See merge request gitlab-org/gitlab-shell!443
| * Remove default branch statement in docsremove-default-branch-docsNick Thomas2021-01-061-7/+0
| | | | | | | | Now `master` is removed, this is no longer needed
* | Merge branch 'ashmckenzie/release-13.15.0' into 'main'v13.15.0masterPatrick Bajao2020-12-172-1/+5
|\ \ | | | | | | | | | | | | Release v13.15.0 See merge request gitlab-org/gitlab-shell!442
| * | Release v13.15.0ashmckenzie/release-13.15.0Ash McKenzie2020-12-172-1/+5
|/ /
* | Merge branch 'Updating-min-TLS-version-to-12' into 'main'Ash McKenzie2020-12-162-0/+2
|\ \ | |/ |/| | | | | Update httpclient.go with TLS 1.2 as minimum version See merge request gitlab-org/gitlab-shell!435
| * Update testserver.go with tls 1.2 min versionUpdating-min-TLS-version-to-12Vitor Meireles De Sousa2020-11-171-0/+1
| |
| * Update httpclient.go with TLS 1.2 as minimum versionVitor Meireles De Sousa2020-11-171-0/+1
| |
* | Merge branch 'id-release-13-14' into 'main'v13.14.0Igor Drozdov2020-12-112-1/+6
|\ \ | | | | | | | | | | | | Release v13.14.0 See merge request gitlab-org/gitlab-shell!441
| * | Release v13.14.0id-release-13-14Igor Drozdov2020-12-102-1/+6
|/ /
* | Merge branch 'if-270554-2fa_verify_command' into 'main'Igor Drozdov2020-12-108-0/+515
|\ \ | | | | | | | | | | | | Add 2fa_verify command See merge request gitlab-org/gitlab-shell!440
| * | Add 2fa_verify commandImre Farkas2020-12-108-0/+515
|/ /
* | Merge branch 'ashmckenzie/golang-1-15' into 'main'Patrick Bajao2020-11-231-1/+8
|\ \ | | | | | | | | | | | | Add go:1.15 CI job See merge request gitlab-org/gitlab-shell!439
| * | Use golang 1.15 for race jobAsh McKenzie2020-11-231-1/+1
| | |
| * | Add go:1.15 CI jobashmckenzie/golang-1-15Ash McKenzie2020-11-231-0/+7
|/ /
* | Merge branch 'fix-ci-config-for-main' into 'main'Igor Drozdov2020-11-202-5/+12
|\ \ | | | | | | | | | | | | Fix CI config and README for new default branch See merge request gitlab-org/gitlab-shell!437
| * | Fix CI config and README for new default branchfix-ci-config-for-mainNick Thomas2020-11-202-5/+12
|/ /
* | Merge branch 'client-identity' into 'master'Stan Hu2020-11-202-0/+79
|\ \ | | | | | | | | | | | | Propagate client identity to gitaly See merge request gitlab-org/gitlab-shell!436
| * | Include key ID and type in metadataAsh McKenzie2020-11-202-1/+8
| | |
| * | use testhelper for SSH_CONNECTIONclient-identityIgor Wiedler2020-11-191-5/+5
| | |
| * | test for client identity propagationIgor Wiedler2020-11-191-0/+63
| | |
| * | Propagate client identity to gitalyIgor Wiedler2020-11-171-0/+9
| |/
* | Merge branch 'ci-enable-secret-detection' into 'master'Ash McKenzie2020-11-181-0/+5
|\ \ | |/ |/| | | | | Enable Secret Detection in CI See merge request gitlab-org/gitlab-shell!434
| * Enable Secret Detection in CIci-enable-secret-detectionMichael Henriksen2020-11-171-0/+5
|/
* Merge branch 'gitlab-shell-release-13-13-0' into 'master'v13.13.0Patrick Bajao2020-11-172-1/+5
|\ | | | | | | | | Release v13.13.0 See merge request gitlab-org/gitlab-shell!433