cafe-grader-web Commit - r158:13c9210ae5ca

cafe-grader-web

Commit `r158:13c9210ae5ca` public

parent | child

Description:

Merged online-registration branch changes r297:303 into the trunk git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@303 6386c4cd-e34a-4fa8-8920-d93eb39b512e

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r158:13c9210ae5ca - Wed, 10 Dec 2008 02:48:32 - 16 files changed: 306 inserted, 17 deleted

app/views/users/confirm.html.haml created 644 ¶ +15

@@ -0,0 +1,15
	1	+ - if @result == :successful
	2	+ %h1 User activated
	3	+ Your account has been activated.
	4	+ %br/
	5	+ Please go ahead to
	6	+ = link_to 'login.', :controller => 'main', :action => 'login'
	7	+ - else
	8	+ %h1 Activation failed
	9	+ - if @result == :email_used
	10	+ A user with this E-mail exists.
	11	+ - else
	12	+ Your activation code is invalid. Please check again.
	13	+ %br/
	14	+ Get back to
	15	+ = link_to 'home.', :controller => 'main', :action => 'login'

app/views/users/email_error.html.haml created 644 ¶ +9

@@ -0,0 +1,9
	1	+ %h1 Errors in sending registration confirmation
	2	+
	3	+ .errorExplanation
	4	+ %h2
	5	+ Your user account has been created, but the system cannot send you the
	6	+ confirmation e-mail.
	7	+
	8	+ Maybe there's a problem in the configuration. Please report the
	9	+ admin. Thank you!

db/migrate/20081205172258_add_emailing_info_on_config_option.rb created 644 ¶ +18

@@ -0,0 +1,18
	1	+ class AddEmailingInfoOnConfigOption < ActiveRecord::Migration
	2	+ def self.up
	3	+ # If Configuration['system.online_registration'] is true, the
	4	+ # system allows online registration, and will use these
	5	+ # information for sending confirmation emails.
	6	+ Configuration.create(:key => 'system.online_registration.smtp',
	7	+ :value_type => 'string',
	8	+ :value => 'smtp.somehost.com')
	9	+ Configuration.create(:key => 'system.online_registration.from',
	10	+ :value_type => 'string',
	11	+ :value => 'your.email@address')
	12	+ end
	13	+
	14	+ def self.down
	15	+ Configuration.find_by_key("system.online_registration.smtp").destroy
	16	+ Configuration.find_by_key("system.online_registration.from").destroy
	17	+ end
	18	+ end

db/migrate/20081210021333_add_timestamps_to_users.rb created 644 ¶ +9

@@ -0,0 +1,9
	1	+ class AddTimestampsToUsers < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_timestamps :users
	4	+ end
	5	+
	6	+ def self.down
	7	+ remove_timestamps :users
	8	+ end
	9	+ end

spec/controllers/users_controller_spec.rb created 644 ¶ +95

