diff options
author | Małgorzata Ksionek <mksionek@gitlab.com> | 2019-10-01 14:59:00 +0200 |
---|---|---|
committer | Małgorzata Ksionek <mksionek@gitlab.com> | 2019-10-01 14:59:00 +0200 |
commit | 1ba172d426274832f4a76a1b540dce462ec932f3 (patch) | |
tree | 552b07398739fbc2af55fb93ec8c5f4986060305 | |
parent | 650ecad9bad69dbc12745c71d959a89b87ffdac7 (diff) | |
download | gitlab-shell-1ba172d426274832f4a76a1b540dce462ec932f3.tar.gz |
Update methods to use new path
31 files changed, 41 insertions, 41 deletions
diff --git a/go/internal/command/lfsauthenticate/lfsauthenticate_test.go b/go/internal/command/lfsauthenticate/lfsauthenticate_test.go index a6836a8..3b5d11c 100644 --- a/go/internal/command/lfsauthenticate/lfsauthenticate_test.go +++ b/go/internal/command/lfsauthenticate/lfsauthenticate_test.go @@ -90,7 +90,7 @@ func TestLfsAuthenticateRequests(t *testing.T) { }, }, { - Path: "/api/v4/internal/allowed", + Path: "/api/v4/internal/allowed/secure", Handler: func(w http.ResponseWriter, r *http.Request) { b, err := ioutil.ReadAll(r.Body) defer r.Body.Close() diff --git a/go/internal/command/receivepack/customaction_test.go b/go/internal/command/receivepack/customaction_test.go index bd4991d..045dd6c 100644 --- a/go/internal/command/receivepack/customaction_test.go +++ b/go/internal/command/receivepack/customaction_test.go @@ -22,7 +22,7 @@ func TestCustomReceivePack(t *testing.T) { requests := []testserver.TestRequestHandler{ { - Path: "/api/v4/internal/allowed", + Path: "/api/v4/internal/allowed/secure", Handler: func(w http.ResponseWriter, r *http.Request) { b, err := ioutil.ReadAll(r.Body) require.NoError(t, err) diff --git a/go/internal/command/shared/accessverifier/accessverifier_test.go b/go/internal/command/shared/accessverifier/accessverifier_test.go index c19ed37..df9c834 100644 --- a/go/internal/command/shared/accessverifier/accessverifier_test.go +++ b/go/internal/command/shared/accessverifier/accessverifier_test.go @@ -24,7 +24,7 @@ var ( func setup(t *testing.T) (*Command, *bytes.Buffer, *bytes.Buffer, func()) { requests := []testserver.TestRequestHandler{ { - Path: "/api/v4/internal/allowed", + Path: "/api/v4/internal/allowed/secure", Handler: func(w http.ResponseWriter, r *http.Request) { b, err := ioutil.ReadAll(r.Body) require.NoError(t, err) diff --git a/go/internal/gitlabnet/accessverifier/client.go b/go/internal/gitlabnet/accessverifier/client.go index 92a7434..f0dea7d 100644 --- a/go/internal/gitlabnet/accessverifier/client.go +++ b/go/internal/gitlabnet/accessverifier/client.go @@ -80,7 +80,7 @@ func (c *Client) Verify(args *commandargs.Shell, action commandargs.CommandType, request.KeyId = args.GitlabKeyId } - response, err := c.client.Post("/allowed", request) + response, err := c.client.Post("/allowed/secure", request) if err != nil { return nil, err } diff --git a/go/internal/gitlabnet/accessverifier/client_test.go b/go/internal/gitlabnet/accessverifier/client_test.go index f534185..0f08c0b 100644 --- a/go/internal/gitlabnet/accessverifier/client_test.go +++ b/go/internal/gitlabnet/accessverifier/client_test.go @@ -157,7 +157,7 @@ func setup(t *testing.T) (*Client, func()) { requests := []testserver.TestRequestHandler{ { - Path: "/api/v4/internal/allowed", + Path: "/api/v4/internal/allowed/secure", Handler: func(w http.ResponseWriter, r *http.Request) { b, err := ioutil.ReadAll(r.Body) require.NoError(t, err) diff --git a/go/internal/testhelper/requesthandlers/requesthandlers.go b/go/internal/testhelper/requesthandlers/requesthandlers.go index a7bc427..89366cf 100644 --- a/go/internal/testhelper/requesthandlers/requesthandlers.go +++ b/go/internal/testhelper/requesthandlers/requesthandlers.go @@ -13,7 +13,7 @@ import ( func BuildDisallowedByApiHandlers(t *testing.T) []testserver.TestRequestHandler { requests := []testserver.TestRequestHandler{ { - Path: "/api/v4/internal/allowed", + Path: "/api/v4/internal/allowed/secure", Handler: func(w http.ResponseWriter, r *http.Request) { body := map[string]interface{}{ "status": false, @@ -31,7 +31,7 @@ func BuildDisallowedByApiHandlers(t *testing.T) []testserver.TestRequestHandler func BuildAllowedWithGitalyHandlers(t *testing.T, gitalyAddress string) []testserver.TestRequestHandler { requests := []testserver.TestRequestHandler{ { - Path: "/api/v4/internal/allowed", + Path: "/api/v4/internal/allowed/secure", Handler: func(w http.ResponseWriter, r *http.Request) { body := map[string]interface{}{ "status": true, diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index 09767da..75062a6 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -28,7 +28,7 @@ class GitlabNet # rubocop:disable Metrics/ClassLength who_sym, _, who_v = self.class.parse_who(who) params[who_sym] = who_v - url = "#{internal_api_endpoint}/allowed" + url = "#{internal_api_endpoint}/allowed/secure" resp = post(url, params) case resp diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index 303f4d5..f8db4c5 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -77,7 +77,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength end if @command == GIT_RECEIVE_PACK_COMMAND && access_status.custom_action? - # If the response from /api/v4/allowed is a HTTP 300, we need to perform + # If the response from /api/v4/allowed/secure is a HTTP 300, we need to perform # a Custom Action and therefore should return and not call process_cmd() # return process_custom_action(access_status) diff --git a/spec/gitlab_shell_custom_git_receive_pack_spec.rb b/spec/gitlab_shell_custom_git_receive_pack_spec.rb index 95cd8ea..755aac8 100644 --- a/spec/gitlab_shell_custom_git_receive_pack_spec.rb +++ b/spec/gitlab_shell_custom_git_receive_pack_spec.rb @@ -24,7 +24,7 @@ describe 'Custom bin/gitlab-shell git-receive-pack' do res.body = {"result" => output}.to_json end - server.mount_proc('/api/v4/internal/allowed') do |req, res| + server.mount_proc('/api/v4/internal/allowed/secure') do |req, res| res.content_type = 'application/json' key_id = req.query['key_id'] || req.query['username'] diff --git a/spec/gitlab_shell_lfs_authentication_spec.rb b/spec/gitlab_shell_lfs_authentication_spec.rb index 7cdb320..d23ec51 100644 --- a/spec/gitlab_shell_lfs_authentication_spec.rb +++ b/spec/gitlab_shell_lfs_authentication_spec.rb @@ -26,7 +26,7 @@ describe 'bin/gitlab-shell git-lfs-authentication' do end end - server.mount_proc('/api/v4/internal/allowed') do |req, res| + server.mount_proc('/api/v4/internal/allowed/secure') do |req, res| res.content_type = 'application/json' key_id = req.query['key_id'] || req.query['username'] diff --git a/spec/vcr_cassettes/allowed-pull.yml b/spec/vcr_cassettes/allowed-pull.yml index d324316..4c6f64a 100644 --- a/spec/vcr_cassettes/allowed-pull.yml +++ b/spec/vcr_cassettes/allowed-pull.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-upload-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=1&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A @@ -41,6 +41,6 @@ http_interactions: body: encoding: UTF-8 string: '{"status":true,"gl_repository":"project-3","gl_project_path":"gitlab-org/gitlab.test","repository_path":"/Users/dzaporozhets/Projects/gitlab-development-kit/repositories/gitlab-org/gitlab-test.git"}' - http_version: + http_version: recorded_at: Wed, 21 Jun 2017 10:44:52 GMT recorded_with: VCR 2.4.0 diff --git a/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml b/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml index 4adb088..dc7744e 100644 --- a/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml +++ b/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-receive-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=1&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A diff --git a/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml b/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml index a84b7d2..13f061b 100644 --- a/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml +++ b/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-receive-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=1&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A diff --git a/spec/vcr_cassettes/allowed-push-project-not-found-404.yml b/spec/vcr_cassettes/allowed-push-project-not-found-404.yml index e531fcb..1ae63b4 100644 --- a/spec/vcr_cassettes/allowed-push-project-not-found-404.yml +++ b/spec/vcr_cassettes/allowed-push-project-not-found-404.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-receive-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=1&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A diff --git a/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml b/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml index b2738fe..a9e99de 100644 --- a/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml +++ b/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-receive-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=1&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A diff --git a/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml b/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml index 34532ce..b21aee3 100644 --- a/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml +++ b/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-receive-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=1&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A diff --git a/spec/vcr_cassettes/allowed-push-project-not-found.yml b/spec/vcr_cassettes/allowed-push-project-not-found.yml index f25fa7e..6a74445 100644 --- a/spec/vcr_cassettes/allowed-push-project-not-found.yml +++ b/spec/vcr_cassettes/allowed-push-project-not-found.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-receive-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=1&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A diff --git a/spec/vcr_cassettes/allowed-push.yml b/spec/vcr_cassettes/allowed-push.yml index 025614a..22e5e66 100644 --- a/spec/vcr_cassettes/allowed-push.yml +++ b/spec/vcr_cassettes/allowed-push.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-receive-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=1&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A @@ -41,6 +41,6 @@ http_interactions: body: encoding: UTF-8 string: '{"status":true,"gl_repository":"project-3","gl_project_path":"gitlab-org/gitlab.test","repository_path":"/Users/dzaporozhets/Projects/gitlab-development-kit/repositories/gitlab-org/gitlab-test.git"}' - http_version: + http_version: recorded_at: Wed, 21 Jun 2017 10:44:52 GMT recorded_with: VCR 2.4.0 diff --git a/spec/vcr_cassettes/http-pull-disabled.yml b/spec/vcr_cassettes/http-pull-disabled.yml index 23ef3e5..6f2aa1f 100644 --- a/spec/vcr_cassettes/http-pull-disabled.yml +++ b/spec/vcr_cassettes/http-pull-disabled.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-upload-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=http&env=%7B%7D&key_id=1&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A @@ -41,6 +41,6 @@ http_interactions: body: encoding: UTF-8 string: '{"status":false,"message":"Pulling over HTTP is not allowed."}' - http_version: + http_version: recorded_at: Wed, 21 Jun 2017 10:32:01 GMT recorded_with: VCR 2.4.0 diff --git a/spec/vcr_cassettes/http-push-disabled.yml b/spec/vcr_cassettes/http-push-disabled.yml index 676e5b8..e488634 100644 --- a/spec/vcr_cassettes/http-push-disabled.yml +++ b/spec/vcr_cassettes/http-push-disabled.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-receive-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=http&env=%7B%7D&key_id=1&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A @@ -41,6 +41,6 @@ http_interactions: body: encoding: UTF-8 string: '{"status":false,"message":"Pushing over HTTP is not allowed."}' - http_version: + http_version: recorded_at: Wed, 21 Jun 2017 10:32:01 GMT recorded_with: VCR 2.4.0 diff --git a/spec/vcr_cassettes/ssh-pull-disabled.yml b/spec/vcr_cassettes/ssh-pull-disabled.yml index 55ce261..f6717e4 100644 --- a/spec/vcr_cassettes/ssh-pull-disabled.yml +++ b/spec/vcr_cassettes/ssh-pull-disabled.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-upload-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=1&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A @@ -41,6 +41,6 @@ http_interactions: body: encoding: UTF-8 string: '{"status":false,"message":"Git access over SSH is not allowed"}' - http_version: + http_version: recorded_at: Wed, 21 Jun 2017 12:23:57 GMT recorded_with: VCR 2.4.0 diff --git a/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml b/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml index d334108..fb43ce8 100644 --- a/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml +++ b/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-upload-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=2&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A diff --git a/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml b/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml index e072493..c44b87a 100644 --- a/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml +++ b/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-upload-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=2&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A diff --git a/spec/vcr_cassettes/ssh-pull-project-denied-401.yml b/spec/vcr_cassettes/ssh-pull-project-denied-401.yml index 4a9305a..0a48da0 100644 --- a/spec/vcr_cassettes/ssh-pull-project-denied-401.yml +++ b/spec/vcr_cassettes/ssh-pull-project-denied-401.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-upload-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=2&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A diff --git a/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml b/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml index b461b5b..8cd91a6 100644 --- a/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml +++ b/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-upload-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&user_id=2&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A @@ -41,6 +41,6 @@ http_interactions: body: encoding: UTF-8 string: '{"status":false,"message":"Git access over SSH is not allowed"}' - http_version: + http_version: recorded_at: Wed, 21 Jun 2017 12:24:05 GMT recorded_with: VCR 2.4.0 diff --git a/spec/vcr_cassettes/ssh-pull-project-denied.yml b/spec/vcr_cassettes/ssh-pull-project-denied.yml index 5107d15..f8c7b87 100644 --- a/spec/vcr_cassettes/ssh-pull-project-denied.yml +++ b/spec/vcr_cassettes/ssh-pull-project-denied.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-upload-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=2&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A @@ -41,6 +41,6 @@ http_interactions: body: encoding: UTF-8 string: '{"status":false,"message":"Git access over SSH is not allowed"}' - http_version: + http_version: recorded_at: Wed, 21 Jun 2017 12:24:04 GMT recorded_with: VCR 2.4.0 diff --git a/spec/vcr_cassettes/ssh-push-disabled.yml b/spec/vcr_cassettes/ssh-push-disabled.yml index c061791..fc09f55 100644 --- a/spec/vcr_cassettes/ssh-push-disabled.yml +++ b/spec/vcr_cassettes/ssh-push-disabled.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-receive-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=1&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A @@ -41,6 +41,6 @@ http_interactions: body: encoding: UTF-8 string: '{"status":false,"message":"Git access over SSH is not allowed"}' - http_version: + http_version: recorded_at: Wed, 21 Jun 2017 12:23:57 GMT recorded_with: VCR 2.4.0 diff --git a/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml b/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml index 08dea91..02ea6d9 100644 --- a/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml +++ b/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-receive-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=2&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A diff --git a/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml b/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml index 46d9a1d..c32d87a 100644 --- a/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml +++ b/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-receive-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=2&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A diff --git a/spec/vcr_cassettes/ssh-push-project-denied-401.yml b/spec/vcr_cassettes/ssh-push-project-denied-401.yml index 77248e2..468b071 100644 --- a/spec/vcr_cassettes/ssh-push-project-denied-401.yml +++ b/spec/vcr_cassettes/ssh-push-project-denied-401.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-receive-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=2&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A diff --git a/spec/vcr_cassettes/ssh-push-project-denied.yml b/spec/vcr_cassettes/ssh-push-project-denied.yml index c16e608..946db72 100644 --- a/spec/vcr_cassettes/ssh-push-project-denied.yml +++ b/spec/vcr_cassettes/ssh-push-project-denied.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://localhost:3000/api/v4/internal/allowed + uri: http://localhost:3000/api/v4/internal/allowed/secure body: encoding: US-ASCII string: action=git-receive-pack&changes=0000000000000000000000000000000000000000+92d0970eefd7acb6d548878925ce2208cfe2d2ec+refs%2Fheads%2Fbranch4&gl_repository&project=gitlab-org%2Fgitlab-test.git&protocol=ssh&env=%7B%7D&key_id=2&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A @@ -41,6 +41,6 @@ http_interactions: body: encoding: UTF-8 string: '{"status":false,"message":"Git access over SSH is not allowed"}' - http_version: + http_version: recorded_at: Wed, 21 Jun 2017 12:24:04 GMT recorded_with: VCR 2.4.0 |