diff options
| author | Adam Niedzielski <adamsunday@gmail.com> | 2017-03-17 17:03:09 +0100 |
|---|---|---|
| committer | Adam Niedzielski <adamsunday@gmail.com> | 2017-03-17 17:03:09 +0100 |
| commit | 6342da7bb6cbba1b1e026fc62a1da42b811b25f4 (patch) | |
| tree | 2415a8bf108408785a4096b201efe3f007ed06df /lib | |
| parent | 0815c7e6b36a0d1c533739c7e40cc0ebb3d30b6b (diff) | |
| download | gitlab-ce-6342da7bb6cbba1b1e026fc62a1da42b811b25f4.tar.gz | |
Make regexp more strict
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/etag_caching/middleware.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/etag_caching/middleware.rb b/lib/gitlab/etag_caching/middleware.rb index 987b7288db8..5671fa21219 100644 --- a/lib/gitlab/etag_caching/middleware.rb +++ b/lib/gitlab/etag_caching/middleware.rb @@ -1,10 +1,10 @@ module Gitlab module EtagCaching class Middleware - RESERVED_WORDS = ProjectPathValidator::RESERVED.map { |word| "/#{word}/" }.join('|') + RESERVED_WORDS = NamespaceValidator::WILDCARD_ROUTES.map { |word| "/#{word}/" }.join('|') ROUTE_REGEXP = Regexp.union( %r(^(?!.*(#{RESERVED_WORDS})).*/noteable/issue/\d+/notes\z), - %r(/issues/\d+/rendered_title\z) + %r(^(?!.*(#{RESERVED_WORDS})).*/issues/\d+/rendered_title\z) ) def initialize(app) |