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
022ed15e
Commit
022ed15e
authored
Mar 27, 2020
by
mbergeron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Validate that elasticsearch_url is composed of HTTP URLs
parent
ee639379
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
0 deletions
+15
-0
ee/app/models/ee/application_setting.rb
ee/app/models/ee/application_setting.rb
+15
-0
No files found.
ee/app/models/ee/application_setting.rb
View file @
022ed15e
...
@@ -60,6 +60,9 @@ module EE
...
@@ -60,6 +60,9 @@ module EE
presence:
{
message:
"can't be blank when indexing is enabled"
},
presence:
{
message:
"can't be blank when indexing is enabled"
},
if:
->
(
setting
)
{
setting
.
elasticsearch_indexing?
}
if:
->
(
setting
)
{
setting
.
elasticsearch_indexing?
}
validate
:check_elasticsearch_url_scheme
,
if:
->
(
setting
)
{
setting
.
elasticsearch_indexing?
}
validates
:elasticsearch_aws_region
,
validates
:elasticsearch_aws_region
,
presence:
{
message:
"can't be blank when using aws hosted elasticsearch"
},
presence:
{
message:
"can't be blank when using aws hosted elasticsearch"
},
if:
->
(
setting
)
{
setting
.
elasticsearch_indexing?
&&
setting
.
elasticsearch_aws?
}
if:
->
(
setting
)
{
setting
.
elasticsearch_indexing?
&&
setting
.
elasticsearch_aws?
}
...
@@ -291,5 +294,17 @@ module EE
...
@@ -291,5 +294,17 @@ module EE
rescue
::
Gitlab
::
CIDR
::
ValidationError
=>
e
rescue
::
Gitlab
::
CIDR
::
ValidationError
=>
e
errors
.
add
(
:geo_node_allowed_ips
,
e
.
message
)
errors
.
add
(
:geo_node_allowed_ips
,
e
.
message
)
end
end
def
check_elasticsearch_url_scheme
urls
=
elasticsearch_url
.
map
(
&
URI
.
method
(
:parse
))
# ElasticSearch only exposes a RESTful API, hence we need
# to use the HTTP protocol on all URLs.
unless
urls
.
all?
{
[
:http
,
:https
].
include?
url
.
scheme
&
.
to_sym
}
errors
.
add
(
:elasticsearch_url
,
"only supports HTTP(S) URLs."
)
end
rescue
URI
::
InvalidURIError
=>
e
errors
.
add
(
:elasticsearch_url
,
e
.
message
)
end
end
end
end
end
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