Macartur Sousa · Antonio Terceiro · Antonio Terceiro · Macartur Sousa · Macartur Sousa · Macartur Sousa
Showing 10 changed files Show diff stats
Gemfile
README.md
Rakefile
config.ru
lib/omniauth-remote-user/version.rb
lib/omniauth/remote-user.rb
lib/omniauth/strategies/remote_user.rb
omniauth-remote-user.gemspec
spec/omniauth/strategies/remote_user_spec.rb
spec/spec_helper.rb
 source "http://rubygems.org"
-group :development, :test do
-	gem 'guard'
-	gem 'guard-rspec'
-	gem 'guard-bundler'
-	gem 'rb-fsevent'
-	gem 'simplecov'
-	gem 'rspec'
-	gem 'rake'
-	gem 'coveralls'
-	gem 'rack-test'
+gemspec
+
+group :development do
+  gem 'guard'
+  gem 'guard-bundler'
+  gem 'guard-rspec'
+  gem 'rake'
+  gem 'bundler'
+  gem 'sinatra'
 end
-gemspec
+group :test do
+  gem 'coveralls'
+  gem 'rack-test'
+  gem 'simplecov'
+  gem 'rspec'
+end
 # Omniath Remote User
 The Omniauth Remote User gem provides a way for application to utilize a authentication with remote user HTTP header.
+
+# Instalation
+
+Include in your Gemfile
+
+```ruby
+gem "omniauth-remote-user"
+```
+Then run `bundle install` from the command line:
+
+    bundle install
@@ -7,5 +7,3 @@ RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 task :test    => :spec
-
-
@@ -0,0 +1,43 @@
+require 'sinatra'
+require 'omniauth'
+require 'json'
+
+class MyApplication < Sinatra::Base
+  use Rack::Session::Cookie, secret: '123'
+
+  STRATEGY = 'RemoteUser'
+  #use OmniAuth::Strategies::RemoteUser
+  #STRATEGY = 'developer'
+  use OmniAuth::Strategies::Developer
+
+
+  get '/login' do
+    redirect '/gitlab/auth/%s' % STRATEGY
+  end
+
+  get '/logout' do
+    session[:current_user] = nil
+    redirect '/'
+  end
+
+  post '/auth/:provider/callback' do
+    session[:current_user] = request.env['omniauth.auth']['uid']
+    session[:current_user_email] = request.env['omniauth.auth']['info']['email']
+    session[:current_user_nickname] = request.env['omniauth.auth']['info']['nickname']
+    
+    redirect '/'
+  end
+
+  get '/' do
+    user = session[:current_user]
+    if user
+      info = "(%s → %s)" % [session[:current_user_email], session[:current_user_nickname]]
+      user + info + ' <a href="/logout">logout</a>'
+    else
+      'NOT AUTHENTICATED  <a href="/login">login</a>'
+    end
+  end
+end
+
+run MyApplication
+
 module Omniauth
-	module RemoteUser
-		VERSION = '0.0.1'
-	end
+  module RemoteUser
+    VERSION = '0.0.1'
+  end
 end
@@ -2,7 +2,7 @@ require &#39;omniauth&#39;
 require 'json'
 module OmniAuth
-	module Strategies
-		autoload :RemoteUser, 'omniauth/strategies/remote_user'
-	end
+  module Strategies
+    autoload :RemoteUser, 'omniauth/strategies/remote_user'
+  end
 end
 module OmniAuth
   module Strategies
     class RemoteUser
-
       include OmniAuth::Strategy
-      #option :cookie, 'rack.session'
-      option :cookie, '_gitlab_session'
       option :internal_cookie, '_remote_user'
       def call(env)
+
         remote_user = env['HTTP_REMOTE_USER']
         session_user = __current_user(env)
+
         if remote_user
           if session_user
             if remote_user == session_user
               super(env)
             else
-              __login(env, remote_user) || super(env)
+              __logout(env)
             end
           else
-            __login(env, remote_user) || super(env)
+            __login(env, remote_user)
           end
         else
           if session_user
-            __logout(env) || super(env)
+            __logout(env)
           else
             super(env)
           end
@@ -37,34 +36,35 @@ module OmniAuth
       def __logout(env)
         request = Rack::Request.new(env)
-        response = redirect_if_not_logging_in(request, request.path)
+        request.session.clear
+        response = redirect_if_not_logging_in(request, request.path )
         if response
-          response.delete_cookie(options.cookie)
-          response.delete_cookie(options.internal_cookie)
-          response
+          response.delete_cookie(options.internal_cookie , path: "#{request.script_name}" )
+          response.finish
         end
       end
       def __login(env, uid)
         request = Rack::Request.new(env)
-        response = redirect_if_not_logging_in(request, '/auth/remoteuser')
+        response = redirect_if_not_logging_in(request,_auth_path(request) )
         if response
