From 8df7bcf532c9f0407fcefa12d205cb9d160fe5f4 Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew@gitlab.com>
Date: Fri, 19 May 2017 09:07:38 -0500
Subject: [PATCH] Allow numeric pages domain

Previously, `PagesDomain` would not allow a domain such as
123.example.com. With this change, this is now allowed, because
it is a perfectly valid domain.
---
 app/models/pages_domain.rb                    |  4 +-
 .../unreleased/allow_numeric_pages_domain.yml |  4 ++
 spec/models/pages_domain_spec.rb              | 47 +++++++------------
 3 files changed, 24 insertions(+), 31 deletions(-)
 create mode 100644 changelogs/unreleased/allow_numeric_pages_domain.yml

diff --git a/app/models/pages_domain.rb b/app/models/pages_domain.rb
index f2f2fc1e32a..5d798247863 100644
--- a/app/models/pages_domain.rb
+++ b/app/models/pages_domain.rb
@@ -1,7 +1,7 @@
 class PagesDomain < ActiveRecord::Base
   belongs_to :project
 
-  validates :domain, hostname: true
+  validates :domain, hostname: { allow_numeric_hostname: true }
   validates :domain, uniqueness: { case_sensitive: false }
   validates :certificate, certificate: true, allow_nil: true, allow_blank: true
   validates :key, certificate_key: true, allow_nil: true, allow_blank: true
@@ -98,7 +98,7 @@ class PagesDomain < ActiveRecord::Base
 
   def validate_pages_domain
     return unless domain
-    if domain.downcase.ends_with?(".#{Settings.pages.host}".downcase)
+    if domain.downcase.ends_with?(Settings.pages.host.downcase)
       self.errors.add(:domain, "*.#{Settings.pages.host} is restricted")
     end
   end
diff --git a/changelogs/unreleased/allow_numeric_pages_domain.yml b/changelogs/unreleased/allow_numeric_pages_domain.yml
new file mode 100644
index 00000000000..10d9f26f88d
--- /dev/null
+++ b/changelogs/unreleased/allow_numeric_pages_domain.yml
@@ -0,0 +1,4 @@
+---
+title: Allow numeric pages domain
+merge_request: 11550
+author:
diff --git a/spec/models/pages_domain_spec.rb b/spec/models/pages_domain_spec.rb
index c6c45d78990..f9d060d4e0e 100644
--- a/spec/models/pages_domain_spec.rb
+++ b/spec/models/pages_domain_spec.rb
@@ -6,7 +6,7 @@ describe PagesDomain, models: true do
   end
 
   describe 'validate domain' do
-    subject { build(:pages_domain, domain: domain) }
+    subject(:pages_domain) { build(:pages_domain, domain: domain) }
 
     context 'is unique' do
       let(:domain) { 'my.domain.com' }
@@ -14,36 +14,25 @@ describe PagesDomain, models: true do
       it { is_expected.to validate_uniqueness_of(:domain) }
     end
 
-    context 'valid domain' do
-      let(:domain) { 'my.domain.com' }
+    {
+      'my.domain.com'    => true,
+      '123.456.789'      => true,
+      '0x12345.com'      => true,
+      '0123123'          => true,
+      '_foo.com'         => false,
+      'reserved.com'     => false,
+      'a.reserved.com'   => false,
+      nil                => false
+    }.each do |value, validity|
+      context "domain #{value.inspect} validity" do
+        before do
+          allow(Settings.pages).to receive(:host).and_return('reserved.com')
+        end
 
-      it { is_expected.to be_valid }
-    end
+        let(:domain) { value }
 
-    context 'valid hexadecimal-looking domain' do
-      let(:domain) { '0x12345.com'}
-
-      it { is_expected.to be_valid }
-    end
-
-    context 'no domain' do
-      let(:domain) { nil }
-
-      it { is_expected.not_to be_valid }
-    end
-
-    context 'invalid domain' do
-      let(:domain) { '0123123' }
-
-      it { is_expected.not_to be_valid }
-    end
-
-    context 'domain from .example.com' do
-      let(:domain) { 'my.domain.com' }
-
-      before { allow(Settings.pages).to receive(:host).and_return('domain.com') }
-
-      it { is_expected.not_to be_valid }
+        it { expect(pages_domain.valid?).to eq(validity) }
+      end
     end
   end