From 6cb589350b973a89cd3164626d6e1c9b700df173 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Tue, 4 Aug 2020 21:07:45 +0200
Subject: [PATCH] avoid adding a built-in domain as custom domain

---
 app/dashboard/views/custom_domain.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/dashboard/views/custom_domain.py b/app/dashboard/views/custom_domain.py
index bcf96323..d1f0ad12 100644
--- a/app/dashboard/views/custom_domain.py
+++ b/app/dashboard/views/custom_domain.py
@@ -3,7 +3,7 @@ from flask_login import login_required, current_user
 from flask_wtf import FlaskForm
 from wtforms import StringField, validators
 
-from app.config import EMAIL_SERVERS_WITH_PRIORITY
+from app.config import EMAIL_SERVERS_WITH_PRIORITY, ALIAS_DOMAINS
 from app.dashboard.base import dashboard_bp
 from app.email_utils import get_email_domain_part
 from app.extensions import db
@@ -40,7 +40,9 @@ def custom_domain():
                 if new_domain.startswith("https://"):
                     new_domain = new_domain[len("https://") :]
 
-                if CustomDomain.get_by(domain=new_domain):
+                if new_domain in ALIAS_DOMAINS:
+                    flash("A custom domain cannot be a built-in domain.", "error")
+                elif CustomDomain.get_by(domain=new_domain):
                     flash(f"{new_domain} already added", "warning")
                 elif get_email_domain_part(current_user.email) == new_domain:
                     flash(