From adb3810f67f894f415f760a420d75d759ef419dd Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 8 Apr 2016 12:11:58 -0400
Subject: [PATCH] FIX: Allow longer TLDs

---
 app/models/group.rb       |  2 +-
 spec/models/group_spec.rb | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/models/group.rb b/app/models/group.rb
index bb8205c965b..c0f55284f62 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -399,7 +399,7 @@ class Group < ActiveRecord::Base
       domains.each do |domain|
         domain.sub!(/^https?:\/\//, '')
         domain.sub!(/\/.*$/, '')
-        self.errors.add :base, (I18n.t('groups.errors.invalid_domain', domain: domain)) unless domain =~ /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\Z/i
+        self.errors.add :base, (I18n.t('groups.errors.invalid_domain', domain: domain)) unless domain =~ /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}(:[0-9]{1,5})?(\/.*)?\Z/i
       end
       self.automatic_membership_email_domains = domains.join("|")
     end
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 36ad2b32c48..b651342ef12 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -60,6 +60,11 @@ describe Group do
       expect(group.valid?).to eq true
     end
 
+    it "is valid for newer TLDs" do
+      group.automatic_membership_email_domains = "discourse.institute"
+      expect(group.valid?).to eq true
+    end
+
     it "is invalid for bad incoming email" do
       group.incoming_email = "foo.bar.org"
       expect(group.valid?).to eq(false)
@@ -234,20 +239,20 @@ describe Group do
     groups = Group.includes(:users).to_a
     expect(groups.count).to eq Group::AUTO_GROUPS.count
 
-    g = groups.find{|g| g.id == Group::AUTO_GROUPS[:admins]}
+    g = groups.find{|grp| grp.id == Group::AUTO_GROUPS[:admins]}
     expect(g.users.count).to eq 2
     expect(g.user_count).to eq 2
 
-    g = groups.find{|g| g.id == Group::AUTO_GROUPS[:staff]}
+    g = groups.find{|grp| grp.id == Group::AUTO_GROUPS[:staff]}
     expect(g.users.count).to eq 2
     expect(g.user_count).to eq 2
 
-    g = groups.find{|g| g.id == Group::AUTO_GROUPS[:trust_level_1]}
+    g = groups.find{|grp| grp.id == Group::AUTO_GROUPS[:trust_level_1]}
     # admin, system and user
     expect(g.users.count).to eq 3
     expect(g.user_count).to eq 3
 
-    g = groups.find{|g| g.id == Group::AUTO_GROUPS[:trust_level_2]}
+    g = groups.find{|grp| grp.id == Group::AUTO_GROUPS[:trust_level_2]}
     # system and user
     expect(g.users.count).to eq 2
     expect(g.user_count).to eq 2