-          response.set_cookie(options.internal_cookie, uid)
-          response
+          response.set_cookie(options.internal_cookie, {value: uid , path: "#{request.script_name}"})
+          response.finish
         end
       end
       def redirect_if_not_logging_in(request, url)
         if ! [
-          '/auth/remoteuser',
-          '/auth/remoteuser/callback'
-        ].include?(request.path_info)
+            _auth_path(request),
+            _callback_path(request)
+          ].include?(request.path_info)
           response = Rack::Response.new
           response.redirect url
           response
         end
       end
+
       uid do
         request.env['HTTP_REMOTE_USER']
       end
@@ -73,7 +73,9 @@ module OmniAuth
         user_data = request.env['HTTP_REMOTE_USER_DATA']
         if user_data
           data = JSON.parse(user_data)
-          data['nickname'] = data['name']
+          data['nickname'] = uid
+          data['firstname'] = data['name'].split()[0]
+          data['lastname'] = data['name'].split()[1]
           data
         else
           {}
@@ -81,11 +83,17 @@ module OmniAuth
       end
       def request_phase
-        form = OmniAuth::Form.new(:url => callback_path)
-        form.html '<script type="text/javascript"> document.forms[0].submit(); </script>'
-        form.to_response
+        redirect _callback_path(request)
       end
+
+      def _callback_path(request)
+        "#{_auth_path(request)}/callback"
+      end
+
+      def _auth_path(request)
+        "#{request.script_name}#{path_prefix}/RemoteUser"
+      end
+
     end
   end
 end
-
 require File.dirname(__FILE__) + '/lib/omniauth-remote-user/version'
 Gem::Specification.new do |gem|
-  gem.add_runtime_dependency 'omniauth'
-
-  gem.add_runtime_dependency 'simplecov'
-  gem.add_runtime_dependency 'bundler'
-  gem.add_runtime_dependency 'rake'
-  gem.add_runtime_dependency 'rspec'
-  gem.add_runtime_dependency 'rack-test'
-  gem.add_runtime_dependency 'activerecord'
-
+  gem.add_runtime_dependency 'omniauth', '~> 1.0'
   gem.name = 'omniauth-remote-user'
   gem.version = Omniauth::RemoteUser::VERSION
-  gem.description = %q{Authentication with Remote-User HTTP header for Omniauth.}
-  gem.summary = gem.description
-  gem.email = ['kanashiro.duarte@gmail.com', 'thiagitosouza@gmail.com', 'rodrigosiqueiramelo@gmail.com']
+  gem.description = 'Authentication with Remote-User HTTP header for Omniauth.'
+  gem.summary = 'Authentication with HTTP Remote User'
+  gem.email = ['kanashiro.duarte@gmail.com', 'thiagitosouza@gmail.com', 'rodrigosiqueiramelo@gmail.com','macartur.sc@gmail.com','terceiro@softwarelivre.org']
   gem.homepage = 'http://beta.softwarepublico.gov.br/gitlab/softwarepublico/omiauth-remote-user'
-  gem.authors = ['Lucas Kanashiro', 'Thiago Ribeiro', 'Rodrigo Siqueira']
+  gem.authors = ['Lucas Kanashiro', 'Thiago Ribeiro', 'Rodrigo Siqueira','Macartur Sousa', 'Antonio Terceiro']
   gem.require_paths = %w(lib)
   gem.files = `git ls-files -z`.split("\x0").reject {|f| f.start_with?('spec/')}
   gem.test_files = `git ls-files -- {test,spec,feature}/*`.split("\n")
 require 'spec_helper'
 describe 'Test Strategy Remote_User' do