@@ -0,0 +1,95
	1	+
	2	+ require File.dirname(__FILE__) + '/../spec_helper'
	3	+
	4	+ describe UsersController, "when a new user registers" do
	5	+
	6	+ before(:each) do
	7	+ # create john
	8	+
	9	+ @john_info = {:login => 'john',
	10	+ :full_name => 'John John',
	11	+ :email => 'john@space.com'}
	12	+ @john = User.new(@john_info)
	13	+
	14	+ @john_activation_key = "123456"
	15	+
	16	+ @john.should_receive(:activation_key).
	17	+ any_number_of_times.
	18	+ and_return(@john_activation_key)
	19	+
	20	+ get :new
	21	+ response.should render_template('users/new')
	22	+ end
	23	+
	24	+ it "should show the new form again when user information is invalid" do
	25	+ User.should_receive(:new).with(any_args()).and_return(@john)
	26	+ @john.should_receive(:activated=).with(false)
	27	+ @john.should_receive(:valid?).and_return(false)
	28	+ @john.should_not_receive(:save)
	29	+
	30	+ post :register, :login => @john_info[:login],
	31	+ :full_name => @john_info[:full_name],
	32	+ :email => @john_info[:email]
	33	+
	34	+ response.should render_template('users/new')
	35	+ end
	36	+
	37	+ it "should create unactivated user and send e-mail with activation key" do
	38	+ User.should_receive(:new).with(any_args()).and_return(@john)
	39	+ @john.should_receive(:activated=).with(false)
	40	+ @john.should_receive(:valid?).and_return(true)
	41	+ @john.should_receive(:save).and_return(true)
	42	+
	43	+ smtp_mock = mock("smtp")
	44	+ smtp_mock.should_receive(:send_message) do \|msg,fr,to\|
	45	+ to.should == [@john_info[:email]]
	46	+ msg.index(@john_activation_key).should_not be_nil
	47	+ end
	48	+
	49	+ Net::SMTP.should_receive(:start).
	50	+ with(any_args()).
	51	+ and_yield(smtp_mock)
	52	+
	53	+ post :register, :login => @john_info[:login],
	54	+ :full_name => @john_info[:full_name],
	55	+ :email => @john_info[:email]
	56	+
	57	+ response.should render_template('users/new_splash')
	58	+ end
	59	+
	60	+ it "should create unactivated user and return error page when e-mail sending error" do
	61	+ User.should_receive(:new).with(any_args()).and_return(@john)
	62	+ @john.should_receive(:activated=).with(false)
	63	+ @john.should_receive(:valid?).and_return(true)
	64	+ @john.should_receive(:save).and_return(true)
	65	+
	66	+ smtp_mock = mock("smtp")
	67	+ smtp_mock.should_receive(:send_message).
	68	+ and_throw(:error)
	69	+
	70	+ Net::SMTP.should_receive(:start).
	71	+ with(any_args()).
	72	+ and_yield(smtp_mock)
	73	+
	74	+ post :register, :login => @john_info[:login],
	75	+ :full_name => @john_info[:full_name],
	76	+ :email => @john_info[:email]
	77	+
	78	+ response.should render_template('users/email_error')
	79	+ end
	80	+
	81	+ it "should activate user with valid activation key" do
	82	+ login = @john_info[:login]
	83	+ User.should_receive(:find_by_login).
	84	+ with(login).
	85	+ and_return(@john)
	86	+ @john.should_receive(:valid?).and_return(true)
	87	+ @john.should_receive(:activated=).with(true)
	88	+ @john.should_receive(:save).and_return(true)
	89	+
	90	+ get :confirm, :login => login, :activation => @john_activation_key
	91	+
	92	+ response.should render_template('users/confirm')
	93	+ end
	94	+
	95	+ end

app/controllers/users_controller.rb ¶ +63 -3

@@ -1,11 +1,12
1	- require '~~pony~~'	1	+ require 'tmail'
		2	+ require 'net/smtp'
2		3
3	class UsersController < ApplicationController	4	class UsersController < ApplicationController
4		5
5	- before_filter :authenticate, :except => [:new, :register]	6	+ before_filter :authenticate, :except => [:new, :register, :confirm]
6		7
7	verify :method => :post, :only => [:chg_passwd],	8	verify :method => :post, :only => [:chg_passwd],
8	:redirect_to => { :action => :index }	9	:redirect_to => { :action => :index }
9		10
10	in_place_edit_for :user, :alias_for_editing	11	in_place_edit_for :user, :alias_for_editing
11	in_place_edit_for :user, :email_for_editing	12	in_place_edit_for :user, :email_for_editing
@@ -37,20 +38,79
37		38
38	def register	39	def register
39	@user = User.new(params[:user])	40	@user = User.new(params[:user])
40	@user.password_confirmation = @user.password = User.random_password	41	@user.password_confirmation = @user.password = User.random_password
41	@user.activated = false	42	@user.activated = false
42	if (@user.valid?) and (@user.save)	43	if (@user.valid?) and (@user.save)
43	- send_confirmation_email(@user)	44	+ if send_confirmation_email(@user)
44	render :action => 'new_splash', :layout => 'empty'	45	render :action => 'new_splash', :layout => 'empty'
45	else	46	else
		47	+ render :action => 'email_error', :layout => 'empty'
		48	+ end
		49	+ else
46	@user.errors.add_to_base("Email cannot be blank") if @user.email==''	50	@user.errors.add_to_base("Email cannot be blank") if @user.email==''
47	render :action => 'new', :layout => 'empty'	51	render :action => 'new', :layout => 'empty'
48	end	52	end
49	end	53	end
50		54
		55	+ def confirm
		56	+ login = params[:login]
		57	+ key = params[:activation]
		58	+ user = User.find_by_login(login)
		59	+ if (user) and (user.verify_activation_key(key))
		60	+ if user.valid? # check uniquenss of email
		61	+ user.activated = true
		62	+ user.save
		63	+ @result = :successful
		64	+ else
		65	+ @result = :email_used
		66	+ end
		67	+ else
		68	+ @result = :failed
		69	+ end
		70	+ render :action => 'confirm', :layout => 'empty'
		71	+ end
		72	+
