summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Specify more recent go version in go.modpatch-2Lukas 'Eipi' Eipert2020-08-101-1/+1
|
* Merge branch 'sh-release-13.5.0' into 'master'v13.5.0Igor Drozdov2020-08-052-1/+4
|\ | | | | | | | | Release v13.5.0 See merge request gitlab-org/gitlab-shell!404
| * Release v13.5.0Stan Hu2020-08-052-1/+4
|/
* Merge branch 'sh-inject-and-log-correlation-di' into 'master'Igor Drozdov2020-07-319-30/+67
|\ | | | | | | | | Generate and log correlation IDs See merge request gitlab-org/gitlab-shell!400
| * Generate and log correlation IDsStan Hu2020-07-319-30/+67
|/ | | | | This will make it easier to tie an SSH access request to Rails API and Gitaly requests.
* Merge branch 'revert-869aeb90' into 'master'Igor Drozdov2020-07-231-0/+22
|\ | | | | | | | | Revert "Update executable.go" See merge request gitlab-org/gitlab-shell!403
| * Revert "Update executable.go"Igor Drozdov2020-07-231-0/+22
|/ | | This reverts commit 869aeb9057962b089abfd8ce0b6d4a0962bbb154
* Update executable.goIgor Drozdov2020-07-231-22/+0
|
* Merge branch 'sh-release-13-4-0' into 'master'v13.4.0Igor Drozdov2020-07-232-1/+7
|\ | | | | | | | | Release v13.4.0 See merge request gitlab-org/gitlab-shell!402
| * Release v13.4.0Stan Hu2020-07-232-1/+7
|/
* Merge branch 'sh-log-ssh-key-details' into 'master'Igor Drozdov2020-07-236-2/+14
|\ | | | | | | | | Log SSH key details See merge request gitlab-org/gitlab-shell!398
| * Log SSH key detailsStan Hu2020-07-236-2/+14
|/ | | | | | | | | | | | | | | | | | | | | Right now when a client such as gitlab-shell calls the `/api/v4/internal/allowed` API, the response only tells the client what user has been granted access, and it's impossible to tell which deploy key/token was used in the authentication request. This commit adds logs for the following when available: 1. `gl_key_type` (e.g. `deploy_key` or `key`) 2. `gl_key_id` These fields make it possible for admins to identify the exact record that was used to authenticate the user. API changes in the `/internal/allowed` endpoint in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37289 are needed to support this. Relates to https://gitlab.com/gitlab-org/gitlab-shell/-/issues/203
* Merge branch 'sh-log-remote-ip' into 'master'Ash McKenzie2020-07-232-1/+8
|\ | | | | | | | | | | | | Log remote IP for executed commands Closes #199 See merge request gitlab-org/gitlab-shell!399
| * Log remote IP for executed commandssh-log-remote-ipStan Hu2020-07-202-1/+8
| | | | | | | | | | | | | | | | Admins may want to know what client IP originated the request. This commit adds a `remote_ip` field to the log that extracts the IP address from the `SSH_CONNECTION` environment variable. Closes https://gitlab.com/gitlab-org/gitlab-shell/-/issues/199
* | Merge branch 'sh-drop-go-1.12' into 'master'Igor Drozdov2020-07-221-5/+1
|\ \ | |/ |/| | | | | Drop Go v1.12 support See merge request gitlab-org/gitlab-shell!401
| * Drop Go v1.12 supportStan Hu2020-07-221-5/+1
|/ | | | | | | We officially use Go v1.13+ for everything (https://docs.gitlab.com/ee/install/requirements.html#go-versions), and dropping Go v1.12 allows us to use new methods such as `http.NewRequestWithContext`.
* Merge branch ↵Patrick Bajao2020-07-029-26/+110
|\ | | | | | | | | | | | | '459-system-default-ssl_cert_dir-is-being-used-during-remote-gitaly-over-tls' into 'master' Support ssl_cert_dir config setting See merge request gitlab-org/gitlab-shell!393
| * Pass in ssl_cert_dir config settingAsh McKenzie2020-07-024-4/+36
| |
| * Include SSL_CERT_DIR env var in commandAsh McKenzie2020-07-022-22/+60
| |
| * Support new ssl_cert_dir config settingAsh McKenzie2020-07-013-0/+14
|/
* Merge branch 'go-coverage' into 'master'Nick Thomas2020-06-084-4/+13
|\ | | | | | | | | Extract coverage for Go code on CI pipeline See merge request gitlab-org/gitlab-shell!392
| * Extract coverage for Go code on CI pipelinego-coverageTakuya Noguchi2020-06-064-4/+13
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Merge branch 'id-use-reports-for-code-navigation' into 'master'Nick Thomas2020-06-051-6/+2
|\ \ | |/ |/| | | | | Use simplified setup for code intelligence See merge request gitlab-org/gitlab-shell!386
| * Use LSIF reports for code navigationid-use-reports-for-code-navigationIgor Drozdov2020-05-281-6/+2
| |
* | Merge branch 'pb-update-gitlab-ci-codequality' into 'master'Ash McKenzie2020-06-031-12/+6
|\ \ | | | | | | | | | | | | Use codequality CI template See merge request gitlab-org/gitlab-shell!389
| * | Use codequality CI templatePatrick Bajao2020-06-031-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab/-/issues/218797, it was determined that gitlab-shell is using an outdated image that no longer exists. To ensure that we are using up to date codequality image, we can use the built-in template instead.
* | | Merge branch 'gitlab-shell-release-13-3-0' into 'master'v13.3.0Stan Hu2020-06-012-1/+7
|\ \ \ | | | | | | | | | | | | | | | | Release v13.3.0 See merge request gitlab-org/gitlab-shell!391
| * | | Release v13.3.0Ash McKenzie2020-06-012-1/+7
|/ / /
* | | Merge branch 'sh-upgrade-ruby-2.6.6' into 'master'Ash McKenzie2020-06-011-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Upgrade Ruby version to v2.6.6 See merge request gitlab-org/gitlab-shell!390
| * | | Upgrade Ruby version to v2.6.6sh-upgrade-ruby-2.6.6Stan Hu2020-05-291-1/+1
|/ / / | | | | | | | | | | | | GitLab has now been upgraded to use Ruby 2.6.6: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33253
* | | Merge branch 'config/pumaSocket' into 'master'Nick Thomas2020-05-281-1/+1
|\ \ \ | |/ / |/| | | | | | | | Use default puma socket in example config See merge request gitlab-org/gitlab-shell!388
| * | Use default puma socket in example configJustin Kromlinger2020-05-281-1/+1
|/ / | | | | | | | | | | | | | | The unicorn replacement 'puma' uses a unix socket in the example config [1] instead of a tcp port. Using the non-existing tcp port results in "Internal API unreachable" on git operations. [1] https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/puma.rb.example#L34
* | Merge branch 'cl-client-name' into 'master'Nick Thomas2020-05-223-13/+320
|\ \ | |/ |/| | | | | Set client name when making requests to Gitaly See merge request gitlab-org/gitlab-shell!387
| * Set client name when making requests to Gitalycl-client-nameChangzheng Liu2020-05-213-13/+320
|/
* Merge branch 'sh-fix-logrus-race' into 'master'Nick Thomas2020-05-134-0/+25
|\ | | | | | | | | | | | | Fix race conditions with logrus testing Closes #450 See merge request gitlab-org/gitlab-shell!385
| * Fix race conditions with logrus testingsh-fix-logrus-raceStan Hu2020-05-114-0/+25
| | | | | | | | | | | | | | | | | | logrus fires a Goroutine to write logs, so the tests could fail if they checked the event queue before the logrus have fired. Since there isn't an easy way to flush all outstanding hooks, we just retry every 100 ms for up to a second for log to arrive in the queue. Closes https://gitlab.com/gitlab-org/gitlab-shell/-/issues/450
* | Merge branch 'sh-add-race-test' into 'master'Igor Drozdov2020-05-122-0/+9
|\ \ | | | | | | | | | | | | Add race testing as separate CI step See merge request gitlab-org/gitlab-shell!383
| * | Add race testing as separate CI stepsh-add-race-testStan Hu2020-05-112-0/+9
| |/ | | | | | | | | This would help catch race conditions such as https://gitlab.com/gitlab-org/gitlab-shell/-/issues/450 before merge.
* | Merge branch 'sh-release-13.2.0' into 'master'v13.2.0Nick Thomas2020-05-122-1/+4
|\ \ | |/ |/| | | | | Release v13.2.0 See merge request gitlab-org/gitlab-shell!384
| * Release v13.2.0sh-release-13.2.0Stan Hu2020-05-112-1/+4
|/
* Merge branch 'sh-add-http-status-code' into 'master'Igor Drozdov2020-05-115-34/+64
|\ | | | | | | | | | | | | Add HTTP status code to internal API logs Closes #450 See merge request gitlab-org/gitlab-shell!376
| * Fix race conditions in testssh-add-http-status-codeStan Hu2020-05-084-44/+51
| | | | | | | | | | | | | | | | Calling logrus hook.LastEntry() can lead to race conditions. Use AllEntries instead: https://github.com/sirupsen/logrus/blob/60c74ad9be0d874af0ab0daef6ab07c5c5911f0d/hooks/test/test.go#L77 Closes https://gitlab.com/gitlab-org/gitlab-shell/-/issues/450
| * Add HTTP status code to internal API logsStan Hu2020-05-082-12/+35
|/ | | | This would make it easier to filter the logs by status code.
* Merge branch 'release-13-1-0' into 'master'v13.1.0Nick Thomas2020-05-062-1/+4
|\ | | | | | | | | Release v13.1.0 See merge request gitlab-org/gitlab-shell!382
| * Release v13.1.0Nick Thomas2020-05-062-1/+4
|/
* Merge branch 'pass-secret-to-client' into 'master'Nick Thomas2020-05-061-1/+1
|\ | | | | | | | | | | | | Ensure we are passing the parsed secret Closes #458 See merge request gitlab-org/gitlab-shell!381
| * Ensure we are passing the parsed secretDJ Mountney2020-05-061-1/+1
|/ | | | | | | | Rather than the secret file. The parsing of the file was already done in the gitlab-shell config. This fixes an issue where a recent refactor of the gitlabnet client passed the wrong value.
* Merge branch 'gitlab-shell-release-13-0-0' into 'master'v13.0.0Patrick Bajao2020-05-062-1/+4
|\ | | | | | | | | Release v13.0.0 See merge request gitlab-org/gitlab-shell!379
| * Release v13.0.0gitlab-shell-release-13-0-0John Cai2020-05-052-1/+4
|/
* Merge branch ↵Nick Thomas2020-05-051-4/+0
|\ | | | | | | | | | | | | | | | | '457-custom_hooks_dir-setting-in-config-yml-example-is-no-longer-relevant' into 'master' Remove custom_hooks_dir setting Closes #457 See merge request gitlab-org/gitlab-shell!378
View Lorry Controller Status