Skip to content

[Network] Support .@ parsing in DNS record name #11514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haroldrandom merged 5 commits into from
Dec 11, 2019
Merged

[Network] Support .@ parsing in DNS record name #11514

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e6ed2fd
Support .@ parsing in record name
Dec 9, 2019
bd453d3
Update history
Dec 9, 2019
75dd476
Merge branch 'dev' into dns_records_strip
Dec 9, 2019
b42fed7
Merge branch 'dev' into dns_records_strip
Dec 11, 2019
582a2b0
Merge branch 'dev' into dns_records_strip
Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/azure-cli/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ Release History
**Network**

* az network list-service-aliases: support list service aliases which can be used for Service Endpoint Policies
* dns zone import: Support .@ in record name


**Packaging**

Expand Down
646 changes: 375 additions & 271 deletions ...-cli/azure/cli/command_modules/network/tests/latest/recordings/test_dns_zone1_import.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,086 changes: 543 additions & 543 deletions ...-cli/azure/cli/command_modules/network/tests/latest/recordings/test_dns_zone2_import.yaml
View file
Open in desktop

Large diffs are not rendered by default.

654 changes: 327 additions & 327 deletions ...-cli/azure/cli/command_modules/network/tests/latest/recordings/test_dns_zone3_import.yaml
View file
Open in desktop

Large diffs are not rendered by default.

634 changes: 317 additions & 317 deletions ...-cli/azure/cli/command_modules/network/tests/latest/recordings/test_dns_zone4_import.yaml
View file
Open in desktop

Large diffs are not rendered by default.

564 changes: 282 additions & 282 deletions ...-cli/azure/cli/command_modules/network/tests/latest/recordings/test_dns_zone5_import.yaml
View file
Open in desktop

Large diffs are not rendered by default.

238 changes: 119 additions & 119 deletions ...-cli/azure/cli/command_modules/network/tests/latest/recordings/test_dns_zone6_import.yaml
View file
Open in desktop

Large diffs are not rendered by default.

260 changes: 130 additions & 130 deletions ...-cli/azure/cli/command_modules/network/tests/latest/recordings/test_dns_zone7_import.yaml
View file
Open in desktop

Large diffs are not rendered by default.

232 changes: 116 additions & 116 deletions ...-cli/azure/cli/command_modules/network/tests/latest/recordings/test_dns_zone8_import.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/azure-cli/azure/cli/command_modules/network/tests/latest/zone_files/zone1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ mytxt2 7200 TXT "abc def"
mytxt2 7200 TXT "foo bar"
mytxtrs 3600 TXT "hi"
mysrv 3600 SRV 1 2 1234 target.contoso.com.
_sip._tls.@ 3600 IN SRV 100 1 443 target.contoso.com.
caa1 60 IN CAA 0 issue "ca1.contoso.com"
60 IN CAA 128 iodef mailto:[email protected]
caa2 60 IN CAA 0 issue ca1.contoso.com
Expand Down
14 changes: 8 additions & 6 deletions src/azure-cli/azure/cli/command_modules/network/tests/latest/zone_files/zone1.txt_export.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,25 @@
; Exported zone file from Azure DNS
; Zone name: zone1.com
; Resource Group Name: cli_dns_zone1_import000001
; Date and time (UTC): Sun, 27 Oct 2019 14:17:04 +0800
; Date and time (UTC): Mon, 09 Dec 2019 19:13:32 +0800

$TTL 300
$ORIGIN zone1.com.

