vendor/metaid-1.0/metaid.rb @@ -108,7 +108,11 @@ class ApplicationController < ActionController::Base end def retrieve_current_user - @current_user || authenticate_with_http_basic { |u, p| User.find_by_token(u) } || (session[:user_id] && User.find_by_id(session[:user_id])) + RAILS_DEFAULT_LOGGER.warn "COOKIE: #{cookies[:login_token].inspect}" + @current_user || + authenticate_with_http_basic { |u, p| User.find_by_token(u) } || + (cookies[:login_token] && User.find_by_id_and_token(*cookies[:login_token].split(";"))) || + (session[:user_id] && User.find_by_id(session[:user_id])) end def retrieve_current_repository app/controllers/application.rb @@ -7,7 +7,7 @@ class HooksController < ApplicationController end def create - @hook = current_repository.hooks.create!(:name => params[:name], :options => params[:hook]) + @hook = current_repository.hooks.create(:name => params[:name], :options => params[:hook]) respond_to do |format| format.js end @@ -15,6 +15,7 @@ class HooksController < ApplicationController def update @hook.options = params[:hook] + @hook.save respond_to do |format| format.js end app/controllers/hooks_controller.rb @@ -36,6 +36,9 @@ class InstallController < ApplicationController @repository.save! @user.save! end + + cookies[:login_token] = {:value => "#{@user.id};#{@user.token}", :expires => 1.year.from_now.utc, :domain => ".#{Warehouse.domain}", :path => '/'} + rescue @message = $!.message logger.warn $!.message app/controllers/install_controller.rb @@ -1,4 +1,5 @@ class RepositoriesController < ApplicationController + skip_before_filter :check_for_repository before_filter :admin_required, :only => :create before_filter :repository_admin_required, :except => :create before_filter :find_or_initialize_repository app/controllers/repositories_controller.rb @@ -3,18 +3,18 @@ class SessionsController < ApplicationController def create if using_open_id? - cookies['use_svn'] = {:value => '0', :expires => 1.year.ago.utc, :domain => Warehouse.domain, :path => '/'} + cookies['use_svn'] = {:value => '0', :expires => 1.year.ago.utc, :domain => ".#{Warehouse.domain}", :path => '/'} authenticate_with_open_id do |result, identity_url| if result.successful? && self.current_user = User.find_or_create_by_identity_url(identity_url) - redirect_to root_path + successful_login else status_message :error, result.message || "Sorry, no user by that identity URL exists (#{identity_url})" end end else - cookies['use_svn'] = {:value => '1', :expires => 1.year.from_now.utc, :domain => Warehouse.domain, :path => '/'} + cookies['use_svn'] = {:value => '1', :expires => 1.year.from_now.utc, :domain => ".#{Warehouse.domain}", :path => '/'} if self.current_user = User.authenticate(params[:login], params[:password]) - redirect_to root_path + successful_login else status_message :error, "Invalid Password" end @@ -45,7 +45,7 @@ class SessionsController < ApplicationController self.current_user = User.find_by_token(params[:token]) unless params[:token].blank? return if request.get? && params[:open_id_complete].nil? if using_open_id? - cookies['use_svn'] = {:value => '0', :expires => 1.year.ago.utc, :domain => Warehouse.domain, :path => '/'} + cookies['use_svn'] = {:value => '0', :expires => 1.year.ago.utc, :domain => ".#{Warehouse.domain}", :path => '/'} authenticate_with_open_id do |result, identity_url| if result.successful? current_user.identity_url = identity_url @@ -54,11 +54,17 @@ class SessionsController < ApplicationController end end else - cookies['use_svn'] = {:value => '1', :expires => 1.year.from_now.utc, :domain => Warehouse.domain, :path => '/'} + cookies['use_svn'] = {:value => '1', :expires => 1.year.from_now.utc, :domain => ".#{Warehouse.domain}", :path => '/'} end unless performed? current_user.reset_token! redirect_to root_path end end + +protected + def successful_login + cookies[:login_token] = {:value => "#{current_user.id};#{current_user.token}", :expires => 1.year.from_now.utc, :domain => "#{Warehouse.domain}", :path => '/'} + redirect_to root_path + end end app/controllers/sessions_controller.rb @@ -8,7 +8,7 @@ class Hook < ActiveRecord::Base before_create :set_default_active_state def properties - @properties ||= Warehouse::Hooks[name].new(nil, self) + @properties ||= Warehouse::Hooks[name].new(self, nil) end def options app/models/hook.rb @@ -1,4 +1,4 @@ -if @hook.save +if @hook.errors.empty? page.call "location.reload" else page.alert "The hook options were invalid. Replace this with a less obtrusive prompt" app/views/hooks/update.js.rjs @@ -27,7 +27,7 @@ namespace :warehouse do require 'yaml' require 'config/initializers/svn' require 'lib/cache_key' - $LOAD_PATH << 'vendor/ruby-sequel/lib' + $LOAD_PATH << 'vendor/ruby-sequel/lib' << 'vendor/metaid-1.0' require 'lib/warehouse/command' ENV['DB_CONFIG'] ||= "config/database.yml" raise "No database config at #{ENV['DB_CONFIG'].inspect}" unless File.exist?(ENV['DB_CONFIG']) lib/tasks/importer.rake @@ -81,7 +81,7 @@ module Warehouse f.write tmpl.join("\n") end - self.class.session(Warehouse.session_options) if domain_is_blank && !attributes[:domain].blank? + ApplicationController.session(Warehouse.session_options) if domain_is_blank && !attributes[:domain].blank? end end lib/warehouse.rb @@ -1,3 +1,4 @@ +require 'metaid' module Warehouse class Command class << self lib/warehouse/command.rb @@ -11,7 +11,7 @@ module Warehouse end def self.properties - @properties ||= new + @properties ||= new(nil) end def active lib/warehouse/hooks/base.rb c2a2e01d9d1b5f3625c4da0a6fb6d70021362598 rick rick@8456e5f2-bb15-0410-bd20-b44782a1fb1e http://github.com/entp/warehouse/commit/40a8667bca372bcbb034cce17fe2dc32638bc4dd 40a8667bca372bcbb034cce17fe2dc32638bc4dd 2007-10-09T11:22:54-07:00 2007-10-09T11:22:54-07:00 tweak hooks and streamline installer process git-svn-id: http://activereload.svn.engineyard.com/warehouse/trunk@2203 8456e5f2-bb15-0410-bd20-b44782a1fb1e f188be1487254662512288ce7c741107fc0cf65e rick rick@8456e5f2-bb15-0410-bd20-b44782a1fb1e