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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
f3e10283
Commit
f3e10283
authored
Jul 07, 2018
by
Brett Walker
Committed by
Stan Hu
Jul 07, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor rspec matchers in read_only_spec.rb
parent
06e3ea7a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
33 deletions
+27
-33
lib/gitlab/middleware/read_only/controller.rb
lib/gitlab/middleware/read_only/controller.rb
+1
-0
spec/lib/gitlab/middleware/read_only_spec.rb
spec/lib/gitlab/middleware/read_only_spec.rb
+11
-33
spec/support/matchers/disallow_request_matchers.rb
spec/support/matchers/disallow_request_matchers.rb
+15
-0
No files found.
lib/gitlab/middleware/read_only/controller.rb
View file @
f3e10283
...
...
@@ -69,6 +69,7 @@ module Gitlab
@route_hash
||=
Rails
.
application
.
routes
.
recognize_path
(
request
.
url
,
{
method:
request
.
request_method
})
rescue
{}
end
# Overridden in EE module
def
whitelisted_routes
grack_route
||
ReadOnly
.
internal_routes
.
any?
{
|
path
|
request
.
path
.
include?
(
path
)
}
||
lfs_route
||
sidekiq_route
end
...
...
spec/lib/gitlab/middleware/read_only_spec.rb
View file @
f3e10283
...
...
@@ -4,28 +4,6 @@ describe Gitlab::Middleware::ReadOnly do
include
Rack
::
Test
::
Methods
using
RSpec
::
Parameterized
::
TableSyntax
RSpec
::
Matchers
.
define
:be_a_redirect
do
match
do
|
response
|
response
.
status
==
301
end
end
RSpec
::
Matchers
.
define
:disallow_request
do
match
do
|
middleware
|
alert
=
middleware
.
env
[
'rack.session'
].
to_hash
.
dig
(
'flash'
,
'flashes'
,
'alert'
)
alert
&
.
include?
(
'You cannot perform write operations'
)
end
end
RSpec
::
Matchers
.
define
:disallow_request_in_json
do
match
do
|
response
|
json_response
=
JSON
.
parse
(
response
.
body
)
response
.
body
.
include?
(
'You cannot perform write operations'
)
&&
json_response
.
key?
(
'message'
)
end
end
let
(
:rack_stack
)
do
rack
=
Rack
::
Builder
.
new
do
use
ActionDispatch
::
Session
::
CacheStore
...
...
@@ -66,38 +44,38 @@ describe Gitlab::Middleware::ReadOnly do
it
'expects PATCH requests to be disallowed'
do
response
=
request
.
patch
(
'/test_request'
)
expect
(
response
).
to
be_
a_
redirect
expect
(
response
).
to
be_redirect
expect
(
subject
).
to
disallow_request
end
it
'expects PUT requests to be disallowed'
do
response
=
request
.
put
(
'/test_request'
)
expect
(
response
).
to
be_
a_
redirect
expect
(
response
).
to
be_redirect
expect
(
subject
).
to
disallow_request
end
it
'expects POST requests to be disallowed'
do
response
=
request
.
post
(
'/test_request'
)
expect
(
response
).
to
be_
a_
redirect
expect
(
response
).
to
be_redirect
expect
(
subject
).
to
disallow_request
end
it
'expects a internal POST request to be allowed after a disallowed request'
do
response
=
request
.
post
(
'/test_request'
)
expect
(
response
).
to
be_
a_
redirect
expect
(
response
).
to
be_redirect
response
=
request
.
post
(
"/api/
#{
API
::
API
.
version
}
/internal"
)
expect
(
response
).
not_to
be_
a_
redirect
expect
(
response
).
not_to
be_redirect
end
it
'expects DELETE requests to be disallowed'
do
response
=
request
.
delete
(
'/test_request'
)
expect
(
response
).
to
be_
a_
redirect
expect
(
response
).
to
be_redirect
expect
(
subject
).
to
disallow_request
end
...
...
@@ -105,7 +83,7 @@ describe Gitlab::Middleware::ReadOnly do
expect
(
Rails
.
application
.
routes
).
to
receive
(
:recognize_path
).
and_call_original
response
=
request
.
post
(
'/root/gitlab-ce/new/master/app/info/lfs/objects/batch'
)
expect
(
response
).
to
be_
a_
redirect
expect
(
response
).
to
be_redirect
expect
(
subject
).
to
disallow_request
end
...
...
@@ -120,19 +98,19 @@ describe Gitlab::Middleware::ReadOnly do
expect
(
Rails
.
application
.
routes
).
not_to
receive
(
:recognize_path
)
response
=
request
.
post
(
"/api/
#{
API
::
API
.
version
}
/internal"
)
expect
(
response
).
not_to
be_
a_
redirect
expect
(
response
).
not_to
be_redirect
expect
(
subject
).
not_to
disallow_request
end
it
'expects requests to sidekiq admin to be allowed'
do
response
=
request
.
post
(
'/admin/sidekiq'
)
expect
(
response
).
not_to
be_
a_
redirect
expect
(
response
).
not_to
be_redirect
expect
(
subject
).
not_to
disallow_request
response
=
request
.
get
(
'/admin/sidekiq'
)
expect
(
response
).
not_to
be_
a_
redirect
expect
(
response
).
not_to
be_redirect
expect
(
subject
).
not_to
disallow_request
end
...
...
@@ -150,7 +128,7 @@ describe Gitlab::Middleware::ReadOnly do
expect
(
Rails
.
application
.
routes
).
to
receive
(
:recognize_path
).
and_call_original
response
=
request
.
post
(
path
)
expect
(
response
).
not_to
be_
a_
redirect
expect
(
response
).
not_to
be_redirect
expect
(
subject
).
not_to
disallow_request
end
end
...
...
spec/support/matchers/disallow_request_matchers.rb
0 → 100644
View file @
f3e10283
RSpec
::
Matchers
.
define
:disallow_request
do
match
do
|
middleware
|
alert
=
middleware
.
env
[
'rack.session'
].
to_hash
.
dig
(
'flash'
,
'flashes'
,
'alert'
)
alert
&
.
include?
(
'You cannot perform write operations'
)
end
end
RSpec
::
Matchers
.
define
:disallow_request_in_json
do
match
do
|
response
|
json_response
=
JSON
.
parse
(
response
.
body
)
response
.
body
.
include?
(
'You cannot perform write operations'
)
&&
json_response
.
key?
(
'message'
)
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