nicer fix I think for nil / [] issue

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

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index a4f65cd54b9d30bb095285b370b402ecabdeb818..acb2f916291ab02aced0486022b4688c2b109677 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -3,49 +3,72 @@
 class ApplicationController < ActionController::Base
 
   def authorize_web
 class ApplicationController < ActionController::Base
 
   def authorize_web

-    @user = User.find_by_token(session[:token])
+    if session[:user]
+      @user = User.find(session[:user])
+    elsif session[:token]
+      @user = User.authenticate(:token => session[:token])
+      session[:user] = @user.id
+    end
+  rescue Exception => ex
+    logger.info("Exception authorizing user: #{ex.to_s}")
+    @user = nil

   end
 
   end
 

-  def authorize(realm='Web Password', errormessage="Could't authenticate you") \r
-    username, passwd = get_auth_data # parse from headers\r
+  def require_user
+    redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri unless @user
+  end
+
+  def authorize(realm='Web Password', errormessage="Couldn't authenticate you") 
+    username, passwd = get_auth_data # parse from headers

     # authenticate per-scheme
     # 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 @user
-      # user exists and password is correct ... horray! 
-      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 
+    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 => username, :password => passwd) # basic auth
+    end
+
+    # handle authenticate pass/fail
+    unless @user

       # no auth, the user does not exist or the password was wrong
       response.headers["Status"] = "Unauthorized" 
       response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\"" 
       # 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
+      render :text => errormessage, :status => :unauthorized
+      return false

     end 
   end 
 
     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
+  def check_read_availability
+    if API_STATUS == :offline
+      response.headers['Error'] = "Database offline for maintenance"
+      render :nothing => true, :status => :service_unavailable
+      return false
+    end
+  end
+
+  def check_write_availability
+    if API_STATUS == :offline or API_STATUS == :readonly
+      response.headers['Error'] = "Database offline for maintenance"
+      render :nothing => true, :status => :service_unavailable
+      return false
+    end

   end
 
   end
 

-  # extract authorisation credentials from headers, returns user = nil if none\r
-  private 
+  # 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
+
+private 
+
+  # extract authorisation credentials from headers, returns user = nil if none

   def get_auth_data 
     if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it 
       authdata = request.env['X-HTTP_AUTHORIZATION'].to_s.split 
   def get_auth_data 
     if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it 
       authdata = request.env['X-HTTP_AUTHORIZATION'].to_s.split 


@@ -54,8 +77,8 @@ class ApplicationController < ActionController::Base
     end 
     # only basic authentication supported
     if authdata and authdata[0] == 'Basic' 
     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 
 
     return [user, pass] 
   end