projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3be8ab5
)
RateLimiter module name
author
Alexander Strizhakov
<alex.strizhakov@gmail.com>
Wed, 24 Jun 2020 06:35:00 +0000
(09:35 +0300)
committer
Alexander Strizhakov
<alex.strizhakov@gmail.com>
Tue, 13 Oct 2020 13:43:53 +0000
(16:43 +0300)
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
patch
|
blob
|
history
lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
patch
|
blob
|
history
lib/pleroma/web/mastodon_api/controllers/search_controller.ex
patch
|
blob
|
history
lib/pleroma/web/mastodon_api/controllers/status_controller.ex
patch
|
blob
|
history
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
patch
|
blob
|
history
lib/pleroma/web/mongoose_im/mongoose_im_controller.ex
patch
|
blob
|
history
lib/pleroma/web/o_auth/o_auth_controller.ex
patch
|
blob
|
history
lib/pleroma/web/o_status/o_status_controller.ex
patch
|
blob
|
history
lib/pleroma/web/pleroma_api/controllers/account_controller.ex
patch
|
blob
|
history
lib/pleroma/web/plugs/rate_limiter.ex
patch
|
blob
|
history
test/pleroma/web/plugs/rate_limiter_test.exs
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
index 95d8452df0447f08c540d2b5a8cbbb0a7b81958c..0d9dfb8278d530f2bf9a601f2fd9f7daa61efb13 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
@@
-17,7
+17,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountController do
alias Pleroma.Maps
alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Maps
alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Plugs.OAuthScopesPlug
- alias Pleroma.Plugs.RateLimiter
+ alias Pleroma.
Web.
Plugs.RateLimiter
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Builder
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Builder
diff --git
a/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
index 57c0be5fea166463b652d9683e3ca4c8684271e2..75b809aabf7c1767a64f05c38387130a92ea8ee0 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
@@
-15,7
+15,7
@@
defmodule Pleroma.Web.MastodonAPI.AuthController do
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
- plug(Pleroma.Plugs.RateLimiter, [name: :password_reset] when action == :password_reset)
+ plug(Pleroma.
Web.
Plugs.RateLimiter, [name: :password_reset] when action == :password_reset)
@local_mastodon_name "Mastodon-Local"
@local_mastodon_name "Mastodon-Local"
diff --git
a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex
index 5a983db3994509ccc133decf6afe53a09a1f161f..d5afac981f52847a7584e715a3541477e07cdc44 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/search_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/search_controller.ex
@@
-7,7
+7,7
@@
defmodule Pleroma.Web.MastodonAPI.SearchController do
alias Pleroma.Activity
alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Activity
alias Pleroma.Plugs.OAuthScopesPlug
- alias Pleroma.Plugs.RateLimiter
+ alias Pleroma.
Web.
Plugs.RateLimiter
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web
diff --git
a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
index ecfa38489837eadae7b299324fb6ebe8cf60dbc2..6c1ac9458391d56da402230a0bc1a3b17d55cd57 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/status_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/status_controller.ex
@@
-14,7
+14,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusController do
alias Pleroma.Bookmark
alias Pleroma.Object
alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Bookmark
alias Pleroma.Object
alias Pleroma.Plugs.OAuthScopesPlug
- alias Pleroma.Plugs.RateLimiter
+ alias Pleroma.
Web.
Plugs.RateLimiter
alias Pleroma.Repo
alias Pleroma.ScheduledActivity
alias Pleroma.User
alias Pleroma.Repo
alias Pleroma.ScheduledActivity
alias Pleroma.User
diff --git
a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
index 5272790d3149ad286ac10968ab263a59b6544403..cc410d4f41b0b34bfd36f95446a1d42b93c6cc47 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
@@
-12,7
+12,7
@@
defmodule Pleroma.Web.MastodonAPI.TimelineController do
alias Pleroma.Pagination
alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Pagination
alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Plugs.OAuthScopesPlug
- alias Pleroma.Plugs.RateLimiter
+ alias Pleroma.
Web.
Plugs.RateLimiter
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
diff --git
a/lib/pleroma/web/mongoose_im/mongoose_im_controller.ex
b/lib/pleroma/web/mongoose_im/mongoose_im_controller.ex
index 6cbbe8fd8dbb7ea1f879f4686a4a955f7671073e..42cf5a85f3b271a32db0637f15cf4a87142d83e6 100644
(file)
--- a/
lib/pleroma/web/mongoose_im/mongoose_im_controller.ex
+++ b/
lib/pleroma/web/mongoose_im/mongoose_im_controller.ex
@@
-6,7
+6,7
@@
defmodule Pleroma.Web.MongooseIM.MongooseIMController do
use Pleroma.Web, :controller
alias Pleroma.Plugs.AuthenticationPlug
use Pleroma.Web, :controller
alias Pleroma.Plugs.AuthenticationPlug
- alias Pleroma.Plugs.RateLimiter
+ alias Pleroma.
Web.
Plugs.RateLimiter
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Repo
alias Pleroma.User
diff --git
a/lib/pleroma/web/o_auth/o_auth_controller.ex
b/lib/pleroma/web/o_auth/o_auth_controller.ex
index a4152e84090426b8e396e1f10f4a68d3d6611baf..a57e2bef4105f863e6c0a4b0bb60a4911bf403b9 100644
(file)
--- a/
lib/pleroma/web/o_auth/o_auth_controller.ex
+++ b/
lib/pleroma/web/o_auth/o_auth_controller.ex
@@
-8,7
+8,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
alias Pleroma.Helpers.UriHelper
alias Pleroma.Maps
alias Pleroma.MFA
alias Pleroma.Helpers.UriHelper
alias Pleroma.Maps
alias Pleroma.MFA
- alias Pleroma.Plugs.RateLimiter
+ alias Pleroma.
Web.
Plugs.RateLimiter
alias Pleroma.Registration
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Registration
alias Pleroma.Repo
alias Pleroma.User
diff --git
a/lib/pleroma/web/o_status/o_status_controller.ex
b/lib/pleroma/web/o_status/o_status_controller.ex
index d4d095a754defe13e75e66fcde4af2ecff925b3b..5bd767c96a95e4cc5d957ac5e73dda086ab03ae8 100644
(file)
--- a/
lib/pleroma/web/o_status/o_status_controller.ex
+++ b/
lib/pleroma/web/o_status/o_status_controller.ex
@@
-7,7
+7,7
@@
defmodule Pleroma.Web.OStatus.OStatusController do
alias Pleroma.Activity
alias Pleroma.Object
alias Pleroma.Activity
alias Pleroma.Object
- alias Pleroma.Plugs.RateLimiter
+ alias Pleroma.
Web.
Plugs.RateLimiter
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPubController
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPubController
alias Pleroma.Web.ActivityPub.Visibility
diff --git
a/lib/pleroma/web/pleroma_api/controllers/account_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/account_controller.ex
index 563edded70d0bcf32513fbbaab293faa3488e844..d228a875e637b50650c19a16c69ecb284fe1b3bb 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/account_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/account_controller.ex
@@
-10,7
+10,7
@@
defmodule Pleroma.Web.PleromaAPI.AccountController do
alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Plugs.OAuthScopesPlug
- alias Pleroma.Plugs.RateLimiter
+ alias Pleroma.
Web.
Plugs.RateLimiter
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.MastodonAPI.StatusView
diff --git
a/lib/pleroma/web/plugs/rate_limiter.ex
b/lib/pleroma/web/plugs/rate_limiter.ex
index d4a707675066989a8a49f775a3c95751b396ad5a..669c399c98bc24d0dd4d7b58516719fa3822e2ee 100644
(file)
--- a/
lib/pleroma/web/plugs/rate_limiter.ex
+++ b/
lib/pleroma/web/plugs/rate_limiter.ex
@@
-2,7
+2,7
@@
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
-defmodule Pleroma.Plugs.RateLimiter do
+defmodule Pleroma.
Web.
Plugs.RateLimiter do
@moduledoc """
## Configuration
@moduledoc """
## Configuration
@@
-35,8
+35,8
@@
defmodule Pleroma.Plugs.RateLimiter do
AllowedSyntax:
AllowedSyntax:
- plug(Pleroma.Plugs.RateLimiter, name: :limiter_name)
- plug(Pleroma.Plugs.RateLimiter, options) # :name is a required option
+ plug(Pleroma.
Web.
Plugs.RateLimiter, name: :limiter_name)
+ plug(Pleroma.
Web.
Plugs.RateLimiter, options) # :name is a required option
Allowed options:
Allowed options:
@@
-46,11
+46,11
@@
defmodule Pleroma.Plugs.RateLimiter do
Inside a controller:
Inside a controller:
- plug(Pleroma.Plugs.RateLimiter, [name: :one] when action == :one)
- plug(Pleroma.Plugs.RateLimiter, [name: :two] when action in [:two, :three])
+ plug(Pleroma.
Web.
Plugs.RateLimiter, [name: :one] when action == :one)
+ plug(Pleroma.
Web.
Plugs.RateLimiter, [name: :two] when action in [:two, :three])
plug(
plug(
- Pleroma.Plugs.RateLimiter,
+ Pleroma.
Web.
Plugs.RateLimiter,
[name: :status_id_action, bucket_name: "status_id_action:fav_unfav", params: ["id"]]
when action in ~w(fav_status unfav_status)a
)
[name: :status_id_action, bucket_name: "status_id_action:fav_unfav", params: ["id"]]
when action in ~w(fav_status unfav_status)a
)
@@
-59,7
+59,7
@@
defmodule Pleroma.Plugs.RateLimiter do
pipeline :api do
...
pipeline :api do
...
- plug(Pleroma.Plugs.RateLimiter, name: :one)
+ plug(Pleroma.
Web.
Plugs.RateLimiter, name: :one)
...
end
"""
...
end
"""
diff --git
a/test/pleroma/web/plugs/rate_limiter_test.exs
b/test/pleroma/web/plugs/rate_limiter_test.exs
index 7c10c97b3f1eeb4ff8b45d245067ef56ebd10c31..249c78b3757b7ba562383ec011d530e531d65716 100644
(file)
--- a/
test/pleroma/web/plugs/rate_limiter_test.exs
+++ b/
test/pleroma/web/plugs/rate_limiter_test.exs
@@
-7,7
+7,7
@@
defmodule Pleroma.Web.Plugs.RateLimiterTest do
alias Phoenix.ConnTest
alias Pleroma.Config
alias Phoenix.ConnTest
alias Pleroma.Config
- alias Pleroma.Plugs.RateLimiter
+ alias Pleroma.
Web.
Plugs.RateLimiter
alias Plug.Conn
import Pleroma.Factory
alias Plug.Conn
import Pleroma.Factory