Log calls to the makeway method.

[rails.git] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 6520e027bc8b5a35b127fe9c15667d4964215235..792792f8375008db48c7c2987aa1fe870ee7b4fd 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -7,21 +7,21 @@ class ApplicationController < ActionController::Base
   end
 
   def require_user
-    redirect_to :controller => 'user', :action => 'login' unless @user
+    redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri unless @user
   end
 
-  def authorize(realm='Web Password', errormessage="Could't authenticate you") \r
-    username, passwd = get_auth_data # parse from headers\r
+  def authorize(realm='Web Password', errormessage="Couldn't authenticate you") 
+    username, passwd = get_auth_data # parse from headers
     # authenticate per-scheme
-    if username.nil?\r
-      @user = nil # no authentication provided - perhaps first connect (client should retry after 401)\r
-    elsif username == 'token' \r
-      @user = User.authenticate_token(passwd) # preferred - random token for user from db, passed in basic auth\r
-    else\r
-      @user = User.authenticate(username, passwd) # basic auth\r
-    end\r
-    \r
-    # handle authenticate pass/fail\r
+    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 
@@ -38,17 +38,18 @@ class ApplicationController < ActionController::Base
     end 
   end 
 
-  def get_xml_doc
-    doc = XML::Document.new
-    doc.encoding = 'UTF-8' 
-    root = XML::Node.new 'osm'
-    root['version'] = API_VERSION
-    root['generator'] = 'OpenStreetMap server'
-    doc.root = root
-    return doc
+  # 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 => :bad_request
+    # 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\r
+  # extract authorisation credentials from headers, returns user = nil if none
   private 
   def get_auth_data 
     if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it 
@@ -58,8 +59,8 @@ class ApplicationController < ActionController::Base
     end 
     # only basic authentication supported
     if authdata and authdata[0] == 'Basic' 
-      user, pass = Base64.decode64(authdata[1]).split(':')[0..1] 
-    end \r
+      user, pass = Base64.decode64(authdata[1]).split(':',2)
+    end 
     return [user, pass] 
   end