-	let(:app) do
-		Rack::Builder.new do |b|
-			b.use Rack::Session::Cookie, :secret => 'abc123'
-			b.use OmniAuth::Strategies::RemoteUser
-			b.run  lambda { |_env| [200, {}, ['My body']] }
-		end.to_app
-	end
-
-	context 'Without REMOTE_USER and not logged in' do
-		before(:each){
-			get '/', {}, {}
-		}
-
-		it 'Do nothing' do
-			expect(last_response.status).to eq(200)
-			expect(last_request.cookies['_remote_user']).to eq(nil)
-			expect(last_request.cookies['_gitlab_session']).to eq(nil)
-		end
-	end
-
-	context 'Without REMOTE_USER and logged in' do
-		before(:each){
-			clear_cookies        
-			set_cookie "_gitlab_session=test"
-			set_cookie "_remote_user=test"
-			get '/', {}, {}
-		}
-		
-		it 'Logout curreent user' do
-			cookie_session_str = "_gitlab_session=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000" <<
-				"\n_remote_user=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000"
-			expect(last_request.cookies['_gitlab_session']).to eq('test')
-			expect(last_request.cookies['_remote_user']).to eq('test')
-			expect(last_response.status).to eq(302)
-			expect(last_response['Set-Cookie']).to eq(cookie_session_str)
-		end
-	end
-
-	context 'With REMOTE_USER and not logged in' do
-		before(:each){
-			get '/', {}, { 'HTTP_REMOTE_USER' => 'foobar' }
-		}
-
-		it 'logs REMOTE_USER in' do
-			expect(last_response.status).to eq(302)			
-			expect(last_response['Set-Cookie']).to eq('_remote_user=foobar')
-		end
-	end
-
-	context 'With REMOTE_USER, logged in and current user equals REMOTE_USER' do
-		before(:each){
-			clear_cookies        
-			set_cookie "_gitlab_session=foobar"
-			set_cookie "_remote_user=foobar"
-			get '/', {}, { 'HTTP_REMOTE_USER' => 'foobar' }
-		}
-
-		it 'Do nothing' do
-			cookie_session_str = "_gitlab_session=foobar\n_remote_user=foobar"
-			expect(last_request.cookies['_gitlab_session']).to eq('foobar')
-			expect(last_request.cookies['_remote_user']).to eq('foobar')
-			expect(last_response.status).to eq(200)			
-			expect(last_response['Set-Cookie']).to eq(nil)	
-		end
-	end
-
-	context 'With REMOTE_USER, logged in and current user not equals REMOTE_USER' do
-		before(:each){
-			clear_cookies        
-			set_cookie "_gitlab_session=foobar"
-			set_cookie "_remote_user=foobar"
-			get '/', {}, { 'HTTP_REMOTE_USER' => 'foobar2' }
-		}
-
-		it 'Logout current user and login REMOTE_USER' do
-			expect(last_request.cookies['_gitlab_session']).to eq('foobar')
-			expect(last_request.cookies['_remote_user']).to eq('foobar')
-			expect(last_response.status).to eq(302)			
-			expect(last_response['Set-Cookie']).to eq('_remote_user=foobar2')	
-		end
-	end
-
-	context 'Verify omniauth hash with REMOTE_USER_DATA' do
-		before(:each){
-			clear_cookies
-			post '/auth/remoteuser/callback', {}, { 'HTTP_REMOTE_USER' => 'foobar', 
-									'HTTP_REMOTE_USER_DATA' => JSON.dump({'name' => 'foobar', 'email' => 'foobar@test.com'})}
-		}
-
-		it 'Verify uid' do
-			expect(last_request.env['omniauth.auth']['uid']).to eq('foobar')
-		end
-
-		it 'Verify info' do
-			expect(last_request.env['omniauth.auth']['info']['nickname']).to eq('foobar')
-			expect(last_request.env['omniauth.auth']['info']['email']).to eq('foobar@test.com')
-		end
-	end
-
-	context 'Verify omniauth.auth info without REMOTE_USER_DATA' do
-		before(:each){
-			clear_cookies
-			post '/auth/remoteuser/callback', {}, { 'HTTP_REMOTE_USER' => 'foobar' } 
-		}
-
-		it 'Verify uid' do
-			expect(last_request.env['omniauth.auth']['uid']).to eq('foobar')
-		end
-
-		it 'Verify info' do
-			expect(last_request.env['omniauth.auth']['info']).to eq({})
-		end
-	end
-end
+  let(:app) do
+    Rack::Builder.new do |b|
+      b.use Rack::Session::Cookie, :secret => 'abc123'
+      b.use OmniAuth::Strategies::RemoteUser
+      b.run  lambda { |_env| [200, {}, ['My body']] }
+    end.to_app
+  end
+
+  context 'Without HTTP_REMOTE_USER and not logged in' do
+    before(:each){
+      get '/', {}, {}
+    }
+
+    it 'Do nothing' do
+      expect(last_response.status).to eq(200)
+      expect(last_request.cookies['_remote_user']).to eq(nil)
+    end
+  end
+
+  context 'Without HTTP_REMOTE_USER and logged in' do
+    before(:each){
+      clear_cookies
+      set_cookie "_remote_user=test"
+      get '/', {}, {}
+    }
+
+    it 'Logout curreent user' do
+      expect(last_request.cookies['_remote_user']).to eq('test')
+      expect(last_response.status).to eq(302)
+      expect(last_response['Set-Cookie']).to include("_remote_user=")
+      expect(last_response['Set-Cookie']).to include("path=")
+    end
+  end
+
+  context 'With HTTP_REMOTE_USER and not logged in' do
+    before(:each){
+      get '/', {}, { 'HTTP_REMOTE_USER' => 'foobar' }
+    }
+
+    it 'logs HTTP_REMOTE_USER in' do
+      expect(last_response.status).to eq(302)
+      expect(last_response['Set-Cookie']).to include('_remote_user=foobar')
+      expect(last_response['Set-Cookie']).to include('path=')
+    end
+  end
+
+  context 'With HTTP_REMOTE_USER, logged in and current user equals HTTP_REMOTE_USER' do
+    before(:each){
+      clear_cookies
+      set_cookie "_remote_user=foobar"
+      get '/', {}, { 'HTTP_REMOTE_USER' => 'foobar' }
+    }
+
+    it 'Do nothing' do
+      expect(last_request.cookies['_remote_user']).to eq('foobar')
+      expect(last_response.status).to eq(200)
+      expect(last_response['Set-Cookie']).to eq(nil)
+    end
+  end
+
+  context 'With HTTP_REMOTE_USER, logged in and current user not equals HTTP_REMOTE_USER' do
+    before(:each){
+      clear_cookies
+      set_cookie "_remote_user=foobar"
+      get '/', {}, { 'HTTP_REMOTE_USER' => 'foobar2' }
+    }
+
+    it 'Logout current user and login HTTP_REMOTE_USER' do
+      expect(last_request.cookies['_remote_user']).to eq('foobar')
+      expect(last_response.status).to eq(302)
+    end
+  end
+
+  context 'Verify omniauth hash with HTTP_REMOTE_USER_DATA' do
+    before(:each){
+      clear_cookies
+      set_cookie "_remote_user=foobar"
+      post '/auth/RemoteUser/callback', {}, { 'HTTP_REMOTE_USER' => 'foobar',
+                                              'HTTP_REMOTE_USER_DATA' => JSON.dump({'name' => 'foobar barfoo', 'email' => 'foobar@test.com'})}
+    }
+
+    it 'Verify uid' do
+      expect(last_request.env['omniauth.auth']['uid']).to eq('foobar')
+    end
+
+    it 'Verify info' do
+      expect(last_request.env['omniauth.auth']['info']['nickname']).to eq('foobar')
+      expect(last_request.env['omniauth.auth']['info']['email']).to eq('foobar@test.com')
+      expect(last_request.env['omniauth.auth']['info']['lastname']).to eq('barfoo')
+      expect(last_request.env['omniauth.auth']['info']['firstname']).to eq('foobar')
+    end
+  end
+
+  context 'Verify omniauth.auth info without HTTP_REMOTE_USER_DATA' do
+    before(:each){
+      clear_cookies
+      set_cookie "_remote_user=foobar"
+      post '/auth/RemoteUser/callback', {}, { 'HTTP_REMOTE_USER' => 'foobar' }
+    }
+
+    it 'Verify uid' do
+      expect(last_request.env['omniauth.auth']['uid']).to eq('foobar')
+    end
+
+    it 'Verify info' do
+      expect(last_request.env['omniauth.auth']['info']).to eq({})
+    end
+  end
+
+  context 'With HTTP_REMOTE_USER and ' do
+    before(:each){
+      set_cookie "_remote_user=foobar"
+      get "auth/RemoteUser", {}, { 'HTTP_REMOTE_USER' => 'foobar' }
+    }
+
+    it 'redirect for callback' do
+      expect(last_response.status).to eq(302)
+      expect(last_response.location).to eq("/auth/RemoteUser/callback")
+    end
+  end
+end
@@ -18,7 +18,7 @@ require &#39;omniauth/test&#39;
 Bundler.setup :default, :development, :test
 require 'rack/test'
