use render proc to write out results, see if that makes things faster

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

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 537de40d7e3bdf68fa3816f217b9b9c997060db5..df94000be9e8307400587fc67d69ddb8915b52e1 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -1,4 +1,69 @@
 # Filters added to this controller will be run for all controllers in the application.
 # Likewise, all the methods added will be available for all controllers.
 class ApplicationController < ActionController::Base
 # Filters added to this controller will be run for all controllers in the application.
 # Likewise, all the methods added will be available for all controllers.
 class ApplicationController < ActionController::Base

-end
\ No newline at end of file
+
+  def authorize_web
+    @user = User.find_by_token(session[:token])
+  end
+
+  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") 
+    unless request.get?
+      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 
+          @session['lastlogin'] = user.lastlogin 
+          @user.last.login = Time.now 
+          @user.save() 
+          @session["User.id"] = @user.id 
+        end             
+      else 
+        # 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
+  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 
+    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 
+    # only basic authentication supported
+    if authdata and authdata[0] == 'Basic' 
+      user, pass = Base64.decode64(authdata[1]).split(':')[0..1] 
+    end 
+    return [user, pass] 
+  end 
+
+end