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
8070454c
Commit
8070454c
authored
Nov 25, 2020
by
Guillaume Grossetie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve Kroki URL validation
parent
03bf6b38
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
app/models/application_setting.rb
app/models/application_setting.rb
+7
-6
No files found.
app/models/application_setting.rb
View file @
8070454c
...
...
@@ -132,11 +132,7 @@ class ApplicationSetting < ApplicationRecord
if: :unique_ips_limit_enabled
validates
:kroki_url
,
system_hook_url:
{
blocked_message:
"is blocked: %{exception_message}. "
+
KROKI_URL_ERROR_MESSAGE
},
presence:
true
,
if: :kroki_url_absolute?
presence:
{
if: :kroki_enabled
}
validate
:validate_kroki_url
,
if: :kroki_enabled
...
...
@@ -520,7 +516,12 @@ class ApplicationSetting < ApplicationRecord
end
def
parsed_kroki_url
@parsed_kroki_url
||=
Gitlab
::
Utils
.
parse_url
(
kroki_url
)
@parsed_kroki_url
||=
Gitlab
::
UrlBlocker
.
validate!
(
kroki_url
,
schemes:
%w(http https)
,
enforce_sanitization:
true
)[
0
]
rescue
Gitlab
::
UrlBlocker
::
BlockedUrlError
=>
error
self
.
errors
.
add
(
:kroki_url
,
"is not valid.
#{
error
}
"
)
end
def
validate_url
(
parsed_url
,
name
,
error_message
)
...
...
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