Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
64679a0d
Commit
64679a0d
authored
May 29, 2018
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport of
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5876
parent
4af756e5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
config/initializers/rack_attack_global.rb
config/initializers/rack_attack_global.rb
+5
-1
No files found.
config/initializers/rack_attack_global.rb
View file @
64679a0d
...
@@ -26,7 +26,7 @@ class Rack::Attack
...
@@ -26,7 +26,7 @@ class Rack::Attack
throttle
(
'throttle_unauthenticated'
,
Gitlab
::
Throttle
.
unauthenticated_options
)
do
|
req
|
throttle
(
'throttle_unauthenticated'
,
Gitlab
::
Throttle
.
unauthenticated_options
)
do
|
req
|
Gitlab
::
Throttle
.
settings
.
throttle_unauthenticated_enabled
&&
Gitlab
::
Throttle
.
settings
.
throttle_unauthenticated_enabled
&&
req
.
unauthenticated?
&&
req
.
unauthenticated?
&&
!
req
.
api_internal_request
?
&&
!
req
.
should_be_skipped
?
&&
req
.
ip
req
.
ip
end
end
...
@@ -59,6 +59,10 @@ class Rack::Attack
...
@@ -59,6 +59,10 @@ class Rack::Attack
path
=~
%r{^/api/v
\d
+/internal/}
path
=~
%r{^/api/v
\d
+/internal/}
end
end
def
should_be_skipped?
api_internal_request?
end
def
web_request?
def
web_request?
!
api_request?
!
api_request?
end
end
...
...
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