Download as
Browse Code »

Commit 2067e7171b14a0b3cc0dbe390c8b34b571f6ba7e

Authored by Thiago Ribeiro
1 parent 960a88ff
Exists in master and in 2 other branches cookie-httponly, fix_last_path

Remove log write_file and identation

Showing 1 changed file with 29 additions and 63 deletions   Show diff stats
lib/omniauth/strategies/remote_user.rb
  Diff comments   View file @2067e71
... ... @@ -4,78 +4,48 @@ module OmniAuth
4 4  
5 5 include OmniAuth::Strategy
6 6  
7   - #option :cookie, 'rack.session'
  7 + option :cookie, 'rack.session'
8 8 option :cookie, '_gitlab_session'
9 9 option :internal_cookie, '_remote_user'
10 10  
11   -
12   - def __write_file message
13   - file = File.open("/home/git/gitlab/log/remote_user.log",'a')
14   - file.write " \n #{message} \n"
15   - file.close
16   - end
17   -
18   -
19 11 def call(env)
20   - __write_file "Call \n"
21   -
22 12 remote_user = env['HTTP_REMOTE_USER']
23   -
24   - __write_file " ... Aqui esta o remote user #{remote_user}\n"
25   -
26   -
27 13 session_user = __current_user(env)
28   - __write_file " .....Aqui esta o session user == #{session_user}\n"
29   -
30   - if ! is_in_logout? (env)
31   - if remote_user
32   - if session_user
33   - if remote_user == session_user
34   - __write_file "Entrei no remote_user == session_user"
35   - super(env)
36   - else
37   - __write_file "Entrei no remote_uer != session user com session user "
38   - __logout(env)
39   - end
40   -
41   - else
42   - __write_file "Estou sem session+_user= #{session_user}"
43   - __login(env, remote_user)
44   - end
45   -
46   - else
47   -
48   - if session_user
49   - __write_file "Estou sem remote user e com session user = #{session_user}"
50   - __logout(env)
51   - else
52   - __write_file "Estou sem remote user e sem session user = #{session_user}"
53   - super(env)
54   - end
55   - end
56   - else
57   - super env
58   - end
59   -
60 14  
  15 + if ! is_in_logout? (env)
  16 + if remote_user
  17 + if session_user
  18 + if remote_user == session_user
  19 + super(env)
  20 + else
  21 + __logout(env)
  22 + end
  23 + else
  24 + __login(env, remote_user)
  25 + end
  26 + else
  27 + if session_user
  28 + __logout(env)
  29 + else
  30 + super(env)
  31 + end
  32 + end
  33 + else
  34 + super env
  35 + end
61 36 end
62 37  
63   -
64 38 def is_in_logout? (env)
65 39 request = Rack::Request.new(env)
66   - __write_file "REQUEST PATH = #{request.path}"
67   - request.path == '/users/sign_out'
  40 + request.path == '/users/sign_out'
68 41 end
69 42  
70 43 def __current_user(env)
71   - __write_file "__CURRENT_USER"
72 44 request = Rack::Request.new(env)
73   - __write_file "REQUEST PATH = #{request.path}"
74 45 request.cookies.has_key?(options.internal_cookie) && request.cookies[options.internal_cookie]
75 46 end
76 47  
77 48 def __logout(env)
78   - __write_file "__LOGOUT"
79 49 request = Rack::Request.new(env)
80 50 response = redirect_if_not_logging_in(request, request.path)
81 51 if response
... ... @@ -86,8 +56,7 @@ module OmniAuth
86 56 end
87 57 end
88 58  
89   - def __login(env, uid)
90   - __write_file "__LOGIN"
  59 + def __login(env, uid)
91 60 request = Rack::Request.new(env)
92 61 response = redirect_if_not_logging_in(request, '/users/auth/RemoteUser')
93 62 if response
... ... @@ -97,11 +66,11 @@ module OmniAuth
97 66 end
98 67  
99 68 def redirect_if_not_logging_in(request, url)
100   -
  69 +
101 70 if ! [
102   - '/users/auth/RemoteUser',
103   - '/users/auth/RemoteUser/callback'
104   - ].include?(request.path_info)
  71 + '/users/auth/RemoteUser',
  72 + '/users/auth/RemoteUser/callback'
  73 + ].include?(request.path_info)
105 74 response = Rack::Response.new
106 75 response.redirect url
107 76 response
... ... @@ -114,7 +83,6 @@ module OmniAuth
114 83  
115 84 info do
116 85 user_data = request.env['HTTP_REMOTE_USER_DATA']
117   - __write_file "#{user_data} \n"
118 86 if user_data
119 87 data = JSON.parse(user_data)
120 88 data['nickname'] = data['name']
... ... @@ -125,10 +93,8 @@ module OmniAuth
125 93 end
126 94  
127 95 def request_phase
128   - __write_file "request phase\n"
129   - redirect "/users/auth/RemoteUser/callback"
  96 + redirect "/users/auth/RemoteUser/callback"
130 97 end
131 98 end
132 99 end
133 100 end
134   -
... ...