diff options
| -rw-r--r-- | NOTICE | 220 | ||||
| -rw-r--r-- | cmd/gitaly-hooks/hooks_test.go | 21 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | internal/gitaly/service/hook/post_receive_test.go | 4 | ||||
| -rw-r--r-- | internal/gitaly/service/smarthttp/receive_pack_test.go | 17 | ||||
| -rw-r--r-- | internal/gitaly/service/ssh/receive_pack_test.go | 3 | ||||
| -rw-r--r-- | internal/testhelper/testserver.go | 42 |
7 files changed, 15 insertions, 294 deletions
@@ -9690,226 +9690,6 @@ LICENSE - gopkg.in/jcmturner/rpc.v0/ndr limitations under the License. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -LICENSE - gopkg.in/yaml.v2 - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -NOTICE - gopkg.in/yaml.v2 -Copyright 2011-2016 Canonical Ltd. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ LICENSE - gopkg.in/yaml.v3 This project is covered by two different licenses: MIT and Apache. diff --git a/cmd/gitaly-hooks/hooks_test.go b/cmd/gitaly-hooks/hooks_test.go index ab650b7ff..76dc407c2 100644 --- a/cmd/gitaly-hooks/hooks_test.go +++ b/cmd/gitaly-hooks/hooks_test.go @@ -141,7 +141,7 @@ func testHooksPrePostReceive(t *testing.T) { glUsername := "iamgitlab" glProtocol := "ssh" - tempGitlabShellDir, cleanup := testhelper.CreateTemporaryGitlabShellDir(t) + tempGitlabShellDir, cleanup := testhelper.TempDir(t) defer cleanup() changes := "abc" @@ -173,16 +173,6 @@ func testHooksPrePostReceive(t *testing.T) { config.Config.GitlabShell.Dir = tempGitlabShellDir - testhelper.WriteTemporaryGitlabShellConfigFile(t, - tempGitlabShellDir, - testhelper.GitlabShellConfig{ - GitlabURL: serverURL, - HTTPSettings: testhelper.HTTPSettings{ - User: gitlabUser, - Password: gitlabPassword, - }, - }) - testhelper.WriteShellSecretFile(t, tempGitlabShellDir, secretToken) config.Config.Gitlab.URL = serverURL @@ -280,14 +270,12 @@ func TestHooksUpdate(t *testing.T) { glUsername := "iamgitlab" glProtocol := "ssh" - tempGitlabShellDir, cleanup := testhelper.CreateTemporaryGitlabShellDir(t) + tempGitlabShellDir, cleanup := testhelper.TempDir(t) defer cleanup() customHooksDir, cleanup := testhelper.TempDir(t) defer cleanup() - testhelper.WriteTemporaryGitlabShellConfigFile(t, tempGitlabShellDir, testhelper.GitlabShellConfig{GitlabURL: "http://www.example.com", CustomHooksDir: customHooksDir}) - os.Symlink(filepath.Join(config.Config.GitlabShell.Dir, "config.yml"), filepath.Join(tempGitlabShellDir, "config.yml")) testhelper.WriteShellSecretFile(t, tempGitlabShellDir, "the wrong token") @@ -376,7 +364,7 @@ func TestHooksPostReceiveFailed(t *testing.T) { glProtocol := "ssh" changes := "oldhead newhead" - tempGitlabShellDir, cleanup := testhelper.CreateTemporaryGitlabShellDir(t) + tempGitlabShellDir, cleanup := testhelper.TempDir(t) defer cleanup() testRepo, testRepoPath, cleanupFn := testhelper.NewTestRepo(t) @@ -505,7 +493,7 @@ func TestHooksNotAllowed(t *testing.T) { glProtocol := "ssh" changes := "oldhead newhead" - tempGitlabShellDir, cleanup := testhelper.CreateTemporaryGitlabShellDir(t) + tempGitlabShellDir, cleanup := testhelper.TempDir(t) defer cleanup() testRepo, testRepoPath, cleanupFn := testhelper.NewTestRepo(t) @@ -524,7 +512,6 @@ func TestHooksNotAllowed(t *testing.T) { serverURL, cleanup := testhelper.NewGitlabTestServer(t, c) defer cleanup() - testhelper.WriteTemporaryGitlabShellConfigFile(t, tempGitlabShellDir, testhelper.GitlabShellConfig{GitlabURL: serverURL}) testhelper.WriteShellSecretFile(t, tempGitlabShellDir, "the wrong token") config.Config.GitlabShell.Dir = tempGitlabShellDir @@ -36,7 +36,7 @@ require ( golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211 golang.org/x/text v0.3.3 // indirect google.golang.org/grpc v1.24.0 - gopkg.in/yaml.v2 v2.3.0 + gopkg.in/yaml.v2 v2.3.0 // indirect ) go 1.13 diff --git a/internal/gitaly/service/hook/post_receive_test.go b/internal/gitaly/service/hook/post_receive_test.go index 75426a98a..fc50119aa 100644 --- a/internal/gitaly/service/hook/post_receive_test.go +++ b/internal/gitaly/service/hook/post_receive_test.go @@ -39,7 +39,7 @@ func TestPostReceiveInvalidArgument(t *testing.T) { func TestHooksMissingStdin(t *testing.T) { user, password, secretToken := "user", "password", "secret token" - tempDir, cleanup := testhelper.CreateTemporaryGitlabShellDir(t) + tempDir, cleanup := testhelper.TempDir(t) defer cleanup() testhelper.WriteShellSecretFile(t, tempDir, secretToken) @@ -196,7 +196,7 @@ To create a merge request for okay, visit: secretToken := "secret token" user, password := "user", "password" - tempDir, cleanup := testhelper.CreateTemporaryGitlabShellDir(t) + tempDir, cleanup := testhelper.TempDir(t) defer cleanup() testhelper.WriteShellSecretFile(t, tempDir, secretToken) diff --git a/internal/gitaly/service/smarthttp/receive_pack_test.go b/internal/gitaly/service/smarthttp/receive_pack_test.go index 888911d45..f07249886 100644 --- a/internal/gitaly/service/smarthttp/receive_pack_test.go +++ b/internal/gitaly/service/smarthttp/receive_pack_test.go @@ -386,7 +386,7 @@ func TestPostReceivePackToHooks(t *testing.T) { client, conn := newSmartHTTPClient(t, "unix://"+socket) defer conn.Close() - tempGitlabShellDir, cleanup := testhelper.CreateTemporaryGitlabShellDir(t) + tempGitlabShellDir, cleanup := testhelper.TempDir(t) defer cleanup() defer func(cfg config.Cfg) { @@ -419,7 +419,6 @@ func TestPostReceivePackToHooks(t *testing.T) { }) defer cleanup() - testhelper.WriteTemporaryGitlabShellConfigFile(t, tempGitlabShellDir, testhelper.GitlabShellConfig{GitlabURL: serverURL}) testhelper.WriteShellSecretFile(t, tempGitlabShellDir, secretToken) cleanup = testhelper.WriteCheckNewObjectExistsHook(t, testRepoPath) @@ -510,19 +509,9 @@ func testPostReceiveWithTransactionsViaPraefect(t *testing.T, ctx context.Contex serverURL, cleanup := testhelper.NewGitlabTestServer(t, opts) defer cleanup() - gitlabShellDir, cleanup := testhelper.CreateTemporaryGitlabShellDir(t) + gitlabShellDir, cleanup := testhelper.TempDir(t) defer cleanup() config.Config.GitlabShell.Dir = gitlabShellDir - testhelper.WriteTemporaryGitlabShellConfigFile(t, - gitlabShellDir, - testhelper.GitlabShellConfig{ - GitlabURL: serverURL, - HTTPSettings: testhelper.HTTPSettings{ - User: gitlabUser, - Password: gitlabPassword, - }, - }) - config.Config.Gitlab.URL = serverURL config.Config.Gitlab.HTTPSettings.User = gitlabUser config.Config.Gitlab.HTTPSettings.Password = gitlabPassword @@ -594,7 +583,7 @@ func TestPostReceiveWithReferenceTransactionHook(t *testing.T) { go gitalyServer.Serve(internalListener) defer gitalyServer.Stop() - gitlabShellDir, cleanup := testhelper.CreateTemporaryGitlabShellDir(t) + gitlabShellDir, cleanup := testhelper.TempDir(t) defer cleanup() defer func(oldValue string) { diff --git a/internal/gitaly/service/ssh/receive_pack_test.go b/internal/gitaly/service/ssh/receive_pack_test.go index 7f66ab142..fe387d465 100644 --- a/internal/gitaly/service/ssh/receive_pack_test.go +++ b/internal/gitaly/service/ssh/receive_pack_test.go @@ -247,7 +247,7 @@ func TestSSHReceivePackToHooks(t *testing.T) { serverSocketPath, stop := runSSHServer(t) defer stop() - tempGitlabShellDir, cleanup := testhelper.CreateTemporaryGitlabShellDir(t) + tempGitlabShellDir, cleanup := testhelper.TempDir(t) defer cleanup() defer func(gitlabShell config.GitlabShell) { @@ -271,7 +271,6 @@ func TestSSHReceivePackToHooks(t *testing.T) { }) defer cleanup() - testhelper.WriteTemporaryGitlabShellConfigFile(t, tempGitlabShellDir, testhelper.GitlabShellConfig{GitlabURL: serverURL}) testhelper.WriteShellSecretFile(t, tempGitlabShellDir, secretToken) config.Config.Gitlab.URL = serverURL diff --git a/internal/testhelper/testserver.go b/internal/testhelper/testserver.go index 61f66d508..163cd7e9a 100644 --- a/internal/testhelper/testserver.go +++ b/internal/testhelper/testserver.go @@ -37,7 +37,6 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/health" healthpb "google.golang.org/grpc/health/grpc_health_v1" - "gopkg.in/yaml.v2" ) // TestServerOpt is an option for TestServer @@ -917,35 +916,6 @@ func startSocketHTTPServer(t FatalLogger, mux *http.ServeMux, tlsCfg *tls.Config return url, cleanup } -// CreateTemporaryGitlabShellDir creates a temporary gitlab shell directory. It returns the path to the directory -// and a cleanup function -func CreateTemporaryGitlabShellDir(t testing.TB) (string, func()) { - tempDir, cleanup := TempDir(t) - return tempDir, cleanup -} - -// WriteTemporaryGitlabShellConfigFile writes a gitlab shell config.yml in a temporary directory. It returns the path -// and a cleanup function -func WriteTemporaryGitlabShellConfigFile(t FatalLogger, dir string, config GitlabShellConfig) (string, func()) { - out, err := yaml.Marshal(&config) - if err != nil { - t.Fatalf("error marshalling config", err) - } - - if err := os.MkdirAll(dir, os.ModeDir); err != nil { - t.Fatalf("error creating gitlab shell config directory", err) - } - - path := filepath.Join(dir, "config.yml") - if err = ioutil.WriteFile(path, out, 0644); err != nil { - t.Fatalf("error writing gitlab shell config", err) - } - - return path, func() { - os.RemoveAll(path) - } -} - // WriteTemporaryGitalyConfigFile writes a gitaly toml file into a temporary directory. It returns the path to // the file as well as a cleanup function func WriteTemporaryGitalyConfigFile(t testing.TB, tempDir, gitlabURL, user, password, secretFile string) (string, func()) { @@ -971,18 +941,15 @@ type FatalLogger interface { // WriteShellSecretFile writes a .gitlab_shell_secret file in the specified directory func WriteShellSecretFile(t FatalLogger, dir, secretToken string) { + if err := os.MkdirAll(dir, os.ModeDir); err != nil { + t.Fatalf("error creating gitlab shell secret directory", err) + } + if err := ioutil.WriteFile(filepath.Join(dir, ".gitlab_shell_secret"), []byte(secretToken), 0644); err != nil { t.Fatalf("writing shell secret file: %v", err) } } -// GitlabShellConfig contains a subset of gitlabshell's config.yml -type GitlabShellConfig struct { - GitlabURL string `yaml:"gitlab_url"` - HTTPSettings HTTPSettings `yaml:"http_settings"` - CustomHooksDir string `yaml:"custom_hooks_dir"` -} - // HTTPSettings contains fields for http settings type HTTPSettings struct { User string `yaml:"user"` @@ -1010,7 +977,6 @@ func NewHealthServerWithListener(t testing.TB, listener net.Listener) (*grpc.Ser func SetupAndStartGitlabServer(t FatalLogger, c *GitlabTestServerOptions) (string, func()) { url, cleanup := NewGitlabTestServer(t, *c) - WriteTemporaryGitlabShellConfigFile(t, config.Config.GitlabShell.Dir, GitlabShellConfig{GitlabURL: url}) WriteShellSecretFile(t, config.Config.GitlabShell.Dir, c.SecretToken) return url, cleanup |