51	protected	73	protected
52		74
53	def send_confirmation_email(user)	75	def send_confirmation_email(user)
		76	+ contest_name = Configuration['contest.name']
		77	+ activation_url = url_for(:action => 'confirm',
		78	+ :login => user.login,
		79	+ :activation => user.activation_key)
		80	+ home_url = url_for(:controller => 'main', :action => 'index')
		81	+ mail = TMail::Mail.new
		82	+ mail.to = user.email
		83	+ mail.from = Configuration['system.online_registration.from']
		84	+ mail.subject = "[#{contest_name}] Confirmation"
		85	+ mail.body = <<-EOF
		86	+ Hello #{user.full_name},
		87	+
		88	+ You have registered for #{contest_name} (#{home_url}).
		89	+
		90	+ Your login is: #{user.login}
		91	+ Your password is: #{user.password}
		92	+
		93	+ Please follow the link:
		94	+ #{activation_url}
		95	+ to activate your user account.
		96	+
		97	+ If you did not register, please ignore this e-mail.
		98	+
		99	+ Thanks!
		100	+ EOF
		101	+
		102	+ smtp_server = Configuration['system.online_registration.smtp']
		103	+
		104	+ begin
		105	+ Net::SMTP.start(smtp_server) do \|smtp\|
		106	+ smtp.send_message(mail.to_s, mail.from, mail.to)
		107	+ end
		108	+ result = true
		109	+ rescue
		110	+ result = false
		111	+ end
		112	+
		113	+ return result
54	end	114	end
55		115
56	end	116	end

app/models/configuration.rb ¶ +4

                 end
                 def self.clear
                   @@configurations = nil
                 end
+            +   def self.enable_caching
+            +     @@cache = true
+            +   end
+            +
                 #
                 # View decision
                 #
                 def self.show_submitbox_to?(user)
                   mode = get(SYSTEM_MODE_CONF_KEY)
                   return false if mode=='analysis'

app/models/user.rb ¶ +16 -2

                          :foreign_key => "receiver_id",
                          :order => 'created_at DESC'
                 belongs_to :site
                 belongs_to :country
-            -   named_scope :activated, :conditions => {:activated => true}
+            +   named_scope :activated_users, :conditions => {:activated => true}
                 validates_presence_of :login
                 validates_uniqueness_of :login
                 validates_format_of :login, :with => /^[\_a-z0-9]+$/
                 validates_length_of :login, :within => 3..10
                 validates_length_of :password, :within => 4..20, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
                 validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :allow_blank => true
                 validate :uniqueness_of_email_from_activated_users
+            +   validate :enough_time_interval_between_same_email_registrations
                 attr_accessor :password
                 before_save :encrypt_new_password
                 def self.authenticate(login, password)
                 def alias_for_editing=(e)
                   self.alias=e
                 end
                 def activation_key
+            +     if self.hashed_password==nil
+            +       encrypt_new_password
+            +     end
                   Digest::SHA1.hexdigest(self.hashed_password)[0..7]
                 end
                 def verify_activation_key(key)
                   key == activation_key
                 end
                   def self.encrypt(string,salt)
                     Digest::SHA1.hexdigest(salt + string)
                   end
                   def uniqueness_of_email_from_activated_users
-            -       if User.activated.find_by_email(self.email)!=nil
+            +       user = User.activated_users.find_by_email(self.email)
+            +       if user and (user.login != self.login)
                       self.errors.add_to_base("Email has already been taken")
                     end
                   end
+            +
+            +     def enough_time_interval_between_same_email_registrations
+            +       open_user = User.find_by_email(self.email,
+            +                                      :order => 'created_at DESC')
+            +       if open_user and open_user.created_at and
+            +           (open_user.created_at > Time.now.gmtime - 5.minutes)
+            +         self.errors.add_to_base("There are already unactivated registrations with this e-mail address (please wait for 5 minutes)")
                     end
+            +     end
+            + end

config/environment.rb.SAMPLE ¶ +4 -1

                 # Required gems
                 # -------------
                 # This is for rspec
                 config.gem "rspec-rails", :lib => "spec"
                 config.gem "haml"
-            -   config.gem "pony"
+            +   config.gem "tmail"
                 #config.gem "BlueCloth", :lig => "bluecloth"
               end
               # Add new inflection rules using the following format
               # (all these examples are active by default):
               # Inflector.inflections do |inflect|
               # Include your application configuration below
               # These are where inputs and outputs of test requests are stored
               TEST_REQUEST_INPUT_FILE_DIR = RAILS_ROOT + '/data/test_request/input'
               TEST_REQUEST_OUTPUT_FILE_DIR = RAILS_ROOT + '/data/test_request/output'
