hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'captcha' into 'develop'

Browse source 
Make captcha (kocaptcha) stateless

See merge request pleroma/pleroma!585
This commit is contained in:
rinpatch 2019-01-03 17:04:27 +00:00
commit b73a1a33de
10 changed files with 127 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/pleroma/web/twitter_api/twitter_api.ex
View file

@ -140,22 +140,28 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
password: params["password"],
password_confirmation: params["confirm"],
captcha_solution: params["captcha_solution"],
captcha_token: params["captcha_token"]
captcha_token: params["captcha_token"],
captcha_answer_data: params["captcha_answer_data"]
}
captcha_enabled = Pleroma.Config.get([Pleroma.Captcha, :enabled])
# true if captcha is disabled or enabled and valid, false otherwise
captcha_ok =
if !captcha_enabled do
true
:ok
else
Pleroma.Captcha.validate(params[:captcha_token], params[:captcha_solution])
Pleroma.Captcha.validate(
params[:captcha_token],
params[:captcha_solution],
params[:captcha_answer_data]
)
end
# Captcha invalid
if not captcha_ok do
if captcha_ok != :ok do
{:error, error} = captcha_ok
# I have no idea how this error handling works
{:error, %{error: Jason.encode!(%{captcha: ["Invalid CAPTCHA"]})}}
{:error, %{error: Jason.encode!(%{captcha: [error]})}}
else
registrations_open = Pleroma.Config.get([:instance, :registrations_open])