BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
6d6c7a17
Commit
6d6c7a17
authored
Aug 31, 2012
by
Florian Unglaub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow single-sign-on with Omniauth
parent
36ffdf36
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
3 deletions
+37
-3
omniauth_callbacks_controller.rb
app/controllers/omniauth_callbacks_controller.rb
+2
-2
user.rb
app/models/user.rb
+33
-1
gitlab.yml.example
config/gitlab.yml.example
+2
-0
No files found.
app/controllers/omniauth_callbacks_controller.rb
View file @
6d6c7a17
...
@@ -38,7 +38,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
...
@@ -38,7 +38,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
current_user
.
save
current_user
.
save
redirect_to
profile_path
redirect_to
profile_path
else
else
@user
=
User
.
find_by_provider_and_extern_uid
(
provider
,
uid
)
@user
=
User
.
find_or_new_for_omniauth
(
oauth
)
@user
.
save!
if
@user
.
try
(
'new_record?'
)
if
@user
if
@user
sign_in_and_redirect
@user
sign_in_and_redirect
@user
...
@@ -48,5 +49,4 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
...
@@ -48,5 +49,4 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
end
end
end
end
end
end
end
end
app/models/user.rb
View file @
6d6c7a17
...
@@ -86,6 +86,39 @@ class User < ActiveRecord::Base
...
@@ -86,6 +86,39 @@ class User < ActiveRecord::Base
where
(
'id NOT IN (SELECT DISTINCT(user_id) FROM users_projects)'
)
where
(
'id NOT IN (SELECT DISTINCT(user_id) FROM users_projects)'
)
end
end
def
self
.
find_or_new_for_omniauth
(
oauth
)
provider
,
uid
=
oauth
[
'provider'
],
oauth
[
'uid'
]
if
@user
=
User
.
find_by_provider_and_extern_uid
(
provider
,
uid
)
@user
else
if
Gitlab
.
config
.
omniauth
.
allow_single_sign_on
# Ensure here that all required attributes were passed along with the
# oauth request:
%w(first_name last_name email)
.
each
do
|
attr
|
unless
oauth
[
:info
][
attr
].
present?
raise
OmniAuth
::
Error
,
"
#{
provider
}
does not provide the required field
#{
attr
}
"
end
end
password
=
Devise
.
friendly_token
[
0
,
8
].
downcase
@user
=
User
.
new
(
extern_uid:
uid
,
provider:
provider
,
name:
"
#{
oauth
[
:info
][
:first_name
]
}
#{
oauth
[
:info
][
:last_name
]
}
"
,
email:
oauth
[
:info
][
:email
],
password:
password
,
password_confirmation:
password
,
projects_limit:
Gitlab
.
config
.
default_projects_limit
,
)
@user
.
blocked
=
true
if
Gitlab
.
config
.
omniauth
.
block_auto_created_users
@user
end
end
end
def
self
.
find_for_ldap_auth
(
auth
,
signed_in_resource
=
nil
)
def
self
.
find_for_ldap_auth
(
auth
,
signed_in_resource
=
nil
)
uid
=
auth
.
info
.
uid
uid
=
auth
.
info
.
uid
provider
=
auth
.
provider
provider
=
auth
.
provider
...
@@ -148,4 +181,3 @@ end
...
@@ -148,4 +181,3 @@ end
# bio :string(255)
# bio :string(255)
# blocked :boolean(1) default(FALSE), not null
# blocked :boolean(1) default(FALSE), not null
#
#
config/gitlab.yml.example
View file @
6d6c7a17
...
@@ -53,6 +53,8 @@ git:
...
@@ -53,6 +53,8 @@ git:
omniauth:
omniauth:
enabled: false
enabled: false
providers:
providers:
allow_single_sign_on: false
block_auto_created_users: true
# omniauth:
# omniauth:
# enabled: true
# enabled: true
...
...
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