Added validation for profile types of target and requestor

Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com>

Added validation for profile types of target and requestor
Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
André Guedes
1 parent 31138696
Showing 11 changed files with 159 additions and 5 deletions Show diff stats
app/models/add_friend.rb
app/models/add_member.rb
app/models/approve_article.rb
app/models/change_password.rb
app/models/create_community.rb
app/models/create_enterprise.rb
app/models/email_activation.rb
app/models/enterprise_activation.rb
app/models/invitation.rb
app/models/moderate_user_registration.rb
app/models/suggest_article.rb
@@ -14,6 +14,9 @@ class AddFriend &lt; Task
   alias :friend :target
   alias :friend= :target=
+  validate :requestor_is_person
+  validate :target_is_person
+
   after_create do |task|
     TaskMailer.invitation_notification(task).deliver unless task.friend
     remove_from_suggestion_list(task)
@@ -24,6 +27,18 @@ class AddFriend &lt; Task
     requestor.add_friend(target, group_for_person)
   end
+  def requestor_is_person
+    unless requestor.person?
+      errors.add(:add_friend, N_('Requestor must be a person.'))
+    end
+  end
+
+  def target_is_person
+    unless target.person?
+      errors.add(:add_friend, N_('Target must be a person.'))
+    end
+  end
+
   def permission
     :manage_friends
   end
@@ -2,6 +2,9 @@ class AddMember &lt; Task
   validates_presence_of :requestor_id, :target_id
+  validate :requestor_is_person
+  validate :target_is_organization
+
   alias :person :requestor
   alias :person= :requestor=
@@ -55,4 +58,16 @@ class AddMember &lt; Task
     suggestion.disable if suggestion
   end
+  def requestor_is_person
+    unless requestor.person?
+      errors.add(:add_member, N_('Requestor must be a person.'))
+    end
+  end
+
+  def target_is_organization
+    unless target.organization?
+      errors.add(:add_member, N_('Target must be an organization.'))
+    end
+  end
+
 end
 class ApproveArticle < Task
   validates_presence_of :requestor_id, :target_id
+  validate :requestor_is_person
+  validate :target_is_organization
+  validate :request_is_member_of_target
+
   def article_title
     article ? article.title : _('(The original text was removed)')
   end
@@ -128,4 +132,21 @@ class ApproveArticle &lt; Task
     message
   end
+  def requestor_is_person
+    unless requestor.person?
+      errors.add(:approve_article, N_('Requestor must be a person.'))
+    end
+  end
+
+  def target_is_organization
+    unless target.organization?
+      errors.add(:approve_article, N_('Target must be an organization.'))
+    end
+  end
+
+  def request_is_member_of_target
+    unless requestor.is_member_of?(target) 
+      errors.add(:approve_article, N_('Requestor must be a member of target.'))
+    end
+  end
 end
@@ -18,6 +18,8 @@ class ChangePassword &lt; Task
   validates_presence_of :requestor
+  validate :requestor_is_person
+
   ###################################################
   # validations for updating a ChangePassword task 
@@ -72,4 +74,9 @@ class ChangePassword &lt; Task
     end
   end
+  def requestor_is_person
+    unless requestor.person?
+      errors.add(:change_password, N_('Requestor must be a person.'))
+    end
+  end
 end
@@ -3,6 +3,9 @@ class CreateCommunity &lt; Task
   validates_presence_of :requestor_id, :target_id
   validates_presence_of :name
+  validate :requestor_is_person
+  validate :target_is_environment
+
   alias :environment :target
   alias :environment= :target=
@@ -92,4 +95,16 @@ class CreateCommunity &lt; Task
     _('Your request for registering the community "%{community}" was approved. You can access %{environment} now and start using your new community.') % { :community => self.name, :environment => self.environment }
   end
+  def requestor_is_person
+    unless requestor.person?
+      errors.add(:create_community, N_('Requestor must be a person.'))
+    end
+  end
+
+  def target_is_environment
+    unless target.class == Environment
+      errors.add(:create_community, N_('Target must be an environment.'))
+    end
+  end
+
 end
