mirror of
https://github.com/StackExchange/dnscontrol.git
synced 2025-10-06 03:46:34 +08:00
deadcode: NewUTF8, utf8.Execute, utf8.Exit
This commit is contained in:
parent
951b47d583
commit
4d13c0251a
1 changed files with 26 additions and 33 deletions
|
@ -2,48 +2,41 @@
|
||||||
|
|
||||||
package middleware
|
package middleware
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/base64"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/StackExchange/dnscontrol/v4/pkg/powershell/utils"
|
|
||||||
)
|
|
||||||
|
|
||||||
// utf8 implements a primitive middleware that encodes all outputs
|
// utf8 implements a primitive middleware that encodes all outputs
|
||||||
// as base64 to prevent encoding issues between remote PowerShell
|
// as base64 to prevent encoding issues between remote PowerShell
|
||||||
// shells and the receiver. Just setting $OutputEncoding does not
|
// shells and the receiver. Just setting $OutputEncoding does not
|
||||||
// work reliably enough, sadly.
|
// work reliably enough, sadly.
|
||||||
type utf8 struct {
|
// type utf8 struct {
|
||||||
upstream Middleware
|
// upstream Middleware
|
||||||
wrapper string
|
// wrapper string
|
||||||
}
|
// }
|
||||||
|
|
||||||
func NewUTF8(upstream Middleware) (Middleware, error) {
|
// func NewUTF8(upstream Middleware) (Middleware, error) {
|
||||||
wrapper := "goUTF8" + utils.CreateRandomString(8)
|
// wrapper := "goUTF8" + utils.CreateRandomString(8)
|
||||||
|
|
||||||
_, _, err := upstream.Execute(fmt.Sprintf(`function %s { process { if ($_) { [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes($_)) } else { '' } } }`, wrapper))
|
// _, _, err := upstream.Execute(fmt.Sprintf(`function %s { process { if ($_) { [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes($_)) } else { '' } } }`, wrapper))
|
||||||
|
|
||||||
return &utf8{upstream, wrapper}, err
|
// return &utf8{upstream, wrapper}, err
|
||||||
}
|
// }
|
||||||
|
|
||||||
func (u *utf8) Execute(cmd string) (string, string, error) {
|
// func (u *utf8) Execute(cmd string) (string, string, error) {
|
||||||
// Out-String to concat all lines into a single line,
|
// // Out-String to concat all lines into a single line,
|
||||||
// Write-Host to prevent line breaks at the "window width"
|
// // Write-Host to prevent line breaks at the "window width"
|
||||||
cmd = fmt.Sprintf(`%s | Out-String | %s | Write-Host`, cmd, u.wrapper)
|
// cmd = fmt.Sprintf(`%s | Out-String | %s | Write-Host`, cmd, u.wrapper)
|
||||||
|
|
||||||
stdout, stderr, err := u.upstream.Execute(cmd)
|
// stdout, stderr, err := u.upstream.Execute(cmd)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
return stdout, stderr, err
|
// return stdout, stderr, err
|
||||||
}
|
// }
|
||||||
|
|
||||||
decoded, err := base64.StdEncoding.DecodeString(stdout)
|
// decoded, err := base64.StdEncoding.DecodeString(stdout)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
return stdout, stderr, err
|
// return stdout, stderr, err
|
||||||
}
|
// }
|
||||||
|
|
||||||
return string(decoded), stderr, nil
|
// return string(decoded), stderr, nil
|
||||||
}
|
// }
|
||||||
|
|
||||||
func (u *utf8) Exit() {
|
// func (u *utf8) Exit() {
|
||||||
u.upstream.Exit()
|
// u.upstream.Exit()
|
||||||
}
|
// }
|
||||||
|
|
Loading…
Add table
Reference in a new issue