summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Release v13.25.2Igor Drozdov2022-04-262-1/+6
|/ / /
* | | Merge branch 'id-revert-ssh-connection-timeouts' into 'main'Patrick Bajao2022-04-264-53/+1
|\ \ \ | |/ / |/| | | | | | | | Revert "Abort long-running unauthenticated SSH connections" See merge request gitlab-org/gitlab-shell!605
| * | Revert "Abort long-running unauthenticated SSH connections"Igor Drozdov2022-04-254-53/+1
|/ / | | | | | | This reverts commit 3a2c8f2c47774a35d840ec8baf54341beede5d43.
* | Merge branch 'bump/go-tool-version' into 'main'Ash McKenzie2022-04-211-1/+1
|\ \ | | | | | | | | | | | | Bump Go to 1.17.9 for asdf users See merge request gitlab-org/gitlab-shell!600
| * | Bump Go to 1.17.9 for asdf usersfeistel2022-04-201-1/+1
| |/
* | Merge branch 'sh-fix-typo-fips' into 'main'Igor Drozdov2022-04-211-1/+1
|\ \ | |/ |/| | | | | Fix typo in FIPS mode message See merge request gitlab-org/gitlab-shell!599
| * Fix typo in FIPS mode messageStan Hu2022-04-191-1/+1
|/ | | | Rename Gitaly -> gitlab-shell
* Merge branch 'id-release-13-25-1' into 'main'v13.25.1Igor Drozdov2022-04-192-1/+7
|\ | | | | | | | | Release 13.25.1 See merge request gitlab-org/gitlab-shell!598
| * Release 13.25.1Igor Drozdov2022-04-192-1/+7
|/
* Merge branch 'sh-fips-mode' into 'main'Igor Drozdov2022-04-194-0/+40
|\ | | | | | | | | Add support for FIPS encryption See merge request gitlab-org/gitlab-shell!597
| * Add support for FIPS encryptionStan Hu2022-04-184-0/+40
|/ | | | | | | | | | | | | | This commit adds support of using a FIPS-validated SSL library with compiled Go executables when `FIPS_MODE=1 make` is run. A Go compiler that supports BoringSSL either directly (e.g. the `dev.boringcrypto` branch) or with a dynamically linked OpenSSL (e.g. https://github.com/golang-fips/go) is required. This is similar to the changes to support FIPS in GitLab Runner and in GitLab Pages: https://gitlab.com/gitlab-org/gitlab-pages/-/merge_requests/716 Changelog: added
* Merge branch 'id-metrics-for-results' into 'main'Ash McKenzie2022-04-146-26/+78
|\ | | | | | | | | Add additional metrics to gitlab-sshd See merge request gitlab-org/gitlab-shell!593
| * Add additional metrics to gitlab-sshdIgor Drozdov2022-04-136-26/+78
|/ | | | | | | | | - Observe time to establish a session - Log the duration of the successfully established connection - Observe total time to handle the connection - Log the duration of the successfully executed connection - Observe the count of ssh connections - Observe the count of failed ssh connections
* Merge branch '554-support-using-go-version-1-17-8' into 'main'Igor Drozdov2022-04-071-1/+1
|\ | | | | | | | | | | | | Upgrade golang to 1.17.8 Closes #554 See merge request gitlab-org/gitlab-shell!592
| * Upgrade golang to 1.17.8Ash McKenzie2022-04-071-1/+1
|/
* Merge branch 'id-release-13.25.0' into 'main'v13.25.0Ash McKenzie2022-04-072-1/+7
|\ | | | | | | | | Release 13.25.0 See merge request gitlab-org/gitlab-shell!591
| * Release 13.25.0Igor Drozdov2022-04-062-1/+7
|/ | | | | | - Fix connections duration metrics !588 - ci: start integrating go 1.18 into the CI pipelines !587 - Abort long-running unauthenticated SSH connections !582
* Merge branch 'id-fix-connections-duration-metrics' into 'main'Ash McKenzie2022-04-061-4/+4
|\ | | | | | | | | Fix connections duration metrics See merge request gitlab-org/gitlab-shell!588
| * Fix connections duration metricsIgor Drozdov2022-04-051-4/+4
| | | | | | | | We need to pass time.Now as a param, otherwise it's calculated on call
* | Merge branch 'update-version-file' into 'main'Igor Drozdov2022-04-061-1/+1
|\ \ | | | | | | | | | | | | Update Version File See merge request gitlab-org/gitlab-shell!589
| * | Update Version FileJason Goodman2022-04-061-1/+1
| |/
* | Merge branch 'ci/go-1.18' into 'main'Igor Drozdov2022-04-061-10/+6
|\ \ | |/ |/| | | | | ci: start integrating go 1.18 into the CI pipelines See merge request gitlab-org/gitlab-shell!587
| * ci: start integrating go 1.18 into the CI pipelinesfeistel2022-04-011-10/+6
|/
* Merge branch 'improve-login-grace-timeout-msg' into 'main'Ash McKenzie2022-04-011-1/+1
|\ | | | | | | | | | | | | Improve login grace timeout message Closes #553 See merge request gitlab-org/gitlab-shell!586
| * Improve login grace timeout messageIgor Drozdov2022-03-311-1/+1
|/
* Merge branch 'id-logic-grace-time' into 'main'Ash McKenzie2022-03-304-1/+52
|\ | | | | | | | | Abort long-running unauthenticated SSH connections See merge request gitlab-org/gitlab-shell!582
| * Abort long-running unauthenticated SSH connectionsIgor Drozdov2022-03-304-1/+52
|/
* Merge branch 'use-gitlab-dangerfiles' into 'main'Ash McKenzie2022-03-304-0/+106
|\ | | | | | | | | Use gitlab-dangerfiles to improve MR hygiene See merge request gitlab-org/gitlab-shell!583
| * Use gitlab-dangerfiles to improve MR hygieneRémy Coutable2022-03-294-0/+106
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'id-release-13-24-2' into 'main'v13.24.2Igor Drozdov2022-03-291-0/+4
|\ \ | | | | | | | | | | | | Release 13.24.2 See merge request gitlab-org/gitlab-shell!585
| * | Release 13.24.2Igor Drozdov2022-03-291-0/+4
|/ / | | | | | | - Bump gitaly client !584
* | Merge branch 'jv-bump-gitaly' into 'main'Igor Drozdov2022-03-292-4/+4
|\ \ | |/ |/| | | | | Bump gitaly client See merge request gitlab-org/gitlab-shell!584
| * Bump gitaly clientJacob Vosmaer2022-03-292-4/+4
|/ | | | | | Bump gitaly client to 51da8bc17059e4ccd39873e4f3def935341472b8 to get changes from https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4439.
* Merge branch 'id-config-fields-docs' into 'main'Ash McKenzie2022-03-241-0/+6
|\ | | | | | | | | Add docs for grace-period and probes config options See merge request gitlab-org/gitlab-shell!581
| * Add docs for grace-period and probes config optionsIgor Drozdov2022-03-241-0/+6
|/
* Merge branch 'id-release-v-13-24-1' into 'main'v13.24.1Igor Drozdov2022-03-182-1/+7
|\ | | | | | | | | Release 13.24.1 See merge request gitlab-org/gitlab-shell!580
| * Release 13.24.1Igor Drozdov2022-03-182-1/+7
|/
* Merge branch 'id-reuse-grpc-connections-and-sidechannel' into 'main'Igor Drozdov2022-03-1812-148/+333
|\ | | | | | | | | Reuse Gitaly connections and sidechannel See merge request gitlab-org/gitlab-shell!575
| * Reuse Gitaly conns and SidechannelIgor Drozdov2022-03-0712-148/+333
| | | | | | | | | | | | | | | | When gitlab-sshd has been introduced we've started running our own SSH server. In this case we're able to cache and reuse Gitaly connections and Registry. It helps to reduce memory usage.
* | Merge branch '550-fix-unknown-log-level-message' into 'main'Patrick Bajao2022-03-162-3/+13
|\ \ | |/ |/| | | | | | | | | Default to info level for an empty log-level Closes #550 See merge request gitlab-org/gitlab-shell!579
| * Default to info level for an empty log-levelNick Thomas2022-03-152-3/+13
|/ | | | | | | | | | | | | | | | | I'd assumed that the `omitempty` directive for LogLevel in internal/config/config.go would get us this behaviour. If it did, we wouldn't have had to specify the default twice. Unfortunately, it doesn't, which is to say that given a config file like: ``` log_level: ``` The default *is* overridden by the empty string. It's an easy enough fix. Changelog: fixed
* Merge branch 'smh-update-gitaly-vendor' into 'main'Igor Drozdov2022-03-072-4/+6
|\ | | | | | | | | Update Gitaly dependency to v14.9.0-rc1 See merge request gitlab-org/gitlab-shell!578
| * Update Gitaly dependency to v14.9.0-rc1Sami Hiltunen2022-03-072-4/+6
|/
* Merge branch 'ashmckenzie/gitlab-shell-v13-24-0' into 'main'v13.24.0Patrick Bajao2022-02-232-1/+9
|\ | | | | | | | | Release 13.24.0 See merge request gitlab-org/gitlab-shell!577
| * Release 13.24.0Ash McKenzie2022-02-232-1/+9
|/
* Merge branch 'ashmckenzie/golang-1-17-7' into 'main'Patrick Bajao2022-02-221-1/+1
|\ | | | | | | | | Upgrade golang to 1.17.7 See merge request gitlab-org/gitlab-shell!576
| * Upgrade golang to 1.17.7Ash McKenzie2022-02-221-1/+1
| |
* | Merge branch 'id-concurrent-connections-prometheus' into 'main'Patrick Bajao2022-02-224-26/+84
|\ \ | |/ |/| | | | | Add more metrics for gitlab-sshd See merge request gitlab-org/gitlab-shell!574
| * Add more metrics for gitlab-sshdIgor Drozdov2022-02-214-26/+84
| | | | | | | | | | | | - Counter of HTTP merge requests - Gauge of HTTP requests currently being performed - Gauge of connections currently handled by gitlab sshd
* | Merge branch 'id-create-beginners-guide' into 'main'Patrick Bajao2022-02-172-76/+96
|\ \ | |/ |/| | | | | Move code guidelines to doc/beginners_guide.md See merge request gitlab-org/gitlab-shell!572