mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

MSDNS: Improve reliability of zone dump (#1179)

Browse Source 
* MSDNS: Improve reliability of zone dump

* Update tests
This commit is contained in:
Tom Limoncelli
2021-06-24 06:05:33 -04:00
committed by GitHub
parent be1f03fb75
commit 311a6d74ce
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
providers/msdns/powershell.go
View File

@ -97,50 +97,62 @@ func generatePSZoneAll(dnsserver string) string {
}
func (psh *psHandle) GetDNSZoneRecords(dnsserver, domain string) ([]nativeRecord, error) {
tmpfile, err := ioutil.TempFile("", "zonerecords.*.json")
if err != nil {
log.Fatal(err)
}
filename := tmpfile.Name()
tmpfile.Close()
stdout, stderr, err := psh.shell.Execute(generatePSZoneDump(dnsserver, domain))
stdout, stderr, err := psh.shell.Execute(generatePSZoneDump(dnsserver, domain, filename))
if err != nil {
return nil, err
}
if stdout != "" {
//writing all stdout from powershell to file
ioutil.WriteFile(tmpfile.Name(), []byte(stdout), 0)
}
if stderr != "" {
fmt.Printf("STDERROR = %q\n", stderr)
return nil, fmt.Errorf("unexpected stderr from PSZoneDump: %q", stderr)
}
if stdout != "" {
fmt.Printf("STDOUT = %q\n", stdout)
}
contents, err := utfutil.ReadFile(tmpfile.Name(), utfutil.UTF8)
contents, err := utfutil.ReadFile(filename, utfutil.UTF8)
if err != nil {
return nil, err
}
os.Remove(tmpfile.Name())
os.Remove(filename) // TODO(tlim): There should be a debug flag that leaves the tmp file around.
var records []nativeRecord
json.Unmarshal([]byte(contents), &records)
err = json.Unmarshal(contents, &records)
if err != nil {
return nil, fmt.Errorf("PSZoneDump json error: %w", err)
}
return records, nil
}
// powerShellDump runs a PowerShell command to get a dump of all records in a DNS zone.
func generatePSZoneDump(dnsserver, domainname string) string {
func generatePSZoneDump(dnsserver, domainname, filename string) string {
// @dnsserver: Hostname of the DNS server.
// @domainname: Name of the domain.
// @filename: Where to write the resulting JSON file.
// NB(tlim): On Windows PowerShell, the JSON file will be UTF8 with
// a BOM. A UTF-8 file shouldn't have a BOM, but Microsoft messed up.
// When we switch to PowerShell Core, the BOM will disappear.
var b bytes.Buffer
fmt.Fprintf(&b, `$OutputEncoding = [Text.UTF8Encoding]::UTF8 ; `)
fmt.Fprintf(&b, `Get-DnsServerResourceRecord`)
if dnsserver != "" {
fmt.Fprintf(&b, ` -ComputerName "%v"`, dnsserver)
}
fmt.Fprintf(&b, ` -ZoneName "%v"`, domainname)
fmt.Fprintf(&b, ` | `)
fmt.Fprintf(&b, `Select-Object -Property * -ExcludeProperty Cim*`)
fmt.Fprintf(&b, ` | `)
fmt.Fprintf(&b, `ConvertTo-Json -depth 4`) // Tested with 3 (causes errors). 4 and larger work.
// All file writing via dnsserver or pssession should be handled outside this function
//fmt.Fprintf(&b, ` > %s`, filename)
//fmt.Printf("DEBUG PSZoneDump CMD = (\n%s\n)\n", b.String())
fmt.Fprintf(&b, ` | `)
fmt.Fprintf(&b, `Out-File "%s" -Encoding utf8`, filename)
return b.String()
}

6
providers/msdns/powershell_test.go
View File

@ -49,17 +49,17 @@ func Test_generatePSZoneDump(t *testing.T) {
{
name: "local",
args: args{domainname: "example.com"},
want: `Get-DnsServerResourceRecord -ZoneName "example.com" | ConvertTo-Json -depth 4`,
want: `$OutputEncoding = [Text.UTF8Encoding]::UTF8 ; Get-DnsServerResourceRecord -ZoneName "example.com" | Select-Object -Property * -ExcludeProperty Cim* | ConvertTo-Json -depth 4 | Out-File "foo" -Encoding utf8`,
},
{
name: "remote",
args: args{domainname: "example.com", dnsserver: "mydnsserver"},
want: `Get-DnsServerResourceRecord -ComputerName "mydnsserver" -ZoneName "example.com" | ConvertTo-Json -depth 4`,
want: `$OutputEncoding = [Text.UTF8Encoding]::UTF8 ; Get-DnsServerResourceRecord -ComputerName "mydnsserver" -ZoneName "example.com" | Select-Object -Property * -ExcludeProperty Cim* | ConvertTo-Json -depth 4 | Out-File "foo" -Encoding utf8`,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := generatePSZoneDump(tt.args.dnsserver, tt.args.domainname); got != tt.want {
if got := generatePSZoneDump(tt.args.dnsserver, tt.args.domainname, "foo"); got != tt.want {
t.Errorf("generatePSZoneDump() = got=(\n%s\n) want=(\n%s\n)", got, tt.want)
}
})