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
Tatuya Kamada
gitlab-ce
Commits
dfe0f9ee
Commit
dfe0f9ee
authored
Mar 24, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use more specific regexes.
parent
3f7531d6
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
48 additions
and
44 deletions
+48
-44
app/models/namespace.rb
app/models/namespace.rb
+4
-4
app/models/project.rb
app/models/project.rb
+3
-3
app/models/snippet.rb
app/models/snippet.rb
+2
-2
app/models/user.rb
app/models/user.rb
+2
-2
app/services/files/create_service.rb
app/services/files/create_service.rb
+2
-2
lib/gitlab/regex.rb
lib/gitlab/regex.rb
+34
-30
spec/requests/api/projects_spec.rb
spec/requests/api/projects_spec.rb
+1
-1
No files found.
app/models/namespace.rb
View file @
dfe0f9ee
...
...
@@ -24,8 +24,8 @@ class Namespace < ActiveRecord::Base
validates
:name
,
presence:
true
,
uniqueness:
true
,
length:
{
within:
0
..
255
},
format:
{
with:
Gitlab
::
Regex
.
name_regex
,
message:
Gitlab
::
Regex
.
name_regex_message
}
format:
{
with:
Gitlab
::
Regex
.
name
space_name
_regex
,
message:
Gitlab
::
Regex
.
name
space_name
_regex_message
}
validates
:description
,
length:
{
within:
0
..
255
}
validates
:path
,
...
...
@@ -33,8 +33,8 @@ class Namespace < ActiveRecord::Base
presence:
true
,
length:
{
within:
1
..
255
},
exclusion:
{
in:
Gitlab
::
Blacklist
.
path
},
format:
{
with:
Gitlab
::
Regex
.
path
_regex
,
message:
Gitlab
::
Regex
.
path
_regex_message
}
format:
{
with:
Gitlab
::
Regex
.
namespace
_regex
,
message:
Gitlab
::
Regex
.
namespace
_regex_message
}
delegate
:name
,
to: :owner
,
allow_nil:
true
,
prefix:
true
...
...
app/models/project.rb
View file @
dfe0f9ee
...
...
@@ -124,12 +124,12 @@ class Project < ActiveRecord::Base
presence:
true
,
length:
{
within:
0
..
255
},
format:
{
with:
Gitlab
::
Regex
.
project_name_regex
,
message:
Gitlab
::
Regex
.
project_regex_message
}
message:
Gitlab
::
Regex
.
project_
name_
regex_message
}
validates
:path
,
presence:
true
,
length:
{
within:
0
..
255
},
format:
{
with:
Gitlab
::
Regex
.
path_regex
,
message:
Gitlab
::
Regex
.
path_regex_message
}
format:
{
with:
Gitlab
::
Regex
.
p
roject_p
ath_regex
,
message:
Gitlab
::
Regex
.
p
roject_p
ath_regex_message
}
validates
:issues_enabled
,
:merge_requests_enabled
,
:wiki_enabled
,
inclusion:
{
in:
[
true
,
false
]
}
validates
:issues_tracker_id
,
length:
{
maximum:
255
},
allow_blank:
true
...
...
app/models/snippet.rb
View file @
dfe0f9ee
...
...
@@ -33,8 +33,8 @@ class Snippet < ActiveRecord::Base
validates
:file_name
,
presence:
true
,
length:
{
within:
0
..
255
},
format:
{
with:
Gitlab
::
Regex
.
path
_regex
,
message:
Gitlab
::
Regex
.
path
_regex_message
}
format:
{
with:
Gitlab
::
Regex
.
file_name
_regex
,
message:
Gitlab
::
Regex
.
file_name
_regex_message
}
validates
:content
,
presence:
true
validates
:visibility_level
,
inclusion:
{
in:
Gitlab
::
VisibilityLevel
.
values
}
...
...
app/models/user.rb
View file @
dfe0f9ee
...
...
@@ -129,8 +129,8 @@ class User < ActiveRecord::Base
presence:
true
,
uniqueness:
{
case_sensitive:
false
},
exclusion:
{
in:
Gitlab
::
Blacklist
.
path
},
format:
{
with:
Gitlab
::
Regex
.
usernam
e_regex
,
message:
Gitlab
::
Regex
.
usernam
e_regex_message
}
format:
{
with:
Gitlab
::
Regex
.
namespac
e_regex
,
message:
Gitlab
::
Regex
.
namespac
e_regex_message
}
validates
:notification_level
,
inclusion:
{
in:
Notification
.
notification_levels
},
presence:
true
validate
:namespace_uniq
,
if:
->
(
user
)
{
user
.
username_changed?
}
...
...
app/services/files/create_service.rb
View file @
dfe0f9ee
...
...
@@ -12,10 +12,10 @@ module Files
file_name
=
File
.
basename
(
path
)
file_path
=
path
unless
file_name
=~
Gitlab
::
Regex
.
path
_regex
unless
file_name
=~
Gitlab
::
Regex
.
file_name
_regex
return
error
(
'Your changes could not be committed, because the file name '
+
Gitlab
::
Regex
.
path
_regex_message
Gitlab
::
Regex
.
file_name
_regex_message
)
end
...
...
lib/gitlab/regex.rb
View file @
dfe0f9ee
...
...
@@ -2,49 +2,64 @@ module Gitlab
module
Regex
extend
self
def
usernam
e_regex
default_regex
def
namespac
e_regex
@namespace_regex
||=
/\A[a-zA-Z0-9_.][a-zA-Z0-9_\-\.]*(?<!\.git)\z/
.
freeze
end
def
username_regex_message
default_regex_message
def
namespace_regex_message
"can contain only letters, digits, '_', '-' and '.'. "
\
"Cannot start with '-' or end in '.git'"
\
end
def
namespace_name_regex
@namespace_name_regex
||=
/\A[a-zA-Z0-9_\-\. ]*\z/
.
freeze
end
def
namespace_name_regex_message
"can contain only letters, digits, '_', '-', '.' and space."
end
def
project_name_regex
/\A[a-zA-Z0-9_.][a-zA-Z0-9_\-\. ]*\z/
@project_name_regex
||=
/\A[a-zA-Z0-9_.][a-zA-Z0-9_\-\. ]*\z/
.
freeze
end
def
project_regex_message
"can contain only letters, digits, '_', '-'
and
'.' and space. "
\
def
project_
name_
regex_message
"can contain only letters, digits, '_', '-'
,
'.' and space. "
\
"It must start with letter, digit or '_'."
end
def
name_regex
/\A[a-zA-Z0-9_\-\. ]*\z/
def
project_path_regex
@project_path_regex
||=
/\A[a-zA-Z0-9_.][a-zA-Z0-9_\-\.]*(?<!\.git)\z/
.
freeze
end
def
name_regex_message
"can contain only letters, digits, '_', '-' and '.' and space."
def
project_path_regex_message
"can contain only letters, digits, '_', '-' and '.'. "
\
"Cannot start with '-' or end in '.git'"
\
end
def
path_regex
default_regex
def
file_name_regex
@file_name_regex
||=
/\A[a-zA-Z0-9_\-\.]*\z/
.
freeze
end
def
path
_regex_message
default_regex_message
def
file_name
_regex_message
"can contain only letters, digits, '_', '-' and '.'. "
end
def
archive_formats_regex
#|zip|tar| tar.gz | tar.bz2 |
/(zip|tar|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)/
#
|zip|tar| tar.gz | tar.bz2 |
@archive_formats_regex
||=
/(zip|tar|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)/
.
freeze
end
def
git_reference_regex
# Valid git ref regex, see:
# https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html
%r{
@git_reference_regex
||=
%r{
(?!
(?# doesn't begins with)
\/
| (?# rule #6)
...
...
@@ -60,18 +75,7 @@ module Gitlab
(?# doesn't end with)
(?<!
\.
lock) (?# rule #1)
(?<![
\/
.]) (?# rule #6-7)
}x
end
protected
def
default_regex_message
"can contain only letters, digits, '_', '-' and '.'. "
\
"Cannot start with '-' or end in '.git'"
\
end
def
default_regex
/\A[a-zA-Z0-9_.][a-zA-Z0-9_\-\.]*(?<!\.git)\z/
}x
.
freeze
end
end
end
spec/requests/api/projects_spec.rb
View file @
dfe0f9ee
...
...
@@ -247,7 +247,7 @@ describe API::API, api: true do
expect
(
json_response
[
'message'
][
'name'
]).
to
eq
([
'can\'t be blank'
,
'is too short (minimum is 0 characters)'
,
Gitlab
::
Regex
.
project_regex_message
Gitlab
::
Regex
.
project_
name_
regex_message
])
expect
(
json_response
[
'message'
][
'path'
]).
to
eq
([
'can\'t be blank'
,
...
...
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