summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Send full git request/response in SSHD testswc-sshd-upload-packWill Chandler2021-12-221-8/+42
| | | | | | | | | | | | | | | Before 9deaf47f1ecb00f0f36d18ee4a0fb1576f5a0efe, Gitaly would return success for `SSHUploadPack` and `SSHUploadArchive` regardless of the exit code of the `git upload-pack|archive` process. As a result, the gitlab-sshd acceptance tests could rely on no errors being returned from Gitaly. Currently these tests send the minimum request needed to start a session, causing the server git process to fail as the `0000` flush packet to end the session is never sent. This commit fixes the tests by sending the full request/response needed for a successful git operation.
* Merge branch 'sh-bump-go-1.16.12' into 'main'Ash McKenzie2021-12-101-1/+1
|\ | | | | | | | | Bump .tool_versions to use Go v1.16.12 See merge request gitlab-org/gitlab-shell!548
| * Bump .tool_versions to use Go v1.16.12sh-bump-go-1.16.12Stan Hu2021-12-091-1/+1
|/ | | | Part of https://gitlab.com/groups/gitlab-org/-/epics/7111
* Merge branch 'id-release-13-22-1' into 'main'v13.22.1Igor Drozdov2021-11-242-1/+5
|\ | | | | | | | | Release v13.22.1 See merge request gitlab-org/gitlab-shell!547
| * Release v13.22.1Igor Drozdov2021-11-242-1/+5
|/
* Merge branch 'id-remove-ssl-cert-dir-logging' into 'main'Ash McKenzie2021-11-241-4/+0
|\ | | | | | | | | Remove SSL_CERT_DIR logging See merge request gitlab-org/gitlab-shell!546
| * Remove SSL_CERT_DIR loggingid-remove-ssl-cert-dir-loggingIgor Drozdov2021-11-231-4/+0
|/ | | | | This log entry doesn't respect log level, because the log level is configured after this logging happens
* Merge branch 'pks-gitaly-cng-latest' into 'main'Ash McKenzie2021-11-162-2/+2
|\ | | | | | | | | Fix usage of out-of-date Gitaly images See merge request gitlab-org/gitlab-shell!544
| * Fix usage of out-of-date Gitaly imagespks-gitaly-cng-latestPatrick Steinhardt2021-11-152-2/+2
| | | | | | | | | | | | | | | | | | | | Our CI jobs and docker-compose pull in the "latest" tag of Gitaly. As it turns out though, "latest" is pointing to Gitaly v13.3.0-rc5, which is definitely not the latest versionat this point in time. This is because CNG was converted to not use the "latest" tag anymore, but instead to use a tag called "master" in gitlab-org/build/CNG!519. Fix this by using the new "master" tag instead.
* | Merge branch 'id-fix-flaky-test' into 'main'Patrick Bajao2021-11-161-13/+3
|\ \ | |/ |/| | | | | Refactor flaky test case in sshd_test See merge request gitlab-org/gitlab-shell!545
| * Refactor flaky test case in sshd_testid-fix-flaky-testIgor Drozdov2021-11-151-13/+3
|/ | | | | - Use require.Regexp to expect ssh handshake error - Use require.Eventually to refactor verifyStatus
* Merge branch 'pb-update-version-file-13-22-0' into 'main'v13.22.0Patrick Bajao2021-11-151-1/+1
|\ | | | | | | | | Update gitlab-shell VERSION to 13.22.0 See merge request gitlab-org/gitlab-shell!543
| * Update gitlab-shell VERSION to 13.22.0pb-update-version-file-13-22-0Patrick Bajao2021-11-151-1/+1
|/
* Merge branch 'ashmckenzie/13-22-release' into 'main'Patrick Bajao2021-11-151-0/+31
|\ | | | | | | | | Release v13.22.0 See merge request gitlab-org/gitlab-shell!541
| * Fix merge request IID on changelogPatrick Bajao2021-11-151-1/+1
| |
| * Release v13.22.0Ash McKenzie2021-11-151-0/+19
| |
| * Add missing v13.21.1 changelog entryAsh McKenzie2021-11-151-0/+4
| |
| * Add missing v13.21.0 changelog entriesAsh McKenzie2021-11-151-0/+8
|/
* Merge branch 'ashmckenzie/fix-go-definition-in-tool-versions' into 'main'Patrick Bajao2021-11-151-1/+1
|\ | | | | | | | | Fix golang definition in tool versions See merge request gitlab-org/gitlab-shell!542
| * Bump golang in .tool-versions to 1.16.10ashmckenzie/fix-go-definition-in-tool-versionsAsh McKenzie2021-11-121-1/+1
| |
| * Fix go -> golang in .tool-versionsAsh McKenzie2021-11-121-1/+1
|/
* 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
View Lorry Controller Status