summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use moved GitLab client from Gitalyash2k/use-moved-gitlab-clientMikhail Mazurskiy2021-09-0927-1019/+219
| | | | See https://gitlab.com/gitlab-org/gitaly/-/merge_requests/3850
* Merge branch 'build/make' into 'main'Igor Drozdov2021-09-091-1/+2
|\ | | | | | | | | build: move build task to the top of the Makefile See merge request gitlab-org/gitlab-shell!513
| * build: move build task to the top of the Makefilefeistel2021-09-071-1/+2
| |
* | Merge branch 'remove/generic-args' into 'main'Nick Thomas2021-09-0811-39/+41
|\ \ | | | | | | | | | | | | | | | | | | refactor: remove commandargs.GenericArgs Closes #212 See merge request gitlab-org/gitlab-shell!506
| * | refactor: add acceptargs field to executablefeistel2021-09-089-20/+24
| | | | | | | | | | | | | | | parse logic will only run if the executable accept args. healthcheck is the only one not accepting arguments.
| * | refactor: improve unknown executable error messagefeistel2021-09-081-1/+2
| | |
| * | refactor: remove commandargs.GenericArgsfeistel2021-08-113-21/+18
| | |
* | | Merge branch 'remove/ioutil' into 'main'Igor Drozdov2021-09-0824-73/+68
|\ \ \ | |_|/ |/| | | | | | | | refactor: move away from ioutil (deprecated) See merge request gitlab-org/gitlab-shell!511
| * | refactor: move away from ioutil (deprecated)feistel2021-08-1924-73/+68
| | |
* | | Merge branch 'release-13-21' into 'main'v13.21.0Nick Thomas2021-08-252-1/+19
|\ \ \ | |/ / |/| | | | | | | | Release v13.21.0 See merge request gitlab-org/gitlab-shell!512
| * | Version 3.21.0Nick Thomas2021-08-252-1/+11
| | |
| * | Add missing CHANGELOG entriesNick Thomas2021-08-251-0/+8
|/ /
* | Merge branch 'bump/go-1.16' into 'main'Nick Thomas2021-08-193-17/+1
|\ \ | | | | | | | | | | | | build: bump go version to 1.16 See merge request gitlab-org/gitlab-shell!509
| * | ci: remove go 1.15 test jobfeistel2021-08-191-7/+0
| | |
| * | build: bump go version to 1.16feistel2021-08-192-10/+1
| | |
* | | Merge branch 'test/go-1.17' into 'main'Patrick Bajao2021-08-191-1/+8
|\ \ \ | |/ / |/| | | | | | | | ci: start integrating go 1.17 into the CI pipelines See merge request gitlab-org/gitlab-shell!510
| * | ci: start integrating go 1.17 into the CI pipelinesfeistel2021-08-191-1/+8
|/ /
* | Merge branch 'verify/cafile' into 'main'Ash McKenzie2021-08-182-29/+47
|\ \ | | | | | | | | | | | | | | | | | | fix: validate client cert paths exist on disk before proceeding Closes #486 See merge request gitlab-org/gitlab-shell!508
| * | test: move os.stat check before the hcc creationAsh McKenzie2021-08-171-7/+7
| | |
| * | fix: make sure ErrCafileNotFound is returned only when the file doesn't existfeistel2021-08-111-1/+4
| | |
| * | fix: validate client cert paths exist on disk before proceedingfeistel2021-08-112-29/+44
| |/
* | Merge branch 'update/newclientopts' into 'main'Nick Thomas2021-08-135-9/+22
|\ \ | | | | | | | | | | | | | | | | | | refactor: update usage of NewHTTPClient to NewHTTPClientWithOpts Closes #484 See merge request gitlab-org/gitlab-shell!507
| * | refactor: change httpclient to return an errorfeistel2021-08-133-7/+12
| | |
| * | refactor: update usage of NewHTTPClient to NewHTTPClientWithOptsfeistel2021-08-113-4/+12
| |/
* | Merge branch 'bump/go1.15' into 'main'Patrick Bajao2021-08-123-9/+1
|\ \ | |/ |/| | | | | build: bump go to 1.15 See merge request gitlab-org/gitlab-shell!505
| * test: remove go 1.14 test jobfeistel2021-08-111-7/+0
| |
| * build: bump go to 1.15feistel2021-08-112-2/+1
|/
* Merge branch '499-use-labkit-logging-initialize' into 'main'Patrick Bajao2021-08-0410-43/+98
|\ | | | | | | | | | | | | Switch to labkit for logging system setup Closes #271 See merge request gitlab-org/gitlab-shell!504
| * Switch to labkit for logging system setupNick Thomas2021-08-0410-43/+98
| | | | | | | | | | | | | | | | | | | | | | - We start supporting the "color" format for logs. - We now respond to SIGHUP by reopening the log file. - We now respect the log format when no log filename is specified. Output to syslog in the event of logging system setup is preserved in OpenSSH mode. Changelog: added
* | Merge branch 'security-300265' into 'main'Patrick Bajao2021-08-042-4/+9
|\ \ | |/ |/| | | | | Modify regex to prevent partial matches See merge request gitlab-org/security/gitlab-shell!6
| * Modify regex to prevent partial matchesRobert May2021-06-292-4/+9
| |
* | Merge branch '477-remove-logrus-tests' into 'main'Igor Drozdov2021-08-025-136/+77
|\ \ | | | | | | | | | | | | | | | | | | Remove some unreliable tests Closes #477 See merge request gitlab-org/gitlab-shell!503
| * | Remove some unreliable testsNick Thomas2021-07-305-136/+77
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Logrus buffers its output internally, which makes these tests fail intermittently. They're also not a good example to follow generally. We now have acceptance tests that exercise this functionality so I'm pretty relaxed about losing the expectations. However, we can test them by inspecting the server-received metadata too, so there's no loss of coverage here. The move from logrus to labkit for logging also makes these tests hard to justify keeping.
* | Merge branch 'id-ctx-for-auth-check' into 'main'Nick Thomas2021-07-274-56/+157
|\ \ | | | | | | | | | | | | Log same correlation_id on auth keys check of ssh connections See merge request gitlab-org/gitlab-shell!501
| * | Sshd: Log same correlation_id on auth keysIgor Drozdov2021-07-274-56/+157
|/ /
* | Merge branch 'sh-update-go-proxyproto' into 'main'Nick Thomas2021-07-273-4/+8
|\ \ | | | | | | | | | | | | Update go-proxyproto to v0.6.0 See merge request gitlab-org/gitlab-shell!499
| * | Set a 90-second timeout on proxy headersStan Hu2021-07-261-9/+12
| | |
| * | Update go-proxyproto to v0.6.0Stan Hu2021-07-262-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From https://github.com/pires/go-proxyproto/releases: Prevent potentially malicious client(s) from opening connections and not send the proxy protocol header, which could lead to DoS as the server would hold those socket descriptors open indefinitely, eventually running out of resources. The solution is to set a read deadline when waiting for the PROXY protocol header: https://github.com/pires/go-proxyproto/pull/74
* | | Merge branch 'sh-fix-gofmt' into 'main'Nick Thomas2021-07-2710-25/+26
|\ \ \ | |/ / |/| | | | | | | | Make gofmt check fail if there are any matching files See merge request gitlab-org/gitlab-shell!500
| * | Fix formatting via make fmtStan Hu2021-07-269-24/+22
| | |
| * | Make gofmt check fail if there are any matching filesStan Hu2021-07-261-1/+4
|/ / | | | | | | | | | | | | | | gofmt doesn't return an exit code 1 if there are matching files: https://github.com/golang/go/issues/24230 To fix this, use the same trick we use in Workhorse to parse output. Also add a `make fmt` step to format all the code properly.
* | Merge branch 'id-switch-logging-to-labkit' into 'main'Patrick Bajao2021-07-238-48/+46
|\ \ | | | | | | | | | | | | Switch to labkit/log for logging functionality See merge request gitlab-org/gitlab-shell!498
| * | Switch to labkit/log for logging functionalityIgor Drozdov2021-07-228-48/+46
| | |
* | | Merge branch '521-test-connection-dot-go' into 'main'Patrick Bajao2021-07-221-5/+73
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Unit tests for internal/sshd/connection.go Closes #521 See merge request gitlab-org/gitlab-shell!497
| * | Unit tests for internal/sshd/connection.goNick Thomas2021-07-221-5/+73
|/ /
* | Merge branch 'id-prometheus-metrics-for-http' into 'main'Nick Thomas2021-07-214-40/+101
|\ \ | | | | | | | | | | | | Prometheus metrics for HTTP requests See merge request gitlab-org/gitlab-shell!496
| * | Prometheus metrics for HTTP requestsIgor Drozdov2021-07-214-40/+101
|/ / | | | | | | | | A RoundTripper for tracking the duration of an http request is introduced
* | Merge branch 'igorwwwwwwwwwwwwwwwwwwww-main-patch-84756' into 'main'Nick Thomas2021-07-202-11/+6
|\ \ | | | | | | | | | | | | Add tracing instrumentation to http client See merge request gitlab-org/gitlab-shell!495
| * | remove tracing.NewRoundTripper from internal/Config, now that NewHTTPClient ↵Igor Wiedler2021-07-201-10/+4
| | | | | | | | | | | | already includes it
| * | Add tracing instrumentation to http clientIgor2021-07-201-1/+2
|/ /