github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 22:27:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Allow multiple hyphens in host (#10078)

Browse Source 
* FIX: Allow multiple hyphens in host

* FIX: added spec for multiple hyphens
This commit is contained in:
Cassius
2020-06-19 00:58:47 +07:00
committed by GitHub
parent 494a27dc27
commit d13d5e2b99
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/embeddable_host.rb
View File

@ -61,7 +61,7 @@ class EmbeddableHost < ActiveRecord::Base
end
def host_must_be_valid
if host !~ /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}(:[0-9]{1,5})?(\/.*)?\Z/i &&
if host !~ /\A[a-z0-9]+([\-\.]+{1}[a-z0-9]+)*\.[a-z]{2,24}(:[0-9]{1,5})?(\/.*)?\Z/i &&
host !~ /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(:[0-9]{1,5})?(\/.*)?\Z/ &&
host !~ /\A([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.)?localhost(\:[0-9]{1,5})?(\/.*)?\Z/i
errors.add(:host, I18n.t('errors.messages.invalid'))