From 1767003cd6acc0a1bf8dbf488d949f5a3c032cab Mon Sep 17 00:00:00 2001
From: henryk <henryk@ploetzli.ch>
Date: Thu, 14 Apr 2016 19:46:50 +0200
Subject: [PATCH] Simplify and fix ADMIN_EMAIL verification regex. Fixes
 RocketChat/Rocket.Chat#2841 (#2890)

* Email addresses start with something other than "@", have arbitrary characters,
   at least one "@", at least one character after that.
---
 server/startup/initialData.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/startup/initialData.coffee b/server/startup/initialData.coffee
index 68021c700aa..1fc4a6549cc 100644
--- a/server/startup/initialData.coffee
+++ b/server/startup/initialData.coffee
@@ -42,7 +42,7 @@ Meteor.startup ->
 				console.log "Name: #{adminUser.name}".green
 
 				if process.env.ADMIN_EMAIL?
-					re = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i
+					re = /^[^@].*@[^@]+$/i
 					if re.test process.env.ADMIN_EMAIL
 						if not RocketChat.models.Users.findOneByEmailAddress process.env.ADMIN_EMAIL
 							adminUser.emails = [