@@ -27,6 +27,9 @@ class CreateEnterprise &lt; Task
   # checks for actual attributes
   validates_presence_of :requestor_id, :target_id
+  validate :requestor_is_person
+  validate :target_is_environment
+
   # checks for admins required attributes
   DATA_FIELDS.each do |attribute|
     validates_presence_of attribute, :if => lambda { |obj| obj.environment.required_enterprise_fields.include?(attribute) }
@@ -214,4 +217,16 @@ class CreateEnterprise &lt; Task
     :validate_enterprise
   end
+  def requestor_is_person
+    unless requestor.person?
+      errors.add(:create_enterprise, N_('Requestor must be a person.'))
+    end
+  end
+
+  def target_is_environment
+    unless target.class == Environment
+      errors.add(:create_enterprise, N_('Target must be an environment.'))
+    end
+  end
+
 end
 class EmailActivation < Task
   validates_presence_of :requestor_id, :target_id
+
+  validate :requestor_is_person
+  validate :target_is_environment
+
   validate :already_requested, :on => :create
   alias :environment :target
   alias :person :requestor
   def already_requested
-    if !self.requestor.nil? && self.requestor.user.email_activation_pending?
-      self.errors.add(:base, _('You have already requested activation of your mailbox.'))
+    if self.requestor.person?
+      if !self.requestor.nil? && self.requestor.user.email_activation_pending?
+        self.errors.add(:base, _('You have already requested activation of your mailbox.'))
+      end
     end
   end
@@ -41,4 +47,16 @@ class EmailActivation &lt; Task
     false
   end
+  def requestor_is_person
+    unless requestor.person?
+      errors.add(:email_activation, N_('Requestor must be a person.'))
+    end
+  end
+
+  def target_is_environment
+    unless target.class == Environment
+      errors.add(:email_activation, N_('Target must be an environment.'))
+    end
+  end
+
 end
@@ -8,6 +8,9 @@ class EnterpriseActivation &lt; Task
   validates_presence_of :enterprise
+  validate :requestor_is_person
+  validate :target_is_enterprise
+
   def perform
     self.enterprise.enable self.requestor
   end
@@ -44,4 +47,16 @@ class EnterpriseActivation &lt; Task
     end
   end
+  def requestor_is_person
+    unless requestor.person?
+      errors.add(:enterprise_activation, N_('Requestor must be a person.'))
+    end
+  end
+
+  def target_is_enterprise
+    unless target.enterprise?
+      errors.add(:enterprise_activation, N_('Target must be an enterprise.'))
+    end
+  end
+
 end
@@ -6,6 +6,9 @@ class Invitation &lt; Task
   validates_presence_of :target_id, :if => Proc.new{|invite| invite.friend_email.blank?}
+  validate :requestor_is_person
+  validate :target_is_person
+
   validates_presence_of :friend_email, :if => Proc.new{|invite| invite.target_id.blank?}
   validates_format_of :friend_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => Proc.new{|invite| invite.target_id.blank?}
@@ -34,9 +37,11 @@ class Invitation &lt; Task
   end
   def not_invite_yourself
-    email = friend ? friend.user.email : friend_email
-    if person && email && person.user.email == email
-      self.errors.add(:base, _("You can't invite youself"))
+    if friend.person? && person.person?
+      email = friend ? friend.user.email : friend_email
+      if person && email && person.user.email == email
+        self.errors.add(:base, _("You can't invite youself"))
+      end
     end
   end
@@ -139,4 +144,16 @@ class Invitation &lt; Task
     self.requestor.environment
   end
+  def requestor_is_person
+    unless requestor.person?
+      errors.add(:invitation, N_('Requestor must be a person.'))
+    end
+  end
+
+  def target_is_person
+    unless target.person?
+      errors.add(:invitation, N_('Target must be a person.'))
+    end
+  end
+
 end
@@ -7,6 +7,8 @@ class ModerateUserRegistration &lt; Task
   after_create :schedule_spam_checking
+  validate :target_is_environment
+
   alias :environment :target
   alias :environment= :target=
@@ -56,4 +58,10 @@ class ModerateUserRegistration &lt; Task
     _("User \"%{user}\" just requested to register. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :user => self.name }
   end
+  def target_is_environment
+    unless environment.class == Environment
+      errors.add(:moderate_user_registration, N_('Target must be an environment.'))
+    end
+  end
+
 end
 \ No newline at end of file
@@ -4,6 +4,8 @@ class SuggestArticle &lt; Task
   validates_presence_of :email, :name, :if => Proc.new { |task| task.requestor.blank? }
   validates_associated :article_object
+  validate :target_is_organization
+
   settings_items :email, :type => String
   settings_items :name, :type => String
   settings_items :ip_address, :type => String
@@ -92,4 +94,10 @@ class SuggestArticle &lt; Task
   def after_ham!
     self.delay.marked_as_ham
   end
+
+  def target_is_organization
+    unless target.organization?
+      errors.add(:suggest_article, N_('Target must be an organization.'))
+    end
+  end
 end
	@@ -14,6 +14,9 @@ class AddFriend < Task		@@ -14,6 +14,9 @@ class AddFriend < Task
14	alias :friend :target	14	alias :friend :target
15	alias :friend= :target=	15	alias :friend= :target=
16		16
		17	+ validate :requestor_is_person
		18	+ validate :target_is_person
		19	+
17	after_create do \|task\|	20	after_create do \|task\|
18	TaskMailer.invitation_notification(task).deliver unless task.friend	21	TaskMailer.invitation_notification(task).deliver unless task.friend
19	remove_from_suggestion_list(task)	22	remove_from_suggestion_list(task)
	@@ -24,6 +27,18 @@ class AddFriend < Task		@@ -24,6 +27,18 @@ class AddFriend < Task
24	requestor.add_friend(target, group_for_person)	27	requestor.add_friend(target, group_for_person)
25	end	28	end
26		29
		30	+ def requestor_is_person
		31	+ unless requestor.person?
		32	+ errors.add(:add_friend, N_('Requestor must be a person.'))
		33	+ end
		34	+ end
		35	+
		36	+ def target_is_person
		37	+ unless target.person?
		38	+ errors.add(:add_friend, N_('Target must be a person.'))
		39	+ end
		40	+ end
		41	+
27	def permission	42	def permission
28	:manage_friends	43	:manage_friends
29	end	44	end
	@@ -2,6 +2,9 @@ class AddMember < Task		@@ -2,6 +2,9 @@ class AddMember < Task
2		2
3	validates_presence_of :requestor_id, :target_id	3	validates_presence_of :requestor_id, :target_id
4		4
		5	+ validate :requestor_is_person
		6	+ validate :target_is_organization
		7	+
5	alias :person :requestor	8	alias :person :requestor
6	alias :person= :requestor=	9	alias :person= :requestor=
7		10
	@@ -55,4 +58,16 @@ class AddMember < Task		@@ -55,4 +58,16 @@ class AddMember < Task
55	suggestion.disable if suggestion	58	suggestion.disable if suggestion
56	end	59	end
57		60
		61	+ def requestor_is_person
		62	+ unless requestor.person?
		63	+ errors.add(:add_member, N_('Requestor must be a person.'))
		64	+ end
		65	+ end
		66	+
		67	+ def target_is_organization
		68	+ unless target.organization?
		69	+ errors.add(:add_member, N_('Target must be an organization.'))
		70	+ end
		71	+ end
		72	+
58	end	73	end
1	class ApproveArticle < Task	1	class ApproveArticle < Task
2	validates_presence_of :requestor_id, :target_id	2	validates_presence_of :requestor_id, :target_id
3		3
		4	+ validate :requestor_is_person
		5	+ validate :target_is_organization
		6	+ validate :request_is_member_of_target
		7	+
4	def article_title	8	def article_title
5	article ? article.title : _('(The original text was removed)')	9	article ? article.title : _('(The original text was removed)')
6	end	10	end
	@@ -128,4 +132,21 @@ class ApproveArticle < Task		@@ -128,4 +132,21 @@ class ApproveArticle < Task
128	message	132	message
129	end	133	end
130		134
		135	+ def requestor_is_person
		136	+ unless requestor.person?
		137	+ errors.add(:approve_article, N_('Requestor must be a person.'))
		138	+ end
		139	+ end
		140	+
		141	+ def target_is_organization
		142	+ unless target.organization?
		143	+ errors.add(:approve_article, N_('Target must be an organization.'))
		144	+ end
		145	+ end
		146	+
		147	+ def request_is_member_of_target
		148	+ unless requestor.is_member_of?(target)
		149	+ errors.add(:approve_article, N_('Requestor must be a member of target.'))
		150	+ end
		151	+ end
131	end	152	end
	@@ -3,6 +3,9 @@ class CreateCommunity < Task		@@ -3,6 +3,9 @@ class CreateCommunity < Task
3	validates_presence_of :requestor_id, :target_id	3	validates_presence_of :requestor_id, :target_id
4	validates_presence_of :name	4	validates_presence_of :name
5		5
		6	+ validate :requestor_is_person
		7	+ validate :target_is_environment
		8	+
6	alias :environment :target	9	alias :environment :target
7	alias :environment= :target=	10	alias :environment= :target=
8		11
	@@ -92,4 +95,16 @@ class CreateCommunity < Task		@@ -92,4 +95,16 @@ class CreateCommunity < Task
92	_('Your request for registering the community "%{community}" was approved. You can access %{environment} now and start using your new community.') % { :community => self.name, :environment => self.environment }	95	_('Your request for registering the community "%{community}" was approved. You can access %{environment} now and start using your new community.') % { :community => self.name, :environment => self.environment }
93	end	96	end
94		97
		98	+ def requestor_is_person
		99	+ unless requestor.person?
		100	+ errors.add(:create_community, N_('Requestor must be a person.'))
		101	+ end
		102	+ end
		103	+
		104	+ def target_is_environment
		105	+ unless target.class == Environment
		106	+ errors.add(:create_community, N_('Target must be an environment.'))
		107	+ end
		108	+ end
		109	+
95	end	110	end
	@@ -27,6 +27,9 @@ class CreateEnterprise < Task		@@ -27,6 +27,9 @@ class CreateEnterprise < Task
27	# checks for actual attributes	27	# checks for actual attributes
28	validates_presence_of :requestor_id, :target_id	28	validates_presence_of :requestor_id, :target_id
29		29
		30	+ validate :requestor_is_person
		31	+ validate :target_is_environment
		32	+
30	# checks for admins required attributes	33	# checks for admins required attributes
31	DATA_FIELDS.each do \|attribute\|	34	DATA_FIELDS.each do \|attribute\|
32	validates_presence_of attribute, :if => lambda { \|obj\| obj.environment.required_enterprise_fields.include?(attribute) }	35	validates_presence_of attribute, :if => lambda { \|obj\| obj.environment.required_enterprise_fields.include?(attribute) }
	@@ -214,4 +217,16 @@ class CreateEnterprise < Task		@@ -214,4 +217,16 @@ class CreateEnterprise < Task
214	:validate_enterprise	217	:validate_enterprise
215	end	218	end
216		219
		220	+ def requestor_is_person
		221	+ unless requestor.person?
		222	+ errors.add(:create_enterprise, N_('Requestor must be a person.'))
		223	+ end
		224	+ end
		225	+
		226	+ def target_is_environment
		227	+ unless target.class == Environment
		228	+ errors.add(:create_enterprise, N_('Target must be an environment.'))
		229	+ end
		230	+ end
		231	+
217	end	232	end
1	class EmailActivation < Task	1	class EmailActivation < Task
2		2
3	validates_presence_of :requestor_id, :target_id	3	validates_presence_of :requestor_id, :target_id
		4	+
		5	+ validate :requestor_is_person
		6	+ validate :target_is_environment
		7	+
4	validate :already_requested, :on => :create	8	validate :already_requested, :on => :create
5		9
6	alias :environment :target	10	alias :environment :target
7	alias :person :requestor	11	alias :person :requestor
8		12
9	def already_requested	13	def already_requested
10	- if !self.requestor.nil? && self.requestor.user.email_activation_pending?
11	- self.errors.add(:base, _('You have already requested activation of your mailbox.'))	14	+ if self.requestor.person?
		15	+ if !self.requestor.nil? && self.requestor.user.email_activation_pending?
		16	+ self.errors.add(:base, _('You have already requested activation of your mailbox.'))
		17	+ end
12	end	18	end
13	end	19	end
14		20
	@@ -41,4 +47,16 @@ class EmailActivation < Task		@@ -41,4 +47,16 @@ class EmailActivation < Task
41	false	47	false
42	end	48	end
43		49
		50	+ def requestor_is_person
		51	+ unless requestor.person?
		52	+ errors.add(:email_activation, N_('Requestor must be a person.'))
		53	+ end
		54	+ end
		55	+
		56	+ def target_is_environment
		57	+ unless target.class == Environment
		58	+ errors.add(:email_activation, N_('Target must be an environment.'))
		59	+ end
		60	+ end
		61	+
44	end	62	end
	@@ -8,6 +8,9 @@ class EnterpriseActivation < Task		@@ -8,6 +8,9 @@ class EnterpriseActivation < Task
8		8
9	validates_presence_of :enterprise	9	validates_presence_of :enterprise
10		10
		11	+ validate :requestor_is_person
		12	+ validate :target_is_enterprise
		13	+
11	def perform	14	def perform
12	self.enterprise.enable self.requestor	15	self.enterprise.enable self.requestor
13	end	16	end
	@@ -44,4 +47,16 @@ class EnterpriseActivation < Task		@@ -44,4 +47,16 @@ class EnterpriseActivation < Task
44	end	47	end
45	end	48	end
46		49
		50	+ def requestor_is_person
		51	+ unless requestor.person?
		52	+ errors.add(:enterprise_activation, N_('Requestor must be a person.'))
		53	+ end
		54	+ end
		55	+
		56	+ def target_is_enterprise
		57	+ unless target.enterprise?
		58	+ errors.add(:enterprise_activation, N_('Target must be an enterprise.'))
		59	+ end
		60	+ end
		61	+
47	end	62	end
	@@ -6,6 +6,9 @@ class Invitation < Task		@@ -6,6 +6,9 @@ class Invitation < Task
6		6
7	validates_presence_of :target_id, :if => Proc.new{\|invite\| invite.friend_email.blank?}	7	validates_presence_of :target_id, :if => Proc.new{\|invite\| invite.friend_email.blank?}
8		8
		9	+ validate :requestor_is_person
		10	+ validate :target_is_person
		11	+
9	validates_presence_of :friend_email, :if => Proc.new{\|invite\| invite.target_id.blank?}	12	validates_presence_of :friend_email, :if => Proc.new{\|invite\| invite.target_id.blank?}
10	validates_format_of :friend_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => Proc.new{\|invite\| invite.target_id.blank?}	13	validates_format_of :friend_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => Proc.new{\|invite\| invite.target_id.blank?}
11		14
	@@ -34,9 +37,11 @@ class Invitation < Task		@@ -34,9 +37,11 @@ class Invitation < Task
34	end	37	end
35		38
36	def not_invite_yourself	39	def not_invite_yourself
37	- email = friend ? friend.user.email : friend_email
38	- if person && email && person.user.email == email
39	- self.errors.add(:base, _("You can't invite youself"))	40	+ if friend.person? && person.person?
		41	+ email = friend ? friend.user.email : friend_email
		42	+ if person && email && person.user.email == email
		43	+ self.errors.add(:base, _("You can't invite youself"))
		44	+ end
40	end	45	end
41	end	46	end
42		47
	@@ -139,4 +144,16 @@ class Invitation < Task		@@ -139,4 +144,16 @@ class Invitation < Task
139	self.requestor.environment	144	self.requestor.environment
140	end	145	end
141		146
		147	+ def requestor_is_person
		148	+ unless requestor.person?
		149	+ errors.add(:invitation, N_('Requestor must be a person.'))
		150	+ end
		151	+ end
		152	+
		153	+ def target_is_person
		154	+ unless target.person?
		155	+ errors.add(:invitation, N_('Target must be a person.'))
		156	+ end
		157	+ end
		158	+
142	end	159	end