projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
creating trusted app from adminFE & mix task
[akkoma]
/
test
/
plugs
/
rate_limiter_test.exs
diff --git
a/test/plugs/rate_limiter_test.exs
b/test/plugs/rate_limiter_test.exs
index 81e2009c8f4490c96062af3230c4e19a1aa34ad4..0ce9f3a0aed9c64cac93180fc904ce59230f8a52 100644
(file)
--- a/
test/plugs/rate_limiter_test.exs
+++ b/
test/plugs/rate_limiter_test.exs
@@
-12,14
+12,12
@@
defmodule Pleroma.Plugs.RateLimiterTest do
import Pleroma.Tests.Helpers, only: [clear_config: 1, clear_config: 2]
# Note: each example must work with separate buckets in order to prevent concurrency issues
import Pleroma.Tests.Helpers, only: [clear_config: 1, clear_config: 2]
# Note: each example must work with separate buckets in order to prevent concurrency issues
-
- clear_config([Pleroma.Web.Endpoint, :http, :ip])
- clear_config(:rate_limit)
+ setup do: clear_config([Pleroma.Web.Endpoint, :http, :ip])
+ setup do: clear_config(:rate_limit)
describe "config" do
@limiter_name :test_init
describe "config" do
@limiter_name :test_init
-
- clear_config([Pleroma.Plugs.RemoteIp, :enabled])
+ setup do: clear_config([Pleroma.Plugs.RemoteIp, :enabled])
test "config is required for plug to work" do
Config.put([:rate_limit, @limiter_name], {1, 1})
test "config is required for plug to work" do
Config.put([:rate_limit, @limiter_name], {1, 1})
@@
-51,7
+49,7
@@
defmodule Pleroma.Plugs.RateLimiterTest do
Config.put([:rate_limit, limiter_name], {scale, limit})
plug_opts = RateLimiter.init(name: limiter_name)
Config.put([:rate_limit, limiter_name], {scale, limit})
plug_opts = RateLimiter.init(name: limiter_name)
- conn = conn(:get, "/")
+ conn =
build_
conn(:get, "/")
for i <- 1..5 do
conn = RateLimiter.call(conn, plug_opts)
for i <- 1..5 do
conn = RateLimiter.call(conn, plug_opts)
@@
-65,7
+63,7
@@
defmodule Pleroma.Plugs.RateLimiterTest do
Process.sleep(50)
Process.sleep(50)
- conn = conn(:get, "/")
+ conn =
build_
conn(:get, "/")
conn = RateLimiter.call(conn, plug_opts)
assert {1, 4} = RateLimiter.inspect_bucket(conn, limiter_name, plug_opts)
conn = RateLimiter.call(conn, plug_opts)
assert {1, 4} = RateLimiter.inspect_bucket(conn, limiter_name, plug_opts)
@@
-85,7
+83,7
@@
defmodule Pleroma.Plugs.RateLimiterTest do
base_bucket_name = "#{limiter_name}:group1"
plug_opts = RateLimiter.init(name: limiter_name, bucket_name: base_bucket_name)
base_bucket_name = "#{limiter_name}:group1"
plug_opts = RateLimiter.init(name: limiter_name, bucket_name: base_bucket_name)
- conn = conn(:get, "/")
+ conn =
build_
conn(:get, "/")
RateLimiter.call(conn, plug_opts)
assert {1, 4} = RateLimiter.inspect_bucket(conn, base_bucket_name, plug_opts)
RateLimiter.call(conn, plug_opts)
assert {1, 4} = RateLimiter.inspect_bucket(conn, base_bucket_name, plug_opts)
@@
-99,9
+97,9
@@
defmodule Pleroma.Plugs.RateLimiterTest do
plug_opts = RateLimiter.init(name: limiter_name, params: ["id"])
plug_opts = RateLimiter.init(name: limiter_name, params: ["id"])
- conn = conn(:get, "/?id=1")
+ conn =
build_
conn(:get, "/?id=1")
conn = Plug.Conn.fetch_query_params(conn)
conn = Plug.Conn.fetch_query_params(conn)
- conn_2 = conn(:get, "/?id=2")
+ conn_2 =
build_
conn(:get, "/?id=2")
RateLimiter.call(conn, plug_opts)
assert {1, 4} = RateLimiter.inspect_bucket(conn, limiter_name, plug_opts)
RateLimiter.call(conn, plug_opts)
assert {1, 4} = RateLimiter.inspect_bucket(conn, limiter_name, plug_opts)
@@
-120,9
+118,9
@@
defmodule Pleroma.Plugs.RateLimiterTest do
id = "100"
id = "100"
- conn = conn(:get, "/?id=#{id}")
+ conn =
build_
conn(:get, "/?id=#{id}")
conn = Plug.Conn.fetch_query_params(conn)
conn = Plug.Conn.fetch_query_params(conn)
- conn_2 = conn(:get, "/?id=#{101}")
+ conn_2 =
build_
conn(:get, "/?id=#{101}")
RateLimiter.call(conn, plug_opts)
assert {1, 4} = RateLimiter.inspect_bucket(conn, base_bucket_name, plug_opts)
RateLimiter.call(conn, plug_opts)
assert {1, 4} = RateLimiter.inspect_bucket(conn, base_bucket_name, plug_opts)
@@
-138,8
+136,8
@@
defmodule Pleroma.Plugs.RateLimiterTest do
plug_opts = RateLimiter.init(name: limiter_name)
plug_opts = RateLimiter.init(name: limiter_name)
- conn = %{conn(:get, "/") | remote_ip: {127, 0, 0, 2}}
- conn_2 = %{conn(:get, "/") | remote_ip: {127, 0, 0, 3}}
+ conn = %{
build_
conn(:get, "/") | remote_ip: {127, 0, 0, 2}}
+ conn_2 = %{
build_
conn(:get, "/") | remote_ip: {127, 0, 0, 3}}
for i <- 1..5 do
conn = RateLimiter.call(conn, plug_opts)
for i <- 1..5 do
conn = RateLimiter.call(conn, plug_opts)
@@
-179,7
+177,7
@@
defmodule Pleroma.Plugs.RateLimiterTest do
plug_opts = RateLimiter.init(name: limiter_name)
user = insert(:user)
plug_opts = RateLimiter.init(name: limiter_name)
user = insert(:user)
- conn = conn(:get, "/") |> assign(:user, user)
+ conn =
build_
conn(:get, "/") |> assign(:user, user)
for i <- 1..5 do
conn = RateLimiter.call(conn, plug_opts)
for i <- 1..5 do
conn = RateLimiter.call(conn, plug_opts)
@@
-201,10
+199,10
@@
defmodule Pleroma.Plugs.RateLimiterTest do
plug_opts = RateLimiter.init(name: limiter_name)
user = insert(:user)
plug_opts = RateLimiter.init(name: limiter_name)
user = insert(:user)
- conn = conn(:get, "/") |> assign(:user, user)
+ conn =
build_
conn(:get, "/") |> assign(:user, user)
user_2 = insert(:user)
user_2 = insert(:user)
- conn_2 = conn(:get, "/") |> assign(:user, user_2)
+ conn_2 =
build_
conn(:get, "/") |> assign(:user, user_2)
for i <- 1..5 do
conn = RateLimiter.call(conn, plug_opts)
for i <- 1..5 do
conn = RateLimiter.call(conn, plug_opts)
@@
-230,8
+228,8
@@
defmodule Pleroma.Plugs.RateLimiterTest do
opts = RateLimiter.init(name: limiter_name)
opts = RateLimiter.init(name: limiter_name)
- conn = conn(:get, "/")
- conn_2 = conn(:get, "/")
+ conn =
build_
conn(:get, "/")
+ conn_2 =
build_
conn(:get, "/")
%Task{pid: pid1} =
task1 =
%Task{pid: pid1} =
task1 =