-require 'omniauth/remote_user'
+require 'omniauth/remote-user'
 RSpec.configure do |config|
 	config.include Rack::Test::Methods
+require 'sinatra'
+require 'omniauth'
+require 'json'
+
+module OmniAuth
+  module Strategies
+    class RemoteUser
  
 module OmniAuth
 	module Strategies
-		autoload :RemoteUser, 'omniauth/strategies/remote_user'
+		autoload :RemoteUser , 'omniauth/strategies/remote_user'
         user_data = request.env['HTTP_REMOTE_USER_DATA']
         if user_data
           data = JSON.parse(user_data)
-          data['nickname'] = data['name']
+          data['nickname'] = data['firstname'] = data['name'].split()[0]
-  gem.add_runtime_dependency 'simplecov'
-  gem.add_runtime_dependency 'bundler'
-  gem.add_runtime_dependency 'rake'
-  gem.add_runtime_dependency 'rspec'
-  gem.add_runtime_dependency 'rack-test'
-  gem.add_runtime_dependency 'activerecord'
-
+  gem.add_runtime_dependency 'omniauth', '~> 1.0'
   gem.name = 'omniauth-remote-user'
   gem.version = Omniauth::RemoteUser::VERSION
-  gem.description = %q{Authentication with Remote-User HTTP header for Omniauth.}
-  gem.summary = gem.description
-  gem.email = ['kanashiro.duarte@gmail.com', 'thiagitosouza@gmail.com', 'rodrigosiqueiramelo@gmail.com']
+  gem.description = 'Authentication with Remote-User HTTP header for Omniauth.'
+  gem.summary = 'Authentication with HTTP Remote User'
+  gem.email = ['kanashiro.duarte@gmail.com', 'thiagitosouza@gmail.com', 'rodrigosiqueiramelo@gmail.com','macartur.sc@gmail.com','Antonio Terceiro']
  
       def __logout(env)
         request = Rack::Request.new(env)
-        response = redirect_if_not_logging_in(request, request.path)
+        request.session.clear
+        response = redirect_if_not_logging_in(request, request.path )
         if response
-          response.delete_cookie(options.cookie)
-          response.delete_cookie(options.internal_cookie)
-          response
+          response.delete_cookie(options.internal_cookie , path: "#{request.script_name}" )
1	source "http://rubygems.org"	1	source "http://rubygems.org"
2		2
3	-group :development, :test do
4	- gem 'guard'
5	- gem 'guard-rspec'
6	- gem 'guard-bundler'
7	- gem 'rb-fsevent'
8	- gem 'simplecov'
9	- gem 'rspec'
10	- gem 'rake'
11	- gem 'coveralls'
12	- gem 'rack-test'	3	+gemspec
		4	+
		5	+group :development do
		6	+ gem 'guard'
		7	+ gem 'guard-bundler'
		8	+ gem 'guard-rspec'
		9	+ gem 'rake'
		10	+ gem 'bundler'
		11	+ gem 'sinatra'
13	end	12	end
14		13
15	-gemspec	14	+group :test do
		15	+ gem 'coveralls'
		16	+ gem 'rack-test'
		17	+ gem 'simplecov'
		18	+ gem 'rspec'
		19	+end
1	# Omniath Remote User	1	# Omniath Remote User
2		2
3	The Omniauth Remote User gem provides a way for application to utilize a authentication with remote user HTTP header.	3	The Omniauth Remote User gem provides a way for application to utilize a authentication with remote user HTTP header.
		4	+
		5	+# Instalation
		6	+
		7	+Include in your Gemfile
		8	+
		9	+```ruby
		10	+gem "omniauth-remote-user"
		11	+```
		12	+Then run `bundle install` from the command line:
		13	+
		14	+ bundle install
	@@ -7,5 +7,3 @@ RSpec::Core::RakeTask.new(:spec)		@@ -7,5 +7,3 @@ RSpec::Core::RakeTask.new(:spec)
7		7
8	task :default => :spec	8	task :default => :spec
9	task :test => :spec	9	task :test => :spec
10	-
11	-
@@ -0,0 +1,43 @@		@@ -0,0 +1,43 @@
	1	+require 'sinatra'
	2	+require 'omniauth'
	3	+require 'json'
	4	+
	5	+class MyApplication < Sinatra::Base
	6	+ use Rack::Session::Cookie, secret: '123'
	7	+
	1	Link here Antonio Terceiro @terceiro 2015-01-28 11:17:35 UTC please remove this from `config.ru` since it's duplicating (an old version of) the actual code in `lib/` Write Preview please remove this from `config.ru` since it's duplicating (an old version of) the actual code in `lib/` Choose File ... File name... Cancel
	8	+ STRATEGY = 'RemoteUser'
	9	+ #use OmniAuth::Strategies::RemoteUser
	10	+ #STRATEGY = 'developer'
	11	+ use OmniAuth::Strategies::Developer
	12	+
	13	+
	14	+ get '/login' do
	15	+ redirect '/gitlab/auth/%s' % STRATEGY
	16	+ end
	17	+
	18	+ get '/logout' do
	19	+ session[:current_user] = nil
	20	+ redirect '/'
	21	+ end
	22	+
	23	+ post '/auth/:provider/callback' do
	24	+ session[:current_user] = request.env['omniauth.auth']['uid']
	25	+ session[:current_user_email] = request.env['omniauth.auth']['info']['email']
	26	+ session[:current_user_nickname] = request.env['omniauth.auth']['info']['nickname']
	27	+
	28	+ redirect '/'
	29	+ end
	30	+
	31	+ get '/' do
	32	+ user = session[:current_user]
	33	+ if user
	34	+ info = "(%s → %s)" % [session[:current_user_email], session[:current_user_nickname]]
	35	+ user + info + ' <a href="/logout">logout</a>'
	36	+ else
	37	+ 'NOT AUTHENTICATED <a href="/login">login</a>'
	38	+ end
	39	+ end
	40	+end
	41	+
	42	+run MyApplication
	43	+
1	module Omniauth	1	module Omniauth
2	- module RemoteUser
3	- VERSION = '0.0.1'
4	- end	2	+ module RemoteUser
		3	+ VERSION = '0.0.1'
		4	+ end
