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: Fix TXT record creation (#2051)

Browse Source
This commit is contained in:
Tom Limoncelli
2023-02-02 15:45:16 -05:00
committed by GitHub
parent 3793b56ec8
commit 90a4a3b225
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
providers/msdns/auditrecords.go
View File

@ -27,5 +27,7 @@ func AuditRecords(records []*models.RecordConfig) []error {
a.Add("TXT", rejectif.TxtIsEmpty) // Last verified 2021-03-01 a.Add("TXT", rejectif.TxtIsEmpty) // Last verified 2021-03-01
a.Add("TXT", rejectif.TxtIsExactlyLen255) // Last verified 2023-02-02
return a.Audit(records) return a.Audit(records)
} }

2
providers/msdns/convert.go
View File

@ -115,7 +115,7 @@ func nativeToRecords(nr nativeRecord, origin string) (*models.RecordConfig, erro
// uprops["ExpireLimit"], uprops["MinimumTimeToLive"]) // uprops["ExpireLimit"], uprops["MinimumTimeToLive"])
case "TXT": case "TXT":
//rc.SetTargetTXTString(sprops["DescriptiveText"]) //rc.SetTargetTXTString(sprops["DescriptiveText"])
rc.SetTargetTXTfromRFC1035Quoted(sprops["DescriptiveText"]) rc.SetTargetTXT(sprops["DescriptiveText"])
default: default:
return nil, fmt.Errorf( return nil, fmt.Errorf(
"msdns/convert.go:nativeToRecord rtype=%q unknown: props=%+v and %+v", "msdns/convert.go:nativeToRecord rtype=%q unknown: props=%+v and %+v",

13
providers/msdns/powershell.go
View File

@ -206,6 +206,7 @@ func (psh *psHandle) RecordDelete(dnsserver, domain string, rec *models.RecordCo
} }
if stderr != "" { if stderr != "" {
printer.Printf("STDERROR = %q\n", stderr) printer.Printf("STDERROR = %q\n", stderr)
printer.Printf("PowerShell code was:\nSTART\n%s\nEND\n", c)
return fmt.Errorf("unexpected stderr from PSDelete: %q", stderr) return fmt.Errorf("unexpected stderr from PSDelete: %q", stderr)
} }
return nil return nil
@ -239,7 +240,7 @@ func generatePSDelete(dnsserver, domain string, rec *models.RecordConfig) string
// https://www.gitmemory.com/issue/MicrosoftDocs/windows-powershell-docs/1149/511916884 // https://www.gitmemory.com/issue/MicrosoftDocs/windows-powershell-docs/1149/511916884
fmt.Fprintf(&b, ` -RecordData %d,%d,%d,"%s"`, rec.SrvPriority, rec.SrvWeight, rec.SrvPort, rec.GetTargetField()) fmt.Fprintf(&b, ` -RecordData %d,%d,%d,"%s"`, rec.SrvPriority, rec.SrvWeight, rec.SrvPort, rec.GetTargetField())
} else { } else {
fmt.Fprintf(&b, ` -RecordData "%s"`, rec.GetTargetField()) fmt.Fprintf(&b, ` -RecordData %q`, rec.GetTargetField())
} }
//printer.Printf("DEBUG PSDelete CMD = (\n%s\n)\n", b.String()) //printer.Printf("DEBUG PSDelete CMD = (\n%s\n)\n", b.String())
return b.String() return b.String()
@ -258,6 +259,7 @@ func (psh *psHandle) RecordCreate(dnsserver, domain string, rec *models.RecordCo
stdout, stderr, err := psh.shell.Execute(c) stdout, stderr, err := psh.shell.Execute(c)
if err != nil { if err != nil {
printer.Printf("PowerShell code was:\nSTART\n%s\nEND\n", c)
return err return err
} }
if stderr != "" { if stderr != "" {
@ -304,7 +306,7 @@ func generatePSCreate(dnsserver, domain string, rec *models.RecordConfig) string
case "TXT": case "TXT":
//printer.Printf("DEBUG TXT len = %v\n", rec.TxtStrings) //printer.Printf("DEBUG TXT len = %v\n", rec.TxtStrings)
//printer.Printf("DEBUG TXT target = %q\n", rec.GetTargetField()) //printer.Printf("DEBUG TXT target = %q\n", rec.GetTargetField())
fmt.Fprintf(&b, ` -Txt -DescriptiveText %s`, rec.GetTargetField()) fmt.Fprintf(&b, ` -Txt -DescriptiveText %q`, rec.GetTargetTXTJoined())
//case "RT": //case "RT":
// fmt.Fprintf(&b, ` -RT -IntermediateHost <String> -Preference <UInt16>`, rec.GetTargetField()) // fmt.Fprintf(&b, ` -RT -IntermediateHost <String> -Preference <UInt16>`, rec.GetTargetField())
//case "RP": //case "RP":
@ -331,17 +333,20 @@ func generatePSCreate(dnsserver, domain string, rec *models.RecordConfig) string
// We panic so that we quickly find any switch statements // We panic so that we quickly find any switch statements
// that have not been updated for a new RR type. // that have not been updated for a new RR type.
} }
//printer.Printf("DEBUG PSCreate CMD = (\n%s\n)\n", b.String()) //printer.Printf("DEBUG PSCreate CMD = (DEBUG-START\n%s\nDEBUG-END)\n", b.String())
return b.String() return b.String()
} }
func (psh *psHandle) RecordModify(dnsserver, domain string, old, rec *models.RecordConfig) error { func (psh *psHandle) RecordModify(dnsserver, domain string, old, rec *models.RecordConfig) error {
_, stderr, err := psh.shell.Execute(generatePSModify(dnsserver, domain, old, rec)) c := generatePSModify(dnsserver, domain, old, rec)
_, stderr, err := psh.shell.Execute(c)
if err != nil { if err != nil {
printer.Printf("PowerShell code was:\nSTART\n%s\nEND\n", c)
return err return err
} }
if stderr != "" { if stderr != "" {
printer.Printf("STDERROR = %q\n", stderr) printer.Printf("STDERROR = %q\n", stderr)
printer.Printf("PowerShell code was:\nSTART\n%s\nEND\n", c)
return fmt.Errorf("unexpected stderr from PSModify: %q", stderr) return fmt.Errorf("unexpected stderr from PSModify: %q", stderr)
} }
return nil return nil