+            +
+            + # Uncomment so that configuration is read only once when the server is loaded
+            + # Configuration.enable_caching

db/schema.rb ¶ +3 -1

               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20081204122651) do
+            + ActiveRecord::Schema.define(:version => 20081210021333) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.string   "salt",            :limit => 5
                   t.string   "alias"
                   t.string   "email"
                   t.integer  "site_id"
                   t.integer  "country_id"
                   t.boolean  "activated",                     :default => false
+            +     t.datetime "created_at"
+            +     t.datetime "updated_at"
                 end
                 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
               end

public/stylesheets/application.css ¶ +8

                   color: white;
                   background-color: #777777;
                   font-weight: bold;
                   font-size: 13px;
               }
+            + div.errorExplanation {
+            +     border: 1px dashed black;
+            +     color: black;
+            +     padding: 5px;
+            +     margin-bottom: 5px;
+            +     background-color: white;
+            + }
+            +
               /*******************************
                [Settings]
               ********************************/
               table.uinfo {
                   border-collapse: collapse;
                   border: 1px solid black;

script/spec ¶ +1

               #!/usr/bin/env ruby
               $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib"))
+            + require 'rubygems'
               require 'spec'
               exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT))

spec/controllers/main_controller_spec.rb ¶ +6 -1

               require File.dirname(__FILE__) + '/../spec_helper'
               describe MainController do
                 before(:each) do
-            -     @problem = mock(Problem, :name => 'test')
+            +     @problem = mock(Problem, :name => 'test', :output_only => false)
                   @language = mock(Language, :name => 'cpp', :ext => 'cpp')
                   @submission = mock(Submission,
                                      :id => 1,
                                      :user_id => 1,
                                      :problem => @problem,
                                      :language => @language,
                                      :source => 'sample source',
                                      :compiler_message => 'none')
                   @user = mock(User, :id => 1, :login => 'john')
+            +     @another_user = mock(User, :id => 2, :login => 'mary')
                 end
                 it "should redirect user to login page when unlogged-in user try to access main/list" do
                   get 'list'
                   response.should redirect_to(:action => 'login')
                 end
                 it "should let user sees her own source" do
                   Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission)
+            +     User.should_receive(:find).with(1).and_return(@user)
                   get 'source', {:id => @submission.id}, {:user_id => 1}
                   response.should be_success
                 end
                 it "should let user sees her own compiler message" do
                   Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission)
+            +     User.should_receive(:find).with(1).and_return(@user)
                   get 'compiler_msg', {:id => @submission.id}, {:user_id => 1}
                   response.should be_success
                 end
                 it "should not let user sees other user's source" do
                   Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission)
+            +     User.should_receive(:find).with(2).and_return(@another_user)
                   get 'source', {:id => @submission.id}, {:user_id => 2}
                   flash[:notice].should =~ /[Ee]rror/
                   response.should redirect_to(:action => 'list')
                 end
                 it "should not let user sees other user's compiler message" do
                   Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission)
+            +     User.should_receive(:find).with(2).and_return(@another_user)
                   get 'compiler_msg', {:id => @submission.id}, {:user_id => 2}
                   flash[:notice].should =~ /[Ee]rror/
                   response.should redirect_to(:action => 'list')
                 end
               end

spec/controllers/test_controller_spec.rb ¶ +1 -1

               describe TestController do
                 before(:each) do
                   @john = mock(User, :id => "1", :login => 'john')
                   @john_result = mock(TestRequest, :id => "1", :user_id => @john.id)
                   @mary_result = mock(TestRequest, :id => "2", :user_id => @john.id + '1')
-            -     User.should_receive(:find).with(@john.id).and_return(@john)
+            +     User.should_receive(:find).at_least(:once).with(@john.id).and_return(@john)
                 end
                 it "should let user see her testing result" do
                   TestRequest.should_receive(:find).with(@john_result.id).
                     and_return(@john_result)
                   get 'result', {:id => @john_result.id}, {:user_id => @john.id}

spec/models/site_spec.rb ¶ +13 -8

               require File.dirname(__FILE__) + '/../spec_helper'
               describe Site do
                 before(:each) do
-            -     start_time = Time.local(2008,5,10,9,00)
+            +     start_time = Time.local(2008,5,10,9,00).gmtime
                   @site = Site.new({:name => 'Test site',
                                      :started => true,
                                      :start_time => start_time })