5	end	5	end
1	require 'spec_helper'	1	require 'spec_helper'
2		2
3	describe 'Test Strategy Remote_User' do	3	describe 'Test Strategy Remote_User' do
4	- let(:app) do
5	- Rack::Builder.new do \|b\|
6	- b.use Rack::Session::Cookie, :secret => 'abc123'
7	- b.use OmniAuth::Strategies::RemoteUser
8	- b.run lambda { \|_env\| [200, {}, ['My body']] }
9	- end.to_app
10	- end
11	-
12	- context 'Without REMOTE_USER and not logged in' do
13	- before(:each){
14	- get '/', {}, {}
15	- }
16	-
17	- it 'Do nothing' do
18	- expect(last_response.status).to eq(200)
19	- expect(last_request.cookies['_remote_user']).to eq(nil)
20	- expect(last_request.cookies['_gitlab_session']).to eq(nil)
21	- end
22	- end
23	-
24	- context 'Without REMOTE_USER and logged in' do
25	- before(:each){
26	- clear_cookies
27	- set_cookie "_gitlab_session=test"
28	- set_cookie "_remote_user=test"
29	- get '/', {}, {}
30	- }
31	-
32	- it 'Logout curreent user' do
33	- cookie_session_str = "_gitlab_session=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000" <<
34	- "\n_remote_user=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000"
35	- expect(last_request.cookies['_gitlab_session']).to eq('test')
36	- expect(last_request.cookies['_remote_user']).to eq('test')
37	- expect(last_response.status).to eq(302)
38	- expect(last_response['Set-Cookie']).to eq(cookie_session_str)
39	- end
40	- end
41	-
42	- context 'With REMOTE_USER and not logged in' do
43	- before(:each){
44	- get '/', {}, { 'HTTP_REMOTE_USER' => 'foobar' }
45	- }
46	-
47	- it 'logs REMOTE_USER in' do
48	- expect(last_response.status).to eq(302)
49	- expect(last_response['Set-Cookie']).to eq('_remote_user=foobar')
50	- end
51	- end
52	-
53	- context 'With REMOTE_USER, logged in and current user equals REMOTE_USER' do
54	- before(:each){
55	- clear_cookies
56	- set_cookie "_gitlab_session=foobar"
57	- set_cookie "_remote_user=foobar"
58	- get '/', {}, { 'HTTP_REMOTE_USER' => 'foobar' }
59	- }
60	-
61	- it 'Do nothing' do
62	- cookie_session_str = "_gitlab_session=foobar\n_remote_user=foobar"
63	- expect(last_request.cookies['_gitlab_session']).to eq('foobar')
64	- expect(last_request.cookies['_remote_user']).to eq('foobar')
65	- expect(last_response.status).to eq(200)
66	- expect(last_response['Set-Cookie']).to eq(nil)
67	- end
68	- end
69	-
70	- context 'With REMOTE_USER, logged in and current user not equals REMOTE_USER' do
71	- before(:each){
72	- clear_cookies
73	- set_cookie "_gitlab_session=foobar"
74	- set_cookie "_remote_user=foobar"
75	- get '/', {}, { 'HTTP_REMOTE_USER' => 'foobar2' }
76	- }
77	-
78	- it 'Logout current user and login REMOTE_USER' do
79	- expect(last_request.cookies['_gitlab_session']).to eq('foobar')
80	- expect(last_request.cookies['_remote_user']).to eq('foobar')
81	- expect(last_response.status).to eq(302)
82	- expect(last_response['Set-Cookie']).to eq('_remote_user=foobar2')
83	- end
84	- end
85	-
86	- context 'Verify omniauth hash with REMOTE_USER_DATA' do
87	- before(:each){
88	- clear_cookies
89	- post '/auth/remoteuser/callback', {}, { 'HTTP_REMOTE_USER' => 'foobar',
90	- 'HTTP_REMOTE_USER_DATA' => JSON.dump({'name' => 'foobar', 'email' => 'foobar@test.com'})}
91	- }
92	-
93	- it 'Verify uid' do
94	- expect(last_request.env['omniauth.auth']['uid']).to eq('foobar')
95	- end
96	-
97	- it 'Verify info' do
98	- expect(last_request.env['omniauth.auth']['info']['nickname']).to eq('foobar')
99	- expect(last_request.env['omniauth.auth']['info']['email']).to eq('foobar@test.com')
100	- end
101	- end
102	-
103	- context 'Verify omniauth.auth info without REMOTE_USER_DATA' do
104	- before(:each){
105	- clear_cookies
106	- post '/auth/remoteuser/callback', {}, { 'HTTP_REMOTE_USER' => 'foobar' }
107	- }
108	-
109	- it 'Verify uid' do
110	- expect(last_request.env['omniauth.auth']['uid']).to eq('foobar')
111	- end
112	-
113	- it 'Verify info' do
114	- expect(last_request.env['omniauth.auth']['info']).to eq({})
115	- end
116	- end
117	-end	4	+ let(:app) do
		5	+ Rack::Builder.new do \|b\|
		6	+ b.use Rack::Session::Cookie, :secret => 'abc123'
		7	+ b.use OmniAuth::Strategies::RemoteUser
		8	+ b.run lambda { \|_env\| [200, {}, ['My body']] }
		9	+ end.to_app
		10	+ end
		11	+
		12	+ context 'Without HTTP_REMOTE_USER and not logged in' do
		13	+ before(:each){
		14	+ get '/', {}, {}
		15	+ }
		16	+
		17	+ it 'Do nothing' do
		18	+ expect(last_response.status).to eq(200)
		19	+ expect(last_request.cookies['_remote_user']).to eq(nil)
		20	+ end
		21	+ end
		22	+
		23	+ context 'Without HTTP_REMOTE_USER and logged in' do
		24	+ before(:each){
		25	+ clear_cookies
		26	+ set_cookie "_remote_user=test"
		27	+ get '/', {}, {}
		28	+ }
		29	+
		30	+ it 'Logout curreent user' do
		31	+ expect(last_request.cookies['_remote_user']).to eq('test')
		32	+ expect(last_response.status).to eq(302)
		33	+ expect(last_response['Set-Cookie']).to include("_remote_user=")
		34	+ expect(last_response['Set-Cookie']).to include("path=")
		35	+ end
		36	+ end
		37	+
		38	+ context 'With HTTP_REMOTE_USER and not logged in' do
		39	+ before(:each){
		40	+ get '/', {}, { 'HTTP_REMOTE_USER' => 'foobar' }
		41	+ }
		42	+
		43	+ it 'logs HTTP_REMOTE_USER in' do
		44	+ expect(last_response.status).to eq(302)
		45	+ expect(last_response['Set-Cookie']).to include('_remote_user=foobar')
		46	+ expect(last_response['Set-Cookie']).to include('path=')
		47	+ end
		48	+ end
		49	+
		50	+ context 'With HTTP_REMOTE_USER, logged in and current user equals HTTP_REMOTE_USER' do
		51	+ before(:each){
		52	+ clear_cookies
		53	+ set_cookie "_remote_user=foobar"
		54	+ get '/', {}, { 'HTTP_REMOTE_USER' => 'foobar' }
		55	+ }
		56	+
		57	+ it 'Do nothing' do
		58	+ expect(last_request.cookies['_remote_user']).to eq('foobar')
		59	+ expect(last_response.status).to eq(200)
		60	+ expect(last_response['Set-Cookie']).to eq(nil)
		61	+ end
		62	+ end
		63	+
		64	+ context 'With HTTP_REMOTE_USER, logged in and current user not equals HTTP_REMOTE_USER' do
		65	+ before(:each){
		66	+ clear_cookies
		67	+ set_cookie "_remote_user=foobar"
		68	+ get '/', {}, { 'HTTP_REMOTE_USER' => 'foobar2' }
		69	+ }
		70	+
		71	+ it 'Logout current user and login HTTP_REMOTE_USER' do
		72	+ expect(last_request.cookies['_remote_user']).to eq('foobar')
		73	+ expect(last_response.status).to eq(302)
		74	+ end
		75	+ end
		76	+
		77	+ context 'Verify omniauth hash with HTTP_REMOTE_USER_DATA' do
		78	+ before(:each){
		79	+ clear_cookies
		80	+ set_cookie "_remote_user=foobar"
		81	+ post '/auth/RemoteUser/callback', {}, { 'HTTP_REMOTE_USER' => 'foobar',
		82	+ 'HTTP_REMOTE_USER_DATA' => JSON.dump({'name' => 'foobar barfoo', 'email' => 'foobar@test.com'})}
		83	+ }
		84	+
		85	+ it 'Verify uid' do
		86	+ expect(last_request.env['omniauth.auth']['uid']).to eq('foobar')
		87	+ end
		88	+
		89	+ it 'Verify info' do
		90	+ expect(last_request.env['omniauth.auth']['info']['nickname']).to eq('foobar')
		91	+ expect(last_request.env['omniauth.auth']['info']['email']).to eq('foobar@test.com')
		92	+ expect(last_request.env['omniauth.auth']['info']['lastname']).to eq('barfoo')
		93	+ expect(last_request.env['omniauth.auth']['info']['firstname']).to eq('foobar')
		94	+ end
		95	+ end
		96	+
		97	+ context 'Verify omniauth.auth info without HTTP_REMOTE_USER_DATA' do
		98	+ before(:each){
		99	+ clear_cookies
		100	+ set_cookie "_remote_user=foobar"
		101	+ post '/auth/RemoteUser/callback', {}, { 'HTTP_REMOTE_USER' => 'foobar' }
		102	+ }
		103	+
		104	+ it 'Verify uid' do
		105	+ expect(last_request.env['omniauth.auth']['uid']).to eq('foobar')
		106	+ end
		107	+
		108	+ it 'Verify info' do
		109	+ expect(last_request.env['omniauth.auth']['info']).to eq({})
		110	+ end
		111	+ end
		112	+
		113	+ context 'With HTTP_REMOTE_USER and ' do
		114	+ before(:each){
		115	+ set_cookie "_remote_user=foobar"
		116	+ get "auth/RemoteUser", {}, { 'HTTP_REMOTE_USER' => 'foobar' }
		117	+ }
		118	+
		119	+ it 'redirect for callback' do
		120	+ expect(last_response.status).to eq(302)
		121	+ expect(last_response.location).to eq("/auth/RemoteUser/callback")
		122	+ end
		123	+ end
