Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
a1batross
pleroma
Commits
5b5f8552
Commit
5b5f8552
authored
Nov 11, 2019
by
lain
Committed by
rinpatch
Nov 19, 2019
Browse files
UserEnabledPlug: Don't authenticate unconfirmed users.
parent
ff4af8c5
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/plugs/user_enabled_plug.ex
View file @
5b5f8552
...
...
@@ -10,9 +10,13 @@ defmodule Pleroma.Plugs.UserEnabledPlug do
options
end
def
call
(%{
assigns:
%{
user:
%
User
{
info:
%{
deactivated:
true
}}}}
=
conn
,
_
)
do
conn
|>
assign
(
:user
,
nil
)
def
call
(%{
assigns:
%{
user:
%
User
{}
=
user
}}
=
conn
,
_
)
do
if
User
.
auth_active?
(
user
)
do
conn
else
conn
|>
assign
(
:user
,
nil
)
end
end
def
call
(
conn
,
_
)
do
...
...
test/plugs/user_enabled_plug_test.exs
View file @
5b5f8552
...
...
@@ -16,6 +16,23 @@ defmodule Pleroma.Plugs.UserEnabledPlugTest do
assert
ret_conn
==
conn
end
test
"with a user that's not confirmed and a config requiring confirmation, it removes that user"
,
%{
conn:
conn
}
do
old
=
Pleroma
.
Config
.
get
([
:instance
,
:account_activation_required
])
Pleroma
.
Config
.
put
([
:instance
,
:account_activation_required
],
true
)
user
=
insert
(
:user
,
confirmation_pending:
true
)
conn
=
conn
|>
assign
(
:user
,
user
)
|>
UserEnabledPlug
.
call
(%{})
assert
conn
.
assigns
.
user
==
nil
Pleroma
.
Config
.
put
([
:instance
,
:account_activation_required
],
old
)
end
test
"with a user that is deactivated, it removes that user"
,
%{
conn:
conn
}
do
user
=
insert
(
:user
,
info:
%{
deactivated:
true
})
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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