small typeo
This commit is contained in:
parent
9c5c71f2d7
commit
20ae3232cd
1 changed files with 13 additions and 13 deletions
|
@ -10,18 +10,18 @@ class ApplicationController < ActionController::Base
|
||||||
redirect_to :controller => 'user', :action => 'login' unless @user
|
redirect_to :controller => 'user', :action => 'login' unless @user
|
||||||
end
|
end
|
||||||
|
|
||||||
def authorize(realm='Web Password', errormessage="Could't authenticate you")
|
def authorize(realm='Web Password', errormessage="Couldn't authenticate you")
|
||||||
username, passwd = get_auth_data # parse from headers
|
username, passwd = get_auth_data # parse from headers
|
||||||
# authenticate per-scheme
|
# authenticate per-scheme
|
||||||
if username.nil?
|
if username.nil?
|
||||||
@user = nil # no authentication provided - perhaps first connect (client should retry after 401)
|
@user = nil # no authentication provided - perhaps first connect (client should retry after 401)
|
||||||
elsif username == 'token'
|
elsif username == 'token'
|
||||||
@user = User.authenticate_token(passwd) # preferred - random token for user from db, passed in basic auth
|
@user = User.authenticate_token(passwd) # preferred - random token for user from db, passed in basic auth
|
||||||
else
|
else
|
||||||
@user = User.authenticate(username, passwd) # basic auth
|
@user = User.authenticate(username, passwd) # basic auth
|
||||||
end
|
end
|
||||||
|
|
||||||
# handle authenticate pass/fail
|
# handle authenticate pass/fail
|
||||||
if @user
|
if @user
|
||||||
# user exists and password is correct ... horray!
|
# user exists and password is correct ... horray!
|
||||||
if @user.methods.include? 'lastlogin' # note last login
|
if @user.methods.include? 'lastlogin' # note last login
|
||||||
|
@ -49,7 +49,7 @@ class ApplicationController < ActionController::Base
|
||||||
response.headers['Error'] = message
|
response.headers['Error'] = message
|
||||||
end
|
end
|
||||||
|
|
||||||
# extract authorisation credentials from headers, returns user = nil if none
|
# extract authorisation credentials from headers, returns user = nil if none
|
||||||
private
|
private
|
||||||
def get_auth_data
|
def get_auth_data
|
||||||
if request.env.has_key? 'X-HTTP_AUTHORIZATION' # where mod_rewrite might have put it
|
if request.env.has_key? 'X-HTTP_AUTHORIZATION' # where mod_rewrite might have put it
|
||||||
|
@ -60,7 +60,7 @@ class ApplicationController < ActionController::Base
|
||||||
# only basic authentication supported
|
# only basic authentication supported
|
||||||
if authdata and authdata[0] == 'Basic'
|
if authdata and authdata[0] == 'Basic'
|
||||||
user, pass = Base64.decode64(authdata[1]).split(':')[0..1]
|
user, pass = Base64.decode64(authdata[1]).split(':')[0..1]
|
||||||
end
|
end
|
||||||
return [user, pass]
|
return [user, pass]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue