Starting federated login

Caio Almeida · Larissa Reis
1 parent 9ccdbb65
Showing 4 changed files with 56 additions and 4 deletions Show diff stats
app/concerns/authenticated_system.rb
app/controllers/application_controller.rb
app/models/user.rb
lib/external_user.rb
@@ -25,7 +25,14 @@ module AuthenticatedSystem
     # Accesses the current user from the session.
     def current_user user_id = session[:user]
       @current_user ||= begin
-        user = User.find_by id: user_id if user_id
+        user = nil
+        if session[:external]
+          user = User.new
+          user.external_person_id = session[:external]
+        else
+          id = session[:user]
+          user = User.where(id: id).first if id
+        end
         user.session = session if user
         User.current = user
         user
@@ -37,9 +44,13 @@ module AuthenticatedSystem
       if new_user.nil?
         session.delete(:user)
       else
-        session[:user] = new_user.id
+        if new_user.id
+          session[:user] = new_user.id
+        else
+          session[:external] = new_user.external_person_id
+        end
         new_user.session = session
-        new_user.register_login
+        new_user.register_login if new_user.id
       end
       @current_user = User.current = new_user
     end
@@ -8,6 +8,8 @@ class ApplicationController &lt; ActionController::Base
   before_filter :allow_cross_domain_access
  
   include AuthenticatedSystem
+  include ExternalAuthenticatedSystem
+
   before_filter :require_login_for_environment, :if => :private_environment?
  
   before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
@@ -8,6 +8,8 @@ class User &lt; ApplicationRecord
  
   attr_accessible :login, :email, :password, :password_confirmation, :activated_at
  
+  include ExternalUser
+
   N_('Password')
   N_('Password confirmation')
   N_('Terms accepted')
@@ -147,7 +149,8 @@ class User &lt; ApplicationRecord
       u.generate_private_token_if_not_exist
       return u
     end
-    return nil
+
+    return User.external_authenticate(login, password, environment)
   end
  
   def register_login
@@ -0,0 +1,36 @@
+module ExternalUser
+  included do
+    attr_accessor :external_person_id
+  end
+
+  def self.webfinger_lookup(login, domain, environment)
+    if login && domain && environment.has_federated_network?(domain)
+      # Ask if network at <domain> has user with login <login>
+      # FIXME: Make an actual request to the federated network, which should return nil if not found
+      {
+        login: login
+      }
+    end
+    nil
+  end
+
+  def self.external_login
+    # Call Noosfero /api/login
+  end
+
+  # Authenticates a user from an external social network
+  def self.external_authenticate(username, password, environment)
+    login, domain = username.split('@')
+    webfinger = User.webfinger_lookup(login, domain, environment)
+    if webfinger
+      user = User.external_login(login, password, domain)
+      if user
+        u = User.new
+        # Set other fields on "u" based on information in "user" returned by API
+        u.external_person_id = ExternalPerson.get_or_create(login, domain).id
+        return u
+      end
+    end
+    nil
+  end
+end
...	...	@@ -25,7 +25,14 @@ module AuthenticatedSystem
25	25	# Accesses the current user from the session.
26	26	def current_user user_id = session[:user]
27	27	@current_user \|\|= begin
28		- user = User.find_by id: user_id if user_id
	28	+ user = nil
	29	+ if session[:external]
	30	+ user = User.new
	31	+ user.external_person_id = session[:external]
	32	+ else
	33	+ id = session[:user]
	34	+ user = User.where(id: id).first if id
	35	+ end
29	36	user.session = session if user
30	37	User.current = user
31	38	user
...	...	@@ -37,9 +44,13 @@ module AuthenticatedSystem
37	44	if new_user.nil?
38	45	session.delete(:user)
39	46	else
40		- session[:user] = new_user.id
	47	+ if new_user.id
	48	+ session[:user] = new_user.id
	49	+ else
	50	+ session[:external] = new_user.external_person_id
	51	+ end
41	52	new_user.session = session
42		- new_user.register_login
	53	+ new_user.register_login if new_user.id
43	54	end
44	55	@current_user = User.current = new_user
45	56	end
...	...
...	...	@@ -8,6 +8,8 @@ class ApplicationController < ActionController::Base
8	8	before_filter :allow_cross_domain_access
9	9
10	10	include AuthenticatedSystem
	11	+ include ExternalAuthenticatedSystem
	12	+
11	13	before_filter :require_login_for_environment, :if => :private_environment?
12	14
13	15	before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
...	...
...	...	@@ -8,6 +8,8 @@ class User < ApplicationRecord
8	8
9	9	attr_accessible :login, :email, :password, :password_confirmation, :activated_at
10	10
	11	+ include ExternalUser
	12	+
11	13	N_('Password')
12	14	N_('Password confirmation')
13	15	N_('Terms accepted')
...	...	@@ -147,7 +149,8 @@ class User < ApplicationRecord
147	149	u.generate_private_token_if_not_exist
148	150	return u
149	151	end
150		- return nil
	152	+
	153	+ return User.external_authenticate(login, password, environment)
151	154	end
152	155
153	156	def register_login
...	...
...	...	@@ -0,0 +1,36 @@
	1	+module ExternalUser
	2	+ included do
	3	+ attr_accessor :external_person_id
	4	+ end
	5	+
	6	+ def self.webfinger_lookup(login, domain, environment)
	7	+ if login && domain && environment.has_federated_network?(domain)
	8	+ # Ask if network at <domain> has user with login <login>
	9	+ # FIXME: Make an actual request to the federated network, which should return nil if not found
	10	+ {
	11	+ login: login
	12	+ }
	13	+ end
	14	+ nil
	15	+ end
	16	+
	17	+ def self.external_login
	18	+ # Call Noosfero /api/login
	19	+ end
	20	+
	21	+ # Authenticates a user from an external social network
	22	+ def self.external_authenticate(username, password, environment)
	23	+ login, domain = username.split('@')
	24	+ webfinger = User.webfinger_lookup(login, domain, environment)
	25	+ if webfinger
	26	+ user = User.external_login(login, password, domain)
	27	+ if user
	28	+ u = User.new
	29	+ # Set other fields on "u" based on information in "user" returned by API
	30	+ u.external_person_id = ExternalPerson.get_or_create(login, domain).id
	31	+ return u
	32	+ end
	33	+ end
	34	+ nil
	35	+ end
	36	+end
...	...