Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4b626f97
Commit
4b626f97
authored
May 28, 2019
by
James Edwards-Jones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Git HTTP works with SSO Enforcement
parent
2ccf14d9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
0 deletions
+21
-0
app/controllers/projects/git_http_client_controller.rb
app/controllers/projects/git_http_client_controller.rb
+1
-0
ee/changelogs/unreleased/jej-fix-git-http-with-sso-enforcement.yml
...logs/unreleased/jej-fix-git-http-with-sso-enforcement.yml
+5
-0
ee/spec/requests/git_http_spec.rb
ee/spec/requests/git_http_spec.rb
+15
-0
No files found.
app/controllers/projects/git_http_client_controller.rb
View file @
4b626f97
...
...
@@ -15,6 +15,7 @@ class Projects::GitHttpClientController < Projects::ApplicationController
alias_method
:authenticated_user
,
:actor
# Git clients will not know what authenticity token to send along
skip_around_action
:set_session_storage
skip_before_action
:verify_authenticity_token
skip_before_action
:repository
before_action
:authenticate_user
...
...
ee/changelogs/unreleased/jej-fix-git-http-with-sso-enforcement.yml
0 → 100644
View file @
4b626f97
---
title
:
Fix Git over HTTP when using SAML SSO Enforcement
merge_request
:
13485
author
:
type
:
fixed
ee/spec/requests/git_http_spec.rb
View file @
4b626f97
...
...
@@ -138,4 +138,19 @@ describe 'Git HTTP requests' do
it_behaves_like
'pushes are allowed'
end
end
describe
'when SSO is enforced'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
:private
,
group:
group
)
}
let
(
:env
)
{
{
user:
user
.
username
,
password:
user
.
password
}
}
let
(
:path
)
{
"
#{
project
.
full_path
}
.git"
}
before
do
project
.
add_developer
(
user
)
create
(
:saml_provider
,
group:
group
,
enforced_sso:
true
)
end
it_behaves_like
'pulls are allowed'
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment