summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Release v13.22.0ashmckenzie/13-22-releaseAsh McKenzie2021-11-122-1/+29
|
* Merge branch 'sh-improve-key-matching-sshd' into 'main'Patrick Bajao2021-11-122-11/+36
|\ | | | | | | | | Relax key and username matching for sshd See merge request gitlab-org/gitlab-shell!540
| * Relax key and username matching for sshdsh-improve-key-matching-sshdStan Hu2021-11-102-11/+36
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the way sshd works, gitlab-shell could be called with a single string in the form: ``` /path/to/gitlab-shell -c key-id ``` However, due to the tightening of the regular expressions in fcff692b this string no longer matches, so logins would fail with: ``` Failed to get username: who='' is invalid ``` This can be reproduced by changing the user's shell to point to gitlab-shell. For example: ``` usermod git -s /opt/gitlab/embedded/service/gitlab-shell/bin/gitlab-shell ``` While setting gitlab-shell as the user's shell isn't officially supported, gitlab-shell still should be able to cope with the key being specified as the last argument. We now split the argument list and use the last value. Relates to https://gitlab.com/gitlab-org/gitlab-shell/-/issues/530
* Merge branch 'id-logging-for-handler' into 'main'Patrick Bajao2021-10-213-5/+16
|\ | | | | | | | | Add logging to handler/exec.go and config/config.go See merge request gitlab-org/gitlab-shell!539
| * Add logging to RunGitalyCommand funcid-logging-for-handlerIgor Drozdov2021-10-202-5/+12
| |
| * Log SSL_CERT_DIR when it's configuredIgor Drozdov2021-10-201-0/+4
|/
* Merge branch '499-log-non-git-commands' into 'main'Ash McKenzie2021-10-134-9/+37
|\ | | | | | | | | Improve logging for non-git commands See merge request gitlab-org/gitlab-shell!538
| * Improve logging for non-git commands499-log-non-git-commandsNick Thomas2021-10-134-9/+37
| | | | | | | | | | | | | | | | | | Several of our commands only touch the internal API, and go nowhere near Gitaly. Improve logging for each of these in a single MR. In general, we want to be able to tell what happened in the execution of each command, and to track failures down to a specific line of code. Changelog: added
* | Merge branch '532-proxy-protocol-require' into 'main'Igor Drozdov2021-10-132-5/+42
|\ \ | |/ |/| | | | | | | | | Reject non-proxied connections when proxy protocol is enabled Closes #532 See merge request gitlab-org/gitlab-shell!536
| * Reject non-proxied connections when proxy protocol is enabled532-proxy-protocol-requireNick Thomas2021-10-122-5/+42
| | | | | | | | | | | | This will help to prevent misconfigurations. Changelog: fixed
* | Merge branch 'sh-update-go-1.16.9' into 'main'Nick Thomas2021-10-131-1/+1
|\ \ | | | | | | | | | | | | Update to Go v1.16.9 See merge request gitlab-org/gitlab-shell!537
| * | Update to Go v1.16.9Stan Hu2021-10-131-1/+1
|/ / | | | | | | This is a security release: https://golang.org/doc/devel/release#go1.16
* | Merge branch 'fix/name-certificate' into 'main'Igor Drozdov2021-10-122-2/+0
|\ \ | |/ |/| | | | | refactor: remove call to BuildNameToCertificate (deprecated) See merge request gitlab-org/gitlab-shell!515
| * refactor: remove call to BuildNameToCertificate (deprecated)feistel2021-09-082-2/+0
| |
* | Merge branch '499-log-command-invocation' into 'main'Igor Drozdov2021-10-072-1/+18
|\ \ | | | | | | | | | | | | Log command invocation See merge request gitlab-org/gitlab-shell!535
| * | Log command invocation499-log-command-invocationNick Thomas2021-10-072-1/+18
|/ / | | | | | | | | | | | | | | Use reflection to log the command we are about to execute, both in gitlab-shell and gitlab-sshd. Include the environment, which has all the context we need to understand what the command is expected to do. Changelog: added
* | Merge branch 'fix-logging-channel-type' into 'main'Igor Drozdov2021-10-061-1/+1
|\ \ | | | | | | | | | | | | Fix logging channel type See merge request gitlab-org/gitlab-shell!534
| * | Fix logging channel typefix-logging-channel-typeNick Thomas2021-10-061-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | Currently we get this in some log messages: logrus_error="can not add field \"channel_type\"" This is because we're trying to add a function, rather than the result of the function call (a string) to the `log.Fields`. Whoops! Changelog: fixed
* | Merge branch '499-log-me-more-more' into 'main'Ash McKenzie2021-10-011-0/+7
|\ \ | | | | | | | | | | | | | | | | | | Resolve an error-swallowing issue Closes #499 See merge request gitlab-org/gitlab-shell!533
| * | Resolve an error-swallowing issue499-log-me-more-moreNick Thomas2021-09-301-0/+7
|/ /
* | Merge branch '499-log-me-more' into 'main'Igor Drozdov2021-09-287-29/+75
|\ \ | | | | | | | | | | | | Add more logging to gitlab-sshd See merge request gitlab-org/gitlab-shell!531
| * | Add some initial logging guidelines499-log-me-moreNick Thomas2021-09-281-0/+15
| | |
| * | Add gitlab-sshd connection loggingNick Thomas2021-09-282-6/+18
| | |
| * | Add debug logging to gitlab-sshd sessionNick Thomas2021-09-282-12/+36
| | |
| * | Don't swallow an error parsing SSH_ORIGINAL_COMMANDNick Thomas2021-09-273-11/+6
|/ /
* | Merge branch '502-restore-log-level-config' into 'main'Igor Drozdov2021-09-233-2/+29
|\ \ | | | | | | | | | | | | | | | | | | Respect log-level configuration again Closes #502 See merge request gitlab-org/gitlab-shell!530
| * | Respect log-level configuration againNick Thomas2021-09-233-2/+29
|/ / | | | | | | | | | | This was lost in the move from Ruby to Go. Restore it now. Changelog: fixed
* | Merge branch 'sh-fix-issue-529' into 'main'Nick Thomas2021-09-232-12/+34
|\ \ | | | | | | | | | | | | Only validate SSL cert file exists if a value is supplied See merge request gitlab-org/gitlab-shell!527
| * | Only validate SSL cert file exists if a value is suppliedStan Hu2021-09-232-12/+34
|/ / | | | | | | | | | | | | | | | | This fixes a regression in https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/508. If an HTTPS internal API URL were used, gitlab-shell would not work at all. We now handle blank `caFile` properly. Relates to https://gitlab.com/gitlab-org/gitlab-shell/-/issues/529
* | Merge branch 'fix-makefile-version-string' into 'main'Nick Thomas2021-09-201-1/+1
|\ \ | | | | | | | | | | | | makefile: properly escape '$' in VERSION_STRING See merge request gitlab-org/gitlab-shell!525
| * | makefile: properly quote '$' in VERSION_STRINGKevin2021-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | If git is not available or gitlab-shell is not built in a repository, it falls back the VERSION file. That command is not properly escaped and results in the message: > awk: cmd. line:1: Unexpected token When you remove the `2>/dev/null`. Escape the '$' characters to solve this.
* | | Merge branch 'refactor/unify-shell' into 'main'Igor Drozdov2021-09-203-18/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | refactor: unify instantiation of command.Shell Closes #517 See merge request gitlab-org/gitlab-shell!520
| * | | refactor: unify instantiation of command.Shellfeistel2021-09-203-18/+29
| |/ /
* | | Merge branch 'id-clean-up-unavailable-message' into 'main'Nick Thomas2021-09-172-0/+22
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Improve err message given when Gitaly unavailable Closes gitlab#340819 See merge request gitlab-org/gitlab-shell!526
| * | Improve err message given when Gitaly unavailableIgor Drozdov2021-09-172-0/+22
|/ /
* | Merge branch 'id-context-fields' into 'main'Ash McKenzie2021-09-166-13/+13
|\ \ | | | | | | | | | | | | Add context fields to logging See merge request gitlab-org/gitlab-shell!524
| * | Add context fields to loggingid-context-fieldsIgor Drozdov2021-09-156-13/+13
|/ / | | | | | | It adds correlation ids wherever possible
* | Merge branch 'id-sshd-test-3' into 'main'Nick Thomas2021-09-154-73/+217
|\ \ | | | | | | | | | | | | | | | | | | Extract server config related code out of sshd.go Closes #523 See merge request gitlab-org/gitlab-shell!523
| * | Extract server config related code out of sshd.goIgor Drozdov2021-09-154-73/+217
|/ /
* | Merge branch 'id-session-test-2' into 'main'Nick Thomas2021-09-151-0/+145
|\ \ | | | | | | | | | | | | | | | | | | Unit test exit-codes for sshd/session.go Closes #522 See merge request gitlab-org/gitlab-shell!522
| * | Unit test exit-codes for sshd/session.goid-session-test-2Igor Drozdov2021-09-151-0/+145
|/ /
* | Merge branch 'id-session-test' into 'main'Nick Thomas2021-09-151-0/+44
|\ \ | | | | | | | | | | | | Unit test sshd.handleEnv function See merge request gitlab-org/gitlab-shell!521
| * | Unit test sshd.handleEnv functionIgor Drozdov2021-09-151-0/+44
|/ /
* | Merge branch 'id-sshd-tests' into 'main'Nick Thomas2021-09-151-0/+16
|\ \ | | | | | | | | | | | | Add TestInvalidClientConfig and TestNewServerWithoutHosts for sshd.go See merge request gitlab-org/gitlab-shell!518
| * | Add TestInvalidClientConfig and TestNewServerWithoutHosts for sshd.goid-sshd-testsIgor Drozdov2021-09-151-0/+16
|/ /
* | Merge branch 'refactor/cmd' into 'main'Nick Thomas2021-09-1419-489/+737
|\ \ | | | | | | | | | | | | | | | | | | refactor: rearchitect command and executable Go modules Closes #214 See merge request gitlab-org/gitlab-shell!514
| * \ Merge branch 'main' into refactor/cmdNick Thomas2021-09-144-3/+6
| |\ \ | |/ / |/| |
* | | Merge branch 'fix-bad-spec' into 'main'Igor Drozdov2021-09-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix a flaky test See merge request gitlab-org/gitlab-shell!519
| * | | Fix a flaky testNick Thomas2021-09-141-1/+1
|/ / /
* | | Merge branch 'eread/update-project-tool-versions' into 'main'Ash McKenzie2021-09-142-1/+3
|\ \ \ | | | | | | | | | | | | | | | | Update Ruby version to 2.7.4 and add Go version 1.16.8 for tooling See merge request gitlab-org/gitlab-shell!517