app/controllers/sessions_controller.rb app/controllers/users_controller.rb app/helpers/sessions_helper.rb app/helpers/users_helper.rb app/models/user.rb app/models/user_mailer.rb app/models/user_observer.rb app/views/sessions/new.html.erb app/views/shared/error.html.erb app/views/user_mailer/activation.erb app/views/user_mailer/signup_notification.erb app/views/users/_user_bar.html.erb app/views/users/new.html.erb bugs/issue-7abfd3cad286512addaacd07352a8eb747f007ca.yaml bugs/issue-b1073ed0470c3b24b0531a6cc419fd5fdcd1691a.yaml config/config_action_controller_session.rb.sample config/initializers/app_config.rb config/initializers/site_keys.rb.sample db/migrate/20080824074813_create_users.rb db/migrate/20080824095350_add_open_id_authentication_tables.rb db/migrate/20080824101406_add_identity_url_to_users.rb db/migrate/20080824110158_add_admin_to_users.rb lib/authenticated_system.rb lib/authenticated_test_helper.rb spec/controllers/access_control_spec.rb spec/controllers/authenticated_system_spec.rb spec/controllers/sessions_controller_spec.rb spec/controllers/users_controller_spec.rb spec/fixtures/users.yml spec/helpers/users_helper_spec.rb spec/models/user_spec.rb stories/rest_auth_stories.rb stories/rest_auth_stories_helper.rb stories/steps/ra_navigation_steps.rb stories/steps/ra_resource_steps.rb stories/steps/ra_response_steps.rb stories/steps/user_steps.rb stories/users/accounts.story stories/users/sessions.story vendor/plugins/open_id_authentication/CHANGELOG vendor/plugins/open_id_authentication/README vendor/plugins/open_id_authentication/Rakefile vendor/plugins/open_id_authentication/generators/open_id_authentication_tables/open_id_authentication_tables_generator.rb vendor/plugins/open_id_authentication/generators/open_id_authentication_tables/templates/migration.rb vendor/plugins/open_id_authentication/generators/upgrade_open_id_authentication_tables/templates/migration.rb vendor/plugins/open_id_authentication/generators/upgrade_open_id_authentication_tables/upgrade_open_id_authentication_tables_generator.rb vendor/plugins/open_id_authentication/init.rb vendor/plugins/open_id_authentication/lib/open_id_authentication.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/association.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/db_store.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/mem_cache_store.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/request.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/timeout_fixes.rb vendor/plugins/open_id_authentication/tasks/open_id_authentication_tasks.rake vendor/plugins/open_id_authentication/test/mem_cache_store_test.rb vendor/plugins/open_id_authentication/test/normalize_test.rb vendor/plugins/open_id_authentication/test/open_id_authentication_test.rb vendor/plugins/open_id_authentication/test/status_test.rb vendor/plugins/open_id_authentication/test/test_helper.rb vendor/plugins/restful_authentication/.gitignore vendor/plugins/restful_authentication/CHANGELOG vendor/plugins/restful_authentication/README.textile vendor/plugins/restful_authentication/Rakefile vendor/plugins/restful_authentication/TODO vendor/plugins/restful_authentication/generators/authenticated/USAGE vendor/plugins/restful_authentication/generators/authenticated/authenticated_generator.rb vendor/plugins/restful_authentication/generators/authenticated/lib/insert_routes.rb vendor/plugins/restful_authentication/generators/authenticated/templates/_model_partial.html.erb vendor/plugins/restful_authentication/generators/authenticated/templates/activation.erb vendor/plugins/restful_authentication/generators/authenticated/templates/authenticated_system.rb vendor/plugins/restful_authentication/generators/authenticated/templates/authenticated_test_helper.rb vendor/plugins/restful_authentication/generators/authenticated/templates/controller.rb vendor/plugins/restful_authentication/generators/authenticated/templates/helper.rb vendor/plugins/restful_authentication/generators/authenticated/templates/login.html.erb vendor/plugins/restful_authentication/generators/authenticated/templates/mailer.rb vendor/plugins/restful_authentication/generators/authenticated/templates/migration.rb vendor/plugins/restful_authentication/generators/authenticated/templates/model.rb vendor/plugins/restful_authentication/generators/authenticated/templates/model_controller.rb vendor/plugins/restful_authentication/generators/authenticated/templates/model_helper.rb vendor/plugins/restful_authentication/generators/authenticated/templates/model_helper_spec.rb vendor/plugins/restful_authentication/generators/authenticated/templates/observer.rb vendor/plugins/restful_authentication/generators/authenticated/templates/signup.html.erb vendor/plugins/restful_authentication/generators/authenticated/templates/signup_notification.erb vendor/plugins/restful_authentication/generators/authenticated/templates/site_keys.rb vendor/plugins/restful_authentication/generators/authenticated/templates/spec/controllers/access_control_spec.rb vendor/plugins/restful_authentication/generators/authenticated/templates/spec/controllers/authenticated_system_spec.rb vendor/plugins/restful_authentication/generators/authenticated/templates/spec/controllers/sessions_controller_spec.rb vendor/plugins/restful_authentication/generators/authenticated/templates/spec/controllers/users_controller_spec.rb vendor/plugins/restful_authentication/generators/authenticated/templates/spec/fixtures/users.yml vendor/plugins/restful_authentication/generators/authenticated/templates/spec/helpers/users_helper_spec.rb vendor/plugins/restful_authentication/generators/authenticated/templates/spec/models/user_spec.rb vendor/plugins/restful_authentication/generators/authenticated/templates/stories/rest_auth_stories.rb vendor/plugins/restful_authentication/generators/authenticated/templates/stories/rest_auth_stories_helper.rb vendor/plugins/restful_authentication/generators/authenticated/templates/stories/steps/ra_navigation_steps.rb vendor/plugins/restful_authentication/generators/authenticated/templates/stories/steps/ra_resource_steps.rb vendor/plugins/restful_authentication/generators/authenticated/templates/stories/steps/ra_response_steps.rb vendor/plugins/restful_authentication/generators/authenticated/templates/stories/steps/user_steps.rb vendor/plugins/restful_authentication/generators/authenticated/templates/stories/users/accounts.story vendor/plugins/restful_authentication/generators/authenticated/templates/stories/users/sessions.story vendor/plugins/restful_authentication/generators/authenticated/templates/test/functional_test.rb vendor/plugins/restful_authentication/generators/authenticated/templates/test/mailer_test.rb vendor/plugins/restful_authentication/generators/authenticated/templates/test/model_functional_test.rb vendor/plugins/restful_authentication/generators/authenticated/templates/test/unit_test.rb vendor/plugins/restful_authentication/init.rb vendor/plugins/restful_authentication/install.rb vendor/plugins/restful_authentication/lib/authentication.rb vendor/plugins/restful_authentication/lib/authentication/by_cookie_token.rb vendor/plugins/restful_authentication/lib/authentication/by_password.rb vendor/plugins/restful_authentication/lib/authorization.rb vendor/plugins/restful_authentication/lib/authorization/aasm_roles.rb vendor/plugins/restful_authentication/lib/authorization/stateful_roles.rb vendor/plugins/restful_authentication/lib/trustification.rb vendor/plugins/restful_authentication/lib/trustification/email_validation.rb vendor/plugins/restful_authentication/notes/AccessControl.txt vendor/plugins/restful_authentication/notes/Authentication.txt vendor/plugins/restful_authentication/notes/Authorization.txt vendor/plugins/restful_authentication/notes/RailsPlugins.txt vendor/plugins/restful_authentication/notes/SecurityFramework.graffle vendor/plugins/restful_authentication/notes/SecurityFramework.png vendor/plugins/restful_authentication/notes/SecurityPatterns.txt vendor/plugins/restful_authentication/notes/Tradeoffs.txt vendor/plugins/restful_authentication/notes/Trustification.txt vendor/plugins/restful_authentication/tasks/auth.rake vendor/plugins/restful_authentication/tasks/scaffold_rest_auth_example.rake @@ -1,5 +1,7 @@ .ditz-config config/database.yml +config/config_action_controller_session.rb +config/initializers/site_keys.rb db/*.sqlite3 db/schema.rb log/*.log .gitignore @@ -1,11 +1,14 @@ class AdminController < ApplicationController - before_filter :authentication + before_filter :login_required + before_filter :admin_required + layout "admin" private - def authentication - authenticate_or_request_with_http_basic do |user, pass| - user == 'regional2008' && pass == 'rubykaigi' + def admin_required + unless current_user && current_user.admin? + @message = '403 Forbidden' + render :template => "shared/error.html.erb", :status => 403 end end app/controllers/admin_controller.rb @@ -2,6 +2,9 @@ # Likewise, all the methods added will be available for all controllers. class ApplicationController < ActionController::Base + # Be sure to include AuthenticationSystem in Application Controller instead + include AuthenticatedSystem + helper :all # include all helpers, all the time # See ActionController::RequestForgeryProtection for details app/controllers/application.rb @@ -6,6 +6,7 @@ class Registration < ActionMailer::Base subject "[#{event.title}]登録完了のおしらせ" recipients attendee.email from event.contact_email + # FIXME integrate into site_config.rb bcc (::MAIL_CONF[:bcc] || event.contact_email) sent_on Time.now body :event => event, :attendee => attendee app/models/registration.rb @@ -1,4 +1,4 @@ ---- !ditz.rubyforge.org,2008-03-06/issue +--- !ditz.rubyforge.org,2008-03-06/issue title: "\xE7\xAE\xA1\xE7\x90\x86\xE8\x80\x85\xE3\x81\xA8\xE3\x81\x97\xE3\x81\xA6\xE3\x80\x81OpenID\xE3\x82\x92\xE4\xBD\xBF\xE3\x81\xA3\xE3\x81\xA6\xE3\x83\xAD\xE3\x82\xB0\xE3\x82\xA4\xE3\x83\xB3\xE3\x81\xA7\xE3\x81\x8D\xE3\x82\x8B." desc: "* \xE7\xAE\xA1\xE7\x90\x86\xE8\x80\x85\xE3\x81\xAE\xE3\x82\xB5\xE3\x82\xA4\xE3\x83\xB3\xE3\x82\xA2\xE3\x83\x83\xE3\x83\x97\xE6\xA9\x9F\xE8\x83\xBD\xE3\x81\xAF\xE7\x84\xA1\xE3\x81\x8F\xE3\x81\xA6\xE3\x82\x82\xE3\x82\x88\xE3\x81\x84\xE3\x80\x82admin/users/new \xE3\x81\xA8\xE3\x81\x8B\xE3\x81\xA7\xE4\xBA\xBA\xE5\x8A\x9B\xE4\xBD\x9C\xE6\x88\x90\xE3\x81\xA7\xE3\x82\x88\xE3\x81\x84\xE3\x80\x82\n\ * AdminController\xE3\x81\xABBASIC\xE8\xAA\x8D\xE8\xA8\xBC\xE3\x81\xAEuser/pass\xE3\x81\x8C\xE7\x94\x9F\xE6\x9B\xB8\xE3\x81\x8D\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xA6\xE3\x81\x84\xE3\x82\x8B\xE3\x81\xAE\xE3\x81\xA7\xE3\x80\x81\xE3\x81\x9D\xE3\x82\x8C\xE3\x82\x92\xE6\xB6\x88\xE3\x81\x99\xE3\x81\x93\xE3\x81\xA8\xE3\x80\x82\n\ @@ -7,14 +7,18 @@ type: :feature component: regional release: sapporo01 reporter: KAKUTANI Shintaro <shintaro@kakutani.com> -status: :unstarted -disposition: +status: :closed +disposition: :fixed creation_time: 2008-08-14 02:32:12.203519 Z references: [] id: 3289a240dce3ed7d1107f781833c1eab5978a9ce -log_events: +log_events: - - 2008-08-14 02:32:14.721942 Z - KAKUTANI Shintaro <shintaro@kakutani.com> - created - "" +- - 2008-08-24 15:12:26.187823 Z + - KAKUTANI Shintaro <shintaro@kakutani.com> + - closed with disposition fixed + - "" bugs/issue-3289a240dce3ed7d1107f781833c1eab5978a9ce.yaml @@ -1,16 +1,25 @@ ---- !ditz.rubyforge.org,2008-03-06/project +--- !ditz.rubyforge.org,2008-03-06/project name: regional.rubykaigi.org version: "0.4" -components: -- !ditz.rubyforge.org,2008-03-06/component +components: +- !ditz.rubyforge.org,2008-03-06/component name: regional -releases: -- !ditz.rubyforge.org,2008-03-06/release +releases: +- !ditz.rubyforge.org,2008-03-06/release name: sapporo01 status: :unreleased - release_time: - log_events: + release_time: + log_events: - - 2008-08-14 01:11:15.502109 Z - KAKUTANI Shintaro <shintaro@kakutani.com> - created - "\xE6\x9C\xAD\xE5\xB9\x8CRuby\xE4\xBC\x9A\xE8\xAD\xB001." +- !ditz.rubyforge.org,2008-03-06/release + name: release_to_github + status: :unreleased + release_time: + log_events: + - - 2008-08-24 15:19:16.135492 Z + - KAKUTANI Shintaro <shintaro@kakutani.com> + - created + - "github\xE3\x81\xA7\xE3\x82\xBD\xE3\x83\xBC\xE3\x82\xB9\xE3\x82\xB3\xE3\x83\xBC\xE3\x83\x89\xE3\x82\x92\xE5\x85\xB1\xE6\x9C\x89\xE3\x81\x97\xE3\x81\x9F\xE3\x81\x84" bugs/project.yaml @@ -1,5 +1,5 @@ set :application, "regional" -set :repository, "ssh://#{STDIN.gets.chomp}@repos.kakutani.com/var/cache/git/regional_rubykaigi" +set :repository, "git://github.com/kakutani/regional_rubykaigi.git" set :branch, "master" # If you aren't deploying to /u/apps/#{application} on the target @@ -17,19 +17,28 @@ set :use_sudo, false set :runner, "regional" ssh_options[:username] = application -set :production_server, "alpha.kakutani.com" +set :production_server, "regional.rubykaigi.org" role :app, production_server role :web, production_server role :db, production_server, :primary => true set :rake, "/home/#{application}/bin/rake" +def setup_shared(dir, path) + src = "#{shared_path}/#{dir}/#{path}" + dest = "#{latest_release}/#{dir}/#{path}" + run "! test -e #{dest} && ln -s #{src} #{dest}" +end + +def setup_shared_config(path) + setup_shared("config", path) +end + namespace :deploy do task :after_update_code do - db_path = "db/production.sqlite3" - shared_db_path = "#{shared_path}/#{db_path}" - dest_db_path = "#{release_path}/#{db_path}" - run "! test -e #{dest_db_path} && ln -s #{shared_db_path} #{dest_db_path}" + setup_shared("db", "production.sqlite3") + setup_shared_config("config_action_controller_session.rb") + setup_shared_config("initializers/sitekeys.rb") end desc "resart for our application" config/deploy.rb @@ -10,6 +10,13 @@ RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') +# Application specific configurations +app_configs = [ + APP_CONFIG = Struct.new(:url, :admin_email).new, +] + + + Rails::Initializer.run do |config| # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers @@ -47,10 +54,22 @@ Rails::Initializer.run do |config| # If you change this key, all old sessions will become invalid! # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. - config.action_controller.session = { - :session_key => '_regional_session', - :secret => '5c5cf01b75fad0da0729dc4deeb0862f' - } + begin + extract_session_config_filename = "config_action_controller_session.rb" + instance_eval(File.read(File.expand_path(extract_session_config_filename, File.dirname(__FILE__)).untaint)) + rescue MissingSourceFile + $stderr.write(<<-EOS) +ERROR!!! -- You should create #{extract_session_config_filename}, and describe config.action_controller.session like below: +------------------------------------------------------------------------------ +config.action_controller.session = { + :session_key => '_regional_session', + :secret => 'some secrete string' +} +------------------------------------------------------------------------------ +(config_action_controller_session.rb.sample is on RAILS_ROOT/confog dir.) + EOS + exit 2 + end # Use the database for sessions instead of the cookie-based default, # which shouldn't be used to store highly confidential information @@ -64,4 +83,7 @@ Rails::Initializer.run do |config| # Activate observers that should always be running # config.active_record.observers = :cacher, :garbage_collector + config.active_record.observers = :user_observer end + +app_configs.each(&:freeze) if RAILS_ENV == "production" config/environment.rb @@ -17,4 +17,5 @@ config.action_controller.perform_caching = false config.action_mailer.raise_delivery_errors = false config.action_mailer.delivery_method = :sendmail +# FIXME integrate into site_config.rb ::MAIL_CONF = {:bcc => "shintaro.kakutani@gmail.com"} config/environments/development.rb @@ -1 +1,2 @@ -::MAIL_CONF = { } +# FIXME integrate into site_config.rb +::MAIL_CONF = { } unless Object.const_defined?("MAIL_CONF") config/initializers/mail_conf.rb @@ -1,4 +1,15 @@ ActionController::Routing::Routes.draw do |map| +# FIXME temporary disabled --> +# map.logout '/logout', :controller => 'sessions', :action => 'destroy' +# map.login '/login', :controller => 'sessions', :action => 'new' +# map.register '/register', :controller => 'users', :action => 'create' +# map.signup '/signup', :controller => 'users', :action => 'new' +# map.activate '/activate/:activation_code', :controller => 'users', :action => 'activate', :activation_code => nil +# map.resources :users +# +# map.resource :session +# <-- FIXME temporary disabled + map.namespace(:admin) do |admin| admin.resources :events do |event| event.resources :attendees config/routes.rb locale/ja/LC_MESSAGES/regional.mo @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: regional 0.1.0\n" -"POT-Creation-Date: 2008-08-12 20:29+0900\n" -"PO-Revision-Date: 2008-08-12 15:50+0900\n" +"POT-Creation-Date: 2008-08-24 18:18+0900\n" +"PO-Revision-Date: 2008-08-24 18:25+0900\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -99,3 +99,27 @@ msgstr "" #: app/models/event.rb:- msgid "Event|Notify email enabled" msgstr "" + +#: app/models/user_mailer.rb:4 +msgid "Please activate your new account" +msgstr "新しく作成されたアカウントを有効にしてください" + +#: app/models/user_mailer.rb:12 +msgid "Your account has been activated!" +msgstr "アカウントが有効になりました。" + +#: app/views/user_mailer/signup_notification.erb:1 +msgid "Your account has been created." +msgstr "アカウントが作成されました。" + +#: app/views/user_mailer/signup_notification.erb:3 +msgid "Username" +msgstr "ユーザ名" + +#: app/views/user_mailer/signup_notification.erb:4 +msgid "Password" +msgstr "パスワード" + +#: app/views/user_mailer/signup_notification.erb:6 +msgid "Visit this url to activate your account" +msgstr "下記のURLにアクセスするとアカウントが有効になります" po/ja/regional.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: regional 0.1.0\n" -"POT-Creation-Date: 2008-08-12 20:29+0900\n" -"PO-Revision-Date: 2008-08-12 15:23+0900\n" +"POT-Creation-Date: 2008-08-24 18:18+0900\n" +"PO-Revision-Date: 2008-08-24 18:14+0900\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -99,3 +99,27 @@ msgstr "" #: app/models/event.rb:- msgid "Event|Notify email enabled" msgstr "" + +#: app/models/user_mailer.rb:4 +msgid "Please activate your new account" +msgstr "" + +#: app/models/user_mailer.rb:12 +msgid "Your account has been activated!" +msgstr "" + +#: app/views/user_mailer/signup_notification.erb:1 +msgid "Your account has been created." +msgstr "" + +#: app/views/user_mailer/signup_notification.erb:3 +msgid "Username" +msgstr "" + +#: app/views/user_mailer/signup_notification.erb:4 +msgid "Password" +msgstr "" + +#: app/views/user_mailer/signup_notification.erb:6 +msgid "Visit this url to activate your account" +msgstr "" po/regional.pot 9c78de81b0dce08ec9609723ff92f6ecf9ffcc53 KAKUTANI Shintaro shintaro@kakutani.com http://github.com/kakutani/regional_rubykaigi/commit/8132a8adf16984a7a4b9bf44982cb4e8af305264 8132a8adf16984a7a4b9bf44982cb4e8af305264 2008-08-24T19:05:54-07:00 2008-08-24T19:05:54-07:00 prepare to put the source code on github.com 1105db2af64c0ff10d0a429617ef81baaf5e6152 KAKUTANI Shintaro shintaro@kakutani.com