Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mailinabox
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
mailinabox
Commits
544f1559
Commit
544f1559
authored
Nov 05, 2017
by
John Olten
Committed by
Joshua Tauberer
Nov 15, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for DNS wildcard [merges #1281]
parent
00898b2f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
CHANGELOG.md
CHANGELOG.md
+7
-0
dns_update.py
management/dns_update.py
+2
-2
No files found.
CHANGELOG.md
View file @
544f1559
CHANGELOG
CHANGELOG
=========
=========
In Development
--------------
Control Panel:
*
Fix DNS validation to allow wildcard custom DNS entries to be set.
v0.24 (October 3, 2017)
v0.24 (October 3, 2017)
-----------------------
-----------------------
...
...
management/dns_update.py
View file @
544f1559
...
@@ -14,9 +14,9 @@ from utils import shell, load_env_vars_from_file, safe_domain_name, sort_domains
...
@@ -14,9 +14,9 @@ from utils import shell, load_env_vars_from_file, safe_domain_name, sort_domains
# From https://stackoverflow.com/questions/3026957/how-to-validate-a-domain-name-using-regex-php/16491074#16491074
# From https://stackoverflow.com/questions/3026957/how-to-validate-a-domain-name-using-regex-php/16491074#16491074
# This regular expression matches domain names according to RFCs, it also accepts fqdn with an leading dot,
# This regular expression matches domain names according to RFCs, it also accepts fqdn with an leading dot,
#
as well as underscore
s which are allowed in domain names but not hostnames (i.e. allowed in
#
underscores, as well as asterik
s which are allowed in domain names but not hostnames (i.e. allowed in
# DNS but not in URLs), which are common in certain record types like for DKIM.
# DNS but not in URLs), which are common in certain record types like for DKIM.
DOMAIN_RE
=
"^(?!
\
-)(?:[a-zA-Z
\
d
\
-_]{0,62}[a-zA-Z
\
d_]
\
.){1,126}(?!
\
d+)[a-zA-Z
\
d_]{1,63}(
\
.?)$"
DOMAIN_RE
=
"^(?!
\
-)(?:[
*][.])?(?:[
a-zA-Z
\
d
\
-_]{0,62}[a-zA-Z
\
d_]
\
.){1,126}(?!
\
d+)[a-zA-Z
\
d_]{1,63}(
\
.?)$"
def
get_dns_domains
(
env
):
def
get_dns_domains
(
env
):
# Add all domain names in use by email users and mail aliases and ensure
# Add all domain names in use by email users and mail aliases and ensure
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment