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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
2a0be666
Commit
2a0be666
authored
Jul 05, 2016
by
Patricio Cano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added a lot of stubbing to make sure OAUth requests are handled properly with 2FA
parent
eda20534
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
2 deletions
+29
-2
spec/features/login_spec.rb
spec/features/login_spec.rb
+18
-1
spec/spec_helper.rb
spec/spec_helper.rb
+1
-1
spec/support/login_helpers.rb
spec/support/login_helpers.rb
+10
-0
No files found.
spec/features/login_spec.rb
View file @
2a0be666
...
@@ -110,12 +110,29 @@ feature 'Login', feature: true do
...
@@ -110,12 +110,29 @@ feature 'Login', feature: true do
end
end
context
'logging in via OAuth'
do
context
'logging in via OAuth'
do
def
saml_config
OpenStruct
.
new
(
name:
'saml'
,
label:
'saml'
,
args:
{
assertion_consumer_service_url:
'https://localhost:3443/users/auth/saml/callback'
,
idp_cert_fingerprint:
'26:43:2C:47:AF:F0:6B:D0:07:9C:AD:A3:74:FE:5D:94:5F:4E:9E:52'
,
idp_sso_target_url:
'https://idp.example.com/sso/saml'
,
issuer:
'https://localhost:3443/'
,
name_identifier_format:
'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'
})
end
def
stub_omniauth_config
(
messages
)
def
stub_omniauth_config
(
messages
)
Rails
.
application
.
env_config
[
'devise.mapping'
]
=
Devise
.
mappings
[
:user
]
Rails
.
application
.
routes
.
disable_clear_and_finalize
=
true
Rails
.
application
.
routes
.
draw
do
post
'/users/auth/saml'
=>
'omniauth_callbacks#saml'
end
allow
(
Gitlab
::
OAuth
::
Provider
).
to
receive_messages
(
providers:
[
:saml
],
config_for:
saml_config
)
allow
(
Gitlab
.
config
.
omniauth
).
to
receive_messages
(
messages
)
allow
(
Gitlab
.
config
.
omniauth
).
to
receive_messages
(
messages
)
allow_any_instance_of
(
Object
).
to
receive
(
:user_omniauth_authorize_path
).
with
(
'saml'
).
and_return
(
'/users/auth/saml'
)
end
end
it
'should show 2FA prompt after OAuth login'
do
it
'should show 2FA prompt after OAuth login'
do
stub_omniauth_config
(
enabled:
true
,
auto_link_saml_user:
true
,
allow_single_sign_on:
[
'saml'
],
providers:
[
OpenStruct
.
new
(
name:
'saml'
,
label:
'saml'
,
args:
{})
])
stub_omniauth_config
(
enabled:
true
,
auto_link_saml_user:
true
,
allow_single_sign_on:
[
'saml'
],
providers:
[
saml_config
])
user
=
create
(
:omniauth_user
,
:two_factor
,
extern_uid:
'my-uid'
,
provider:
'saml'
)
user
=
create
(
:omniauth_user
,
:two_factor
,
extern_uid:
'my-uid'
,
provider:
'saml'
)
login_via
(
'saml'
,
user
,
'my-uid'
)
login_via
(
'saml'
,
user
,
'my-uid'
)
...
...
spec/spec_helper.rb
View file @
2a0be666
spec/support/login_helpers.rb
View file @
2a0be666
...
@@ -39,6 +39,7 @@ module LoginHelpers
...
@@ -39,6 +39,7 @@ module LoginHelpers
def
login_via
(
provider
,
user
,
uid
)
def
login_via
(
provider
,
user
,
uid
)
mock_auth_hash
(
provider
,
uid
,
user
.
email
)
mock_auth_hash
(
provider
,
uid
,
user
.
email
)
Rails
.
application
.
env_config
[
'omniauth.auth'
]
=
OmniAuth
.
config
.
mock_auth
[
:saml
]
visit
new_user_session_path
visit
new_user_session_path
click_link
provider
click_link
provider
end
end
...
@@ -57,6 +58,15 @@ module LoginHelpers
...
@@ -57,6 +58,15 @@ module LoginHelpers
credentials:
{
credentials:
{
token:
'mock_token'
,
token:
'mock_token'
,
secret:
'mock_secret'
secret:
'mock_secret'
},
extra:
{
raw_info:
{
info:
{
name:
'mockuser'
,
email:
email
,
image:
'mock_user_thumbnail_url'
}
}
}
}
})
})
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