+            +     @site.stub!(:start_time).
+            +       any_number_of_times.
+            +       and_return(start_time)
+            +     @site.stub!(:started).any_number_of_times.and_return(true)
                 end
                 it "should report that the contest is not finished when the contest time limit is not set" do
                   Configuration.should_receive(:[]).with('contest.time_limit').
                     and_return('unlimit')
-            -     Time.should_not_receive(:now)
                   @site.finished?.should == false
                 end
                 it "should report that the contest is finished when the contest is over" do
                   Configuration.should_receive(:[]).with('contest.time_limit').
                   and_return('5:00')
-            -     Time.should_receive(:now).and_return(Time.local(2008,5,10,14,01))
+            +     Time.stub!(:now).
-            -     @site.finished?.should == true
+            +       and_return(Time.local(2008,5,10,14,01).gmtime)
-            -   end
+            +     @site.finished?.should == true end
                 it "should report if the contest is finished correctly, when the contest is over, and the contest time contains some minutes" do
                   Configuration.should_receive(:[]).twice.with('contest.time_limit').
                     and_return('5:15')
-            -     Time.should_receive(:now).
+            +     Time.stub!(:now).
-            -       and_return(Time.local(2008,5,10,14,14),Time.local(2008,5,10,14,16))
+            +       and_return(Time.local(2008,5,10,14,14))
                   @site.finished?.should == false
+            +     Time.stub!(:now).
+            +       and_return(Time.local(2008,5,10,14,16))
                   @site.finished?.should == true
                 end
                 it "should report that the contest is not finished, when the time is exactly at the finish time" do
                   Configuration.should_receive(:[]).with('contest.time_limit').
                     and_return('5:00')
-            -     Time.should_receive(:now).and_return(Time.local(2008,5,10,14,00))
+            +     Time.stub!(:now).and_return(Time.local(2008,5,10,14,00))
                   @site.finished?.should == false
                 end
               end

spec/models/user_spec.rb ¶ +41

@@ -45,12 +45,53
45	@john.verify_activation_key(activation_key).should == true	45	@john.verify_activation_key(activation_key).should == true
46	end	46	end
47		47
48	it "should not accept invalid activation key" do	48	it "should not accept invalid activation key" do
49	@john.verify_activation_key("12345").should == false	49	@john.verify_activation_key("12345").should == false
50	end	50	end
		51	+ end
		52	+
		53	+ describe User, "when re-register with the same e-mail" do
		54	+
		55	+ before(:each) do
		56	+ @mary_email = 'mary@in.th'
		57	+
		58	+ @time_first_register = Time.local(2008,5,10,9,00).gmtime
		59	+
		60	+ @mary_first = mock_model(User,
		61	+ :login => 'mary1',
		62	+ :password => 'hello',
		63	+ :email => @mary_email,
		64	+ :created_at => @time_first_register)
		65	+ @mary_second = User.new(:login => 'mary2',
		66	+ :password => 'hello',
		67	+ :email => @mary_email)
		68	+ User.stub!(:find_by_email).
		69	+ with(@mary_email, {:order => "created_at DESC"}).
		70	+ and_return(@mary_first)
		71	+ end
		72	+
		73	+ class User
		74	+ public :enough_time_interval_between_same_email_registrations
		75	+ end
		76	+
		77	+ it "should not be allowed if the time interval is less than 5 mins" do
		78	+ time_now = @time_first_register + 4.minutes
		79	+ Time.stub!(:now).and_return(time_now)
		80	+
		81	+ @mary_second.enough_time_interval_between_same_email_registrations
		82	+ @mary_second.errors.length.should_not be_zero
		83	+ end
		84	+
		85	+ it "should be allowed if the time interval is more than 5 mins" do
		86	+ time_now = @time_first_register + 6.minutes
		87	+ Time.stub!(:now).and_return(time_now)
		88	+
		89	+ @mary_second.enough_time_interval_between_same_email_registrations
		90	+ @mary_second.errors.length.should be_zero
		91	+ end
51		92
52	end	93	end
53		94
54	describe User, "as a class" do	95	describe User, "as a class" do
55		96
56	it "should be able to generate random password" do	97	it "should be able to generate random password" do

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r158:13c9210ae5ca - Wed, 10 Dec 2008 02:48:32 - 16 files changed: 306 inserted, 17 deleted

Sign in to your account

Commit r158:13c9210ae5ca public

Author

r158:13c9210ae5ca - Wed, 10 Dec 2008 02:48:32 - 16 files changed: 306 inserted, 17 deleted

Commit `r158:13c9210ae5ca` public