Skip to content

Commit

Permalink
deadcode: NewUTF8, utf8.Execute, utf8.Exit
Browse files Browse the repository at this point in the history
  • Loading branch information
tlimoncelli committed Mar 3, 2024
1 parent 951b47d commit 4d13c02
Showing 1 changed file with 26 additions and 33 deletions.
59 changes: 26 additions & 33 deletions pkg/powershell/middleware/utf8.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,41 @@

package middleware

import (
"encoding/base64"
"fmt"

"github.com/StackExchange/dnscontrol/v4/pkg/powershell/utils"
)

// utf8 implements a primitive middleware that encodes all outputs
// as base64 to prevent encoding issues between remote PowerShell
// shells and the receiver. Just setting $OutputEncoding does not
// work reliably enough, sadly.
type utf8 struct {
upstream Middleware
wrapper string
}
// type utf8 struct {
// upstream Middleware
// wrapper string
// }

func NewUTF8(upstream Middleware) (Middleware, error) {
wrapper := "goUTF8" + utils.CreateRandomString(8)
// func NewUTF8(upstream Middleware) (Middleware, error) {
// 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) {
// Out-String to concat all lines into a single line,
// Write-Host to prevent line breaks at the "window width"
cmd = fmt.Sprintf(`%s | Out-String | %s | Write-Host`, cmd, u.wrapper)
// func (u *utf8) Execute(cmd string) (string, string, error) {
// // Out-String to concat all lines into a single line,
// // Write-Host to prevent line breaks at the "window width"
// cmd = fmt.Sprintf(`%s | Out-String | %s | Write-Host`, cmd, u.wrapper)

stdout, stderr, err := u.upstream.Execute(cmd)
if err != nil {
return stdout, stderr, err
}
// stdout, stderr, err := u.upstream.Execute(cmd)
// if err != nil {
// return stdout, stderr, err
// }

decoded, err := base64.StdEncoding.DecodeString(stdout)
if err != nil {
return stdout, stderr, err
}
// decoded, err := base64.StdEncoding.DecodeString(stdout)
// if err != nil {
// return stdout, stderr, err
// }

return string(decoded), stderr, nil
}
// return string(decoded), stderr, nil
// }

func (u *utf8) Exit() {
u.upstream.Exit()
}
// func (u *utf8) Exit() {
// u.upstream.Exit()
// }

0 comments on commit 4d13c02

Please # to comment.