X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/97978ceeb9047ec6894b822ca947a466c2462988..1733e8990a242d7d4b3834b7cec2118597d685bd:/app/controllers/application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 366646ae3..d15604c75 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -6,43 +6,61 @@ class ApplicationController < ActionController::Base
     @user = User.find_by_token(session[:token])
   end
 
-  def authorize(realm='Web Password', errormessage="Could't authenticate you") 
-    username, passwd = get_auth_data 
-    # check if authorized 
-    # try to get user 
-    if @user = User.authenticate(username, passwd) 
+  def require_user
+    redirect_to :controller => 'user', :action => 'login' unless @user
+  end
+
+  def authorize(realm='Web Password', errormessage="Could't authenticate you") 
+    username, passwd = get_auth_data # parse from headers
+    # authenticate per-scheme
+    if username.nil?
+      @user = nil # no authentication provided - perhaps first connect (client should retry after 401)
+    elsif username == 'token' 
+      @user = User.authenticate_token(passwd) # preferred - random token for user from db, passed in basic auth
+    else
+      @user = User.authenticate(username, passwd) # basic auth
+    end
+    
+    # handle authenticate pass/fail
+    if @user
       # user exists and password is correct ... horray! 
-      if @user.methods.include? 'lastlogin' 
-        # note last login 
+      if @user.methods.include? 'lastlogin'         # note last login 
         @session['lastlogin'] = user.lastlogin 
         @user.last.login = Time.now 
         @user.save() 
         @session["User.id"] = @user.id 
       end             
     else 
-      # the user does not exist or the password was wrong 
-      @response.headers["Status"] = "Unauthorized" 
-      @response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\"" 
-      render_text(errormessage, 401)
+      # no auth, the user does not exist or the password was wrong
+      response.headers["Status"] = "Unauthorized" 
+      response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\"" 
+      render_text(errormessage, 401) # :unauthorized
     end 
   end 
 
+  # Report and error to the user
+  # (If anyone ever fixes Rails so it can set a http status "reason phrase",
+  #  rather than only a status code and having the web engine make up a 
+  #  phrase from that, we can also put the error message into the status
+  #  message. For now, rails won't let us)
+  def report_error(message)
+    render :nothing => true, :status => 400
+    # Todo: some sort of escaping of problem characters in the message
+    response.headers['Error'] = message
+  end
+
+  # extract authorisation credentials from headers, returns user = nil if none
   private 
   def get_auth_data 
-    user, pass = '', '' 
-    # extract authorisation credentials 
-    if request.env.has_key? 'X-HTTP_AUTHORIZATION' 
-      # try to get it where mod_rewrite might have put it 
-      authdata = @request.env['X-HTTP_AUTHORIZATION'].to_s.split 
-    elsif request.env.has_key? 'HTTP_AUTHORIZATION' 
-      # this is the regular location 
-      authdata = @request.env['HTTP_AUTHORIZATION'].to_s.split  
+    if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it 
+      authdata = request.env['X-HTTP_AUTHORIZATION'].to_s.split 
+    elsif request.env.has_key? 'HTTP_AUTHORIZATION'         # regular location
+      authdata = request.env['HTTP_AUTHORIZATION'].to_s.split
     end 
-
-    # at the moment we only support basic authentication 
+    # only basic authentication supported
     if authdata and authdata[0] == 'Basic' 
       user, pass = Base64.decode64(authdata[1]).split(':')[0..1] 
-    end 
+    end 
     return [user, pass] 
   end