118		124
		125	+end
	@@ -18,7 +18,7 @@ require 'omniauth/test'		@@ -18,7 +18,7 @@ require 'omniauth/test'
18	Bundler.setup :default, :development, :test	18	Bundler.setup :default, :development, :test
19		19
20	require 'rack/test'	20	require 'rack/test'
21	-require 'omniauth/remote_user'	21	+require 'omniauth/remote-user'
22		22
23	RSpec.configure do \|config\|	23	RSpec.configure do \|config\|
24	config.include Rack::Test::Methods	24	config.include Rack::Test::Methods
3	3
4	4	module OmniAuth
5	5	module Strategies
6		- autoload :RemoteUser, 'omniauth/strategies/remote_user'
	6	+ autoload :RemoteUser , 'omniauth/strategies/remote_user'
2		Link here Antonio Terceiro @terceiro 2015-01-28 11:18:16 UTC bogus change. Also please make the indentation consistent with the other files (i.e. 2 spaces) Write Preview bogus change. Also please make the indentation consistent with the other files (i.e. 2 spaces) Choose File ... File name... Cancel Link here Macartur Sousa @macartur 2015-01-28 11:46:35 UTC Done. Write Preview Done. Choose File ... File name... Cancel
73	73	user_data = request.env['HTTP_REMOTE_USER_DATA']
74	74	if user_data
75	75	data = JSON.parse(user_data)
76		- data['nickname'] = data['name']
	76	+ data['nickname'] = data['firstname'] = data['name'].split()[0]
6		Link here Antonio Terceiro @terceiro 2015-01-28 11:19:00 UTC really? Write Preview really? Choose File ... File name... Cancel Link here Antonio Terceiro @terceiro 2015-01-28 11:19:13 UTC this does not look right Write Preview this does not look right Choose File ... File name... Cancel Link here Macartur Sousa @macartur 2015-01-28 11:45:13 UTC So, I do it because the colab send data['name'] with full name (instance "firstname lastname") and the gitlab was getting a error, because the name can't have spaces. Write Preview So, I do it because the colab send data['name'] with full name (instance "firstname lastname") and the gitlab was getting a error, because the name can't have spaces. Choose File ... File name... Cancel Link here Antonio Terceiro @terceiro 2015-01-28 12:47:35 UTC but isn't `data['nickname']` the actual username? This should be the value of the `REMOTE_USER` header. Write Preview but isn't `data['nickname']` the actual username? This should be the value of the `REMOTE_USER` header. Choose File ... File name... Cancel Link here Macartur Sousa @macartur 2015-01-28 12:55:49 UTC (Edited 2015-01-28 13:14:18 UTC ) ahh ok , I will change it to: data['nickname'] = uid data['firstname'] = data['name'].split()[0] data['last_name'] = data['name'].split()[1] this seems correct ? Write Preview ahh ok , I will change it to: data['nickname'] = uid data['firstname'] = data['name'].split()[0] data['last_name'] = data['name'].split()[1] this seems correct ? Choose File ... File name... Cancel Link here Antonio Terceiro @terceiro 2015-02-02 14:45:28 UTC yes Write Preview yes Choose File ... File name... Cancel
6		- gem.add_runtime_dependency 'simplecov'
7		- gem.add_runtime_dependency 'bundler'
8		- gem.add_runtime_dependency 'rake'
9		- gem.add_runtime_dependency 'rspec'
10		- gem.add_runtime_dependency 'rack-test'
11		- gem.add_runtime_dependency 'activerecord'
12		-
	4	+ gem.add_runtime_dependency 'omniauth', '~> 1.0'
13	5	gem.name = 'omniauth-remote-user'
14	6	gem.version = Omniauth::RemoteUser::VERSION
15		- gem.description = %q{Authentication with Remote-User HTTP header for Omniauth.}
16		- gem.summary = gem.description
17		- gem.email = ['kanashiro.duarte@gmail.com', 'thiagitosouza@gmail.com', 'rodrigosiqueiramelo@gmail.com']
	7	+ gem.description = 'Authentication with Remote-User HTTP header for Omniauth.'
	8	+ gem.summary = 'Authentication with HTTP Remote User'
	9	+ gem.email = ['kanashiro.duarte@gmail.com', 'thiagitosouza@gmail.com', 'rodrigosiqueiramelo@gmail.com','macartur.sc@gmail.com','Antonio Terceiro']
2		Link here Antonio Terceiro @terceiro 2015-01-28 11:20:29 UTC the last item is not an email address Write Preview the last item is not an email address Choose File ... File name... Cancel Link here Macartur Sousa @macartur 2015-01-28 11:48:38 UTC Done. Write Preview Done. Choose File ... File name... Cancel