Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
f80d1f0e3ed8
Commit
69708dab
authored
Aug 21, 2015
by
Douwe Maan
Browse files
Block blocked users from replying to threads by email.
parent
d653b58ca290
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/workers/email_receiver_worker.rb
View file @
f80d1f0e
...
...
@@ -31,6 +31,8 @@ def handle_failure(raw, e)
reason
=
"The email was marked as 'auto generated', which we can't accept. Please create your comment through the web interface."
when
Gitlab
::
Email
::
Receiver
::
UserNotFoundError
reason
=
"We couldn't figure out what user corresponds to the email. Please create your comment through the web interface."
when
Gitlab
::
Email
::
Receiver
::
UserBlockedError
reason
=
"Your account has been blocked. If you believe this is in error, contact a staff member."
when
Gitlab
::
Email
::
Receiver
::
UserNotAuthorizedError
reason
=
"You are not allowed to respond to the thread you are replying to. If you believe this is in error, contact a staff member."
when
Gitlab
::
Email
::
Receiver
::
NoteableNotFoundError
...
...
lib/gitlab/email/receiver.rb
View file @
f80d1f0e
...
...
@@ -8,6 +8,7 @@ class SentNotificationNotFoundError < ProcessingError; end
class
EmptyEmailError
<
ProcessingError
;
end
class
AutoGeneratedEmailError
<
ProcessingError
;
end
class
UserNotFoundError
<
ProcessingError
;
end
class
UserBlockedError
<
ProcessingError
;
end
class
UserNotAuthorizedError
<
ProcessingError
;
end
class
NoteableNotFoundError
<
ProcessingError
;
end
class
InvalidNoteError
<
ProcessingError
;
end
...
...
@@ -27,6 +28,8 @@ def execute
raise
UserNotFoundError
unless
author
raise
UserBlockedError
if
author
.
blocked?
project
=
sent_notification
.
project
raise
UserNotAuthorizedError
unless
project
&&
author
.
can?
(
:create_note
,
project
)
...
...
spec/lib/gitlab/email/receiver_spec.rb
View file @
f80d1f0e
...
...
@@ -58,6 +58,16 @@
end
end
context
"when the user has been blocked"
do
before
do
user
.
block
end
it
"raises a UserBlockedError"
do
expect
{
receiver
.
execute
}.
to
raise_error
(
Gitlab
::
Email
::
Receiver
::
UserBlockedError
)
end
end
context
"when the user is not authorized to create a note"
do
before
do
project
.
update_attribute
(
:visibility_level
,
Project
::
PRIVATE
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment