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
536f2bdf
Commit
536f2bdf
authored
7 years ago
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add forbidden paths to the namespace validator
parent
f76a5abb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
1 deletion
+42
-1
app/validators/namespace_validator.rb
app/validators/namespace_validator.rb
+13
-1
spec/validators/namespace_validator_spec.rb
spec/validators/namespace_validator_spec.rb
+29
-0
No files found.
app/validators/namespace_validator.rb
View file @
536f2bdf
...
@@ -53,7 +53,19 @@ class NamespaceValidator < ActiveModel::EachValidator
...
@@ -53,7 +53,19 @@ class NamespaceValidator < ActiveModel::EachValidator
WILDCARD_ROUTES
=
%w[tree commits wikis new edit create update logs_tree
WILDCARD_ROUTES
=
%w[tree commits wikis new edit create update logs_tree
preview blob blame raw files create_dir find_file
preview blob blame raw files create_dir find_file
artifacts graphs refs badges]
.
freeze
artifacts graphs refs badges info git-upload-pack
git-receive-pack gitlab-lfs autocomplete_sources
templates avatar commit pages compare network snippets
services mattermost deploy_keys forks import merge_requests
branches merged_branches tags protected_branches variables
triggers pipelines environments cycle_analytics builds
hooks container_registry milestones labels issues
project_members group_links notes noteable boards todos
uploads runners runner_projects settings repository
transfer remove_fork archive unarchive housekeeping
toggle_star preview_markdown export remove_export
generate_new_export download_export activity
new_issue_address registry]
.
freeze
STRICT_RESERVED
=
(
RESERVED
+
WILDCARD_ROUTES
).
freeze
STRICT_RESERVED
=
(
RESERVED
+
WILDCARD_ROUTES
).
freeze
...
...
This diff is collapsed.
Click to expand it.
spec/validators/namespace_validator_spec.rb
0 → 100644
View file @
536f2bdf
require
'spec_helper'
describe
NamespaceValidator
do
describe
'RESERVED'
do
it
'includes all the top level namespaces'
do
all_top_level_routes
=
Rails
.
application
.
routes
.
routes
.
routes
.
map
{
|
r
|
r
.
path
.
spec
.
to_s
}.
select
{
|
p
|
p
!~
%r{^/[:*]}
}.
map
{
|
p
|
p
.
split
(
'/'
)[
1
]
}.
compact
.
map
{
|
p
|
p
.
split
(
'('
,
2
)[
0
]
}.
uniq
expect
(
described_class
::
RESERVED
).
to
include
(
*
all_top_level_routes
)
end
end
describe
'WILDCARD_ROUTES'
do
it
'includes all paths that can be used after a namespace/project path'
do
all_wildcard_paths
=
Rails
.
application
.
routes
.
routes
.
routes
.
map
{
|
r
|
r
.
path
.
spec
.
to_s
}.
select
{
|
p
|
p
=~
%r{^/
\*
namespace_id/:(project_)?id/[^:*]}
}.
map
{
|
p
|
p
.
split
(
'/'
)[
3
].
split
(
'('
,
2
)[
0
]
}.
uniq
expect
(
described_class
::
WILDCARD_ROUTES
).
to
include
(
*
all_wildcard_paths
)
end
end
end
This diff is collapsed.
Click to expand it.
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