@ 3600 IN SOA ns1-05.azure-dns.com. azuredns-hostmaster.microsoft.com. (
@ 3600 IN SOA ns1-02.azure-dns.com. azuredns-hostmaster.microsoft.com. (
1 ; serial
3600 ; refresh
300 ; retry
2419200 ; expire
300 ; minimum
)

172800 IN NS ns1-05.azure-dns.com.
172800 IN NS ns2-05.azure-dns.net.
172800 IN NS ns3-05.azure-dns.org.
172800 IN NS ns4-05.azure-dns.info.
172800 IN NS ns1-02.azure-dns.com.
172800 IN NS ns2-02.azure-dns.net.
172800 IN NS ns3-02.azure-dns.org.
172800 IN NS ns4-02.azure-dns.info.

_sip._tls 3600 IN SRV 100 1 443 target.contoso.com.

caa1 60 IN CAA 0 issue "ca1.contoso.com"
60 IN CAA 128 iodef "mailto:[email protected]"
Expand Down
12 changes: 6 additions & 6 deletions src/azure-cli/azure/cli/command_modules/network/tests/latest/zone_files/zone2.txt_export.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
; Exported zone file from Azure DNS
; Zone name: zone2.com
; Resource Group Name: cli_dns_zone2_import000001
; Date and time (UTC): Sun, 27 Oct 2019 14:17:05 +0800
; Date and time (UTC): Mon, 09 Dec 2019 19:13:33 +0800

$TTL 3600
$ORIGIN zone2.com.

@ 3600 IN SOA ns1-05.azure-dns.com. hostmaster. (
@ 3600 IN SOA ns1-01.azure-dns.com. hostmaster. (
10 ; serial
900 ; refresh
600 ; retry
86400 ; expire
3600 ; minimum
)

3600 IN NS ns1-05.azure-dns.com.
3600 IN NS ns2-05.azure-dns.net.
3600 IN NS ns3-05.azure-dns.org.
3600 IN NS ns4-05.azure-dns.info.
3600 IN NS ns1-01.azure-dns.com.
3600 IN NS ns2-01.azure-dns.net.
3600 IN NS ns3-01.azure-dns.org.
3600 IN NS ns4-01.azure-dns.info.

200 IN TXT "this is another SPF, this time as TXT"
200 IN TXT "v=spf1 mx ip4:14.14.22.0/23 a:mail.trum.ch mx:mese.ch include:spf.mapp.com ?all"
Expand Down
12 changes: 6 additions & 6 deletions src/azure-cli/azure/cli/command_modules/network/tests/latest/zone_files/zone3.txt_export.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
; Exported zone file from Azure DNS
; Zone name: zone3.com
; Resource Group Name: cli_dns_zone3_import000001
; Date and time (UTC): Sun, 27 Oct 2019 14:17:04 +0800
; Date and time (UTC): Mon, 09 Dec 2019 19:13:32 +0800

$TTL 10800
$ORIGIN zone3.com.

@ 86400 IN SOA ns1-05.azure-dns.com. hostmaster.zone3.com. (
@ 86400 IN SOA ns1-01.azure-dns.com. hostmaster.zone3.com. (
2003080800 ; serial
43200 ; refresh
900 ; retry
1814400 ; expire
10800 ; minimum
)

86400 IN NS ns1-05.azure-dns.com.
86400 IN NS ns2-05.azure-dns.net.
86400 IN NS ns3-05.azure-dns.org.
86400 IN NS ns4-05.azure-dns.info.
86400 IN NS ns1-01.azure-dns.com.
86400 IN NS ns2-01.azure-dns.net.
86400 IN NS ns3-01.azure-dns.org.
86400 IN NS ns4-01.azure-dns.info.

_sip._tcp 3600 IN SRV 10 20 30 foo.com.

Expand Down
12 changes: 6 additions & 6 deletions src/azure-cli/azure/cli/command_modules/network/tests/latest/zone_files/zone4.txt_export.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
; Exported zone file from Azure DNS
; Zone name: zone4.com
; Resource Group Name: cli_dns_zone4_import000001
; Date and time (UTC): Sun, 27 Oct 2019 14:17:04 +0800
; Date and time (UTC): Mon, 09 Dec 2019 19:13:33 +0800

$TTL 10800
$ORIGIN zone4.com.

@ 3600 IN SOA ns1-02.azure-dns.com. hostmaster.zone4.com. (
@ 3600 IN SOA ns1-09.azure-dns.com. hostmaster.zone4.com. (
2003080800 ; serial
43200 ; refresh
900 ; retry
1814400 ; expire
10800 ; minimum
)

100 IN NS ns1-02.azure-dns.com.
100 IN NS ns2-02.azure-dns.net.
100 IN NS ns3-02.azure-dns.org.
100 IN NS ns4-02.azure-dns.info.
100 IN NS ns1-09.azure-dns.com.
100 IN NS ns2-09.azure-dns.net.
100 IN NS ns3-09.azure-dns.org.
100 IN NS ns4-09.azure-dns.info.

c1 10 IN A 11.1.2.3
10 IN A 11.2.3.3
Expand Down
12 changes: 6 additions & 6 deletions src/azure-cli/azure/cli/command_modules/network/tests/latest/zone_files/zone5.txt_export.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
; Exported zone file from Azure DNS
; Zone name: zone5.com
; Resource Group Name: cli_dns_zone5_import000001
; Date and time (UTC): Sun, 27 Oct 2019 14:17:04 +0800
; Date and time (UTC): Mon, 09 Dec 2019 19:13:32 +0800

$TTL 10800
$ORIGIN zone5.com.

@ 3600 IN SOA ns1-07.azure-dns.com. hostmaster.zone5.com. (
@ 3600 IN SOA ns1-03.azure-dns.com. hostmaster.zone5.com. (
2003080800 ; serial
43200 ; refresh
900 ; retry
Expand All @@ -17,10 +17,10 @@ $ORIGIN zone5.com.

3600 IN A 1.2.3.4

172800 IN NS ns1-07.azure-dns.com.
172800 IN NS ns2-07.azure-dns.net.
172800 IN NS ns3-07.azure-dns.org.
172800 IN NS ns4-07.azure-dns.info.
172800 IN NS ns1-03.azure-dns.com.
172800 IN NS ns2-03.azure-dns.net.
172800 IN NS ns3-03.azure-dns.org.
172800 IN NS ns4-03.azure-dns.info.

default 3600 IN A 0.1.2.3

Expand Down
12 changes: 6 additions & 6 deletions src/azure-cli/azure/cli/command_modules/network/tests/latest/zone_files/zone6.txt_export.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
; Exported zone file from Azure DNS
; Zone name: zone6.com
; Resource Group Name: cli_dns_zone6_import000001
; Date and time (UTC): Sun, 27 Oct 2019 14:17:03 +0800
; Date and time (UTC): Mon, 09 Dec 2019 19:13:32 +0800

$TTL 300
$ORIGIN zone6.com.

@ 3600 IN SOA ns1-08.azure-dns.com. azuredns-hostmaster.microsoft.com. (
@ 3600 IN SOA ns1-04.azure-dns.com. azuredns-hostmaster.microsoft.com. (
1 ; serial
3600 ; refresh
300 ; retry
Expand All @@ -17,10 +17,10 @@ $ORIGIN zone6.com.

3600 IN A 1.1.1.1

172800 IN NS ns1-08.azure-dns.com.
172800 IN NS ns2-08.azure-dns.net.
172800 IN NS ns3-08.azure-dns.org.
172800 IN NS ns4-08.azure-dns.info.
172800 IN NS ns1-04.azure-dns.com.
172800 IN NS ns2-04.azure-dns.net.
172800 IN NS ns3-04.azure-dns.org.
172800 IN NS ns4-04.azure-dns.info.

www 3600 IN A 1.1.1.1

12 changes: 6 additions & 6 deletions src/azure-cli/azure/cli/command_modules/network/tests/latest/zone_files/zone7.txt_export.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
; Exported zone file from Azure DNS
; Zone name: zone7.com
; Resource Group Name: cli_dns_zone7_import000001
; Date and time (UTC): Sun, 27 Oct 2019 14:17:04 +0800
; Date and time (UTC): Mon, 09 Dec 2019 19:13:32 +0800

$TTL 300
$ORIGIN zone7.com.

@ 3600 IN SOA ns1-01.azure-dns.com. azuredns-hostmaster.microsoft.com. (
@ 3600 IN SOA ns1-09.azure-dns.com. azuredns-hostmaster.microsoft.com. (
1 ; serial
3600 ; refresh
300 ; retry
2419200 ; expire
300 ; minimum
)

172800 IN NS ns1-01.azure-dns.com.
172800 IN NS ns2-01.azure-dns.net.
172800 IN NS ns3-01.azure-dns.org.
172800 IN NS ns4-01.azure-dns.info.
172800 IN NS ns1-09.azure-dns.com.
172800 IN NS ns2-09.azure-dns.net.
172800 IN NS ns3-09.azure-dns.org.
172800 IN NS ns4-09.azure-dns.info.

60 IN TXT "a\\b\255\000\;\"\"\"testtesttest\"\"\""

Expand Down
12 changes: 6 additions & 6 deletions src/azure-cli/azure/cli/command_modules/network/tests/latest/zone_files/zone8.txt_export.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
; Exported zone file from Azure DNS
; Zone name: zone8.com
; Resource Group Name: cli_dns_zone8_import000001
; Date and time (UTC): Sun, 27 Oct 2019 14:17:04 +0800
; Date and time (UTC): Mon, 09 Dec 2019 19:13:32 +0800

$TTL 300
$ORIGIN zone8.com.

@ 3600 IN SOA ns1-07.azure-dns.com. azuredns-hostmaster.microsoft.com. (
@ 3600 IN SOA ns1-02.azure-dns.com. azuredns-hostmaster.microsoft.com. (
1 ; serial
3600 ; refresh
300 ; retry
2419200 ; expire
300 ; minimum
)

172800 IN NS ns1-07.azure-dns.com.
172800 IN NS ns2-07.azure-dns.net.
172800 IN NS ns3-07.azure-dns.org.
172800 IN NS ns4-07.azure-dns.info.
172800 IN NS ns1-02.azure-dns.com.
172800 IN NS ns2-02.azure-dns.net.
172800 IN NS ns3-02.azure-dns.org.
172800 IN NS ns4-02.azure-dns.info.

* 3600 IN A 2.3.4.5

Expand Down
5 changes: 3 additions & 2 deletions src/azure-cli/azure/cli/command_modules/network/zone_file/parse_zone_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,10 +442,11 @@ def parse_zone_file(text, zone_name, ignore_invalid=False):
current_ttl = _convert_to_seconds(record['val'])
else:
record_name = record['name']
if record_name == '@':
record_name = current_origin
if '@' in record_name:
record_name = record_name.replace('@', current_origin)
elif not record_name.endswith('.'):
record_name = '{}.{}'.format(record_name, current_origin)
print(current_origin, record_name)

# special record-specific fix-ups
if record_type == 'ptr':
Expand Down