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
Boxiang Sun
gitlab-ce
Commits
0ce63efe
Commit
0ce63efe
authored
May 17, 2018
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add extended /regexp/ scheme support to untrusted regexp
parent
f52de2f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
71 additions
and
1 deletion
+71
-1
lib/gitlab/untrusted_regexp.rb
lib/gitlab/untrusted_regexp.rb
+23
-0
spec/lib/gitlab/untrusted_regexp_spec.rb
spec/lib/gitlab/untrusted_regexp_spec.rb
+48
-1
No files found.
lib/gitlab/untrusted_regexp.rb
View file @
0ce63efe
...
@@ -9,6 +9,8 @@ module Gitlab
...
@@ -9,6 +9,8 @@ module Gitlab
# there is a strict limit on total execution time. See the RE2 documentation
# there is a strict limit on total execution time. See the RE2 documentation
# at https://github.com/google/re2/wiki/Syntax for more details.
# at https://github.com/google/re2/wiki/Syntax for more details.
class
UntrustedRegexp
class
UntrustedRegexp
require_dependency
're2'
delegate
:===
,
:source
,
to: :regexp
delegate
:===
,
:source
,
to: :regexp
def
initialize
(
pattern
,
multiline:
false
)
def
initialize
(
pattern
,
multiline:
false
)
...
@@ -52,6 +54,27 @@ module Gitlab
...
@@ -52,6 +54,27 @@ module Gitlab
Regexp
.
new
(
pattern
)
Regexp
.
new
(
pattern
)
end
end
def
self
.
valid?
(
pattern
)
self
.
fabricate
(
pattern
)
rescue
RegexpError
false
end
def
self
.
fabricate
(
pattern
)
matches
=
pattern
.
match
(
%r{^/(?<regexp>.+)/(?<flags>[ismU]*)$}
)
if
matches
expression
=
matches
[
:regexp
]
flags
=
matches
[
:flags
]
expression
.
prepend
(
"(?
#{
flags
}
)"
)
if
flags
.
present?
self
.
new
(
expression
,
multiline:
false
)
else
self
.
new
(
pattern
,
multiline:
false
)
end
end
private
private
attr_reader
:regexp
attr_reader
:regexp
...
...
spec/lib/gitlab/untrusted_regexp_spec.rb
View file @
0ce63efe
require
'spec_helper'
require
'fast_spec_helper'
require
'support/shared_examples/malicious_regexp_shared_examples'
describe
Gitlab
::
UntrustedRegexp
do
describe
Gitlab
::
UntrustedRegexp
do
describe
'.valid?'
do
it
'returns true if regexp is valid'
do
end
it
'returns true if regexp is invalid'
do
end
end
describe
'.fabricate'
do
context
'when regexp is using /regexp/ scheme with flags'
do
it
'fabricates regexp with a single flag'
do
regexp
=
described_class
.
fabricate
(
'/something/i'
)
expect
(
regexp
).
to
eq
described_class
.
new
(
'(?i)something'
)
expect
(
regexp
.
scan
(
'SOMETHING'
)).
to
be_one
end
it
'fabricates regexp with multiple flags'
do
regexp
=
described_class
.
fabricate
(
'/something/im'
)
expect
(
regexp
).
to
eq
described_class
.
new
(
'(?im)something'
)
end
it
'fabricates regexp without flags'
do
regexp
=
described_class
.
fabricate
(
'/something/'
)
expect
(
regexp
).
to
eq
described_class
.
new
(
'something'
)
end
end
context
'when regexp is not plain pattern'
do
it
'fabricates regexp without flags'
do
regexp
=
described_class
.
fabricate
(
'something'
)
expect
(
regexp
).
to
eq
described_class
.
new
(
'something'
)
end
end
context
'when regexp is invalid'
do
it
'raises an error'
do
expect
{
described_class
.
fabricate
(
'/some ( thing/'
)
}
.
to
raise_error
(
RegexpError
)
end
end
end
describe
'#initialize'
do
describe
'#initialize'
do
subject
{
described_class
.
new
(
pattern
)
}
subject
{
described_class
.
new
(
pattern
)
}
...
...
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