root
/
sclient
mirror of https://github.com/therootcompany/sclient
1
1
Fork 0
Code Issues Releases Wiki Activity

-q => -s (to be curl-like), make staticcheck happy

This commit is contained in:
AJ ONeal 2021-06-21 23:05:27 -06:00
parent ca84ed48de
commit 66f2d41c6b
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/sclient/main.go
View File

@ -47,10 +47,10 @@ func main() {
flag.Usage = usage flag.Usage = usage
insecure := flag.Bool("k", false, "ignore bad TLS/SSL/HTTPS certificates") insecure := flag.Bool("k", false, "ignore bad TLS/SSL/HTTPS certificates")
quiet := flag.Bool("q", false, "don't output connection established messages") silent := flag.Bool("s", false, "alias of --silent")
servername := flag.String("servername", "", "specify a servername different from <remote> (to disable SNI use an IP as <remote> and do use this option)") servername := flag.String("servername", "", "specify a servername different from <remote> (to disable SNI use an IP as <remote> and do use this option)")
flag.BoolVar(insecure, "insecure", false, "ignore bad TLS/SSL/HTTPS certificates") flag.BoolVar(insecure, "insecure", false, "ignore bad TLS/SSL/HTTPS certificates")
flag.BoolVar(quiet, "quiet", false, "don't output connection established messages") flag.BoolVar(silent, "silent", false, "less verbose output")
flag.Parse() flag.Parse()
remotestr := flag.Arg(0) remotestr := flag.Arg(0)
localstr := flag.Arg(1) localstr := flag.Arg(1)
@ -71,7 +71,7 @@ func main() {
LocalAddress: "localhost", LocalAddress: "localhost",
InsecureSkipVerify: *insecure, InsecureSkipVerify: *insecure,
ServerName: *servername, ServerName: *servername,
Quiet: *quiet, Silent: *silent,
} }
remote := strings.Split(remotestr, ":") remote := strings.Split(remotestr, ":")

8
sclient.go
View File

@ -18,7 +18,7 @@ type Tunnel struct {
LocalPort int LocalPort int
InsecureSkipVerify bool InsecureSkipVerify bool
ServerName string ServerName string
Quiet bool Silent bool
} }
// DialAndListen will create a test TLS connection to the remote address and then // DialAndListen will create a test TLS connection to the remote address and then
@ -46,7 +46,7 @@ func (t *Tunnel) DialAndListen() error {
} else { } else {
name = "stdin" name = "stdin"
} }
conn := &stdnet{os.Stdin, os.Stdout, &stdaddr{net.UnixAddr{name, network}}} conn := &stdnet{os.Stdin, os.Stdout, &stdaddr{net.UnixAddr{Name: name, Net: network}}}
t.handleConnection(remote, conn) t.handleConnection(remote, conn)
return nil return nil
} }
@ -111,7 +111,7 @@ func pipe(r netReadWriteCloser, w netReadWriteCloser, t string) {
if nil != err { if nil != err {
//fmt.Fprintf(os.Stdout, "[debug] (%s:%d) error reading %s\n", t, count, err) //fmt.Fprintf(os.Stdout, "[debug] (%s:%d) error reading %s\n", t, count, err)
if io.EOF != err { if io.EOF != err {
fmt.Fprintf(os.Stderr, "[read error] (%s:%s) %s\n", t, count, err) fmt.Fprintf(os.Stderr, "[read error] (%s:%d) %s\n", t, count, err)
} }
r.Close() r.Close()
//w.Close() //w.Close()
@ -151,7 +151,7 @@ func (t *Tunnel) handleConnection(remote string, conn netReadWriteCloser) {
} }
if "stdio" == conn.RemoteAddr().Network() { if "stdio" == conn.RemoteAddr().Network() {
if t.Quiet == false { if !t.Silent {
fmt.Fprintf(os.Stdout, "(connected to %s:%d and reading from %s)\n", fmt.Fprintf(os.Stdout, "(connected to %s:%d and reading from %s)\n",
t.RemoteAddress, t.RemotePort, conn.RemoteAddr().String()) t.RemoteAddress, t.RemotePort, conn.RemoteAddr().String())
} }

11
staticcheck.conf Normal file
View File

@ -0,0 +1,11 @@
# I like my yoda conditions ST1017
checks = ["all", "-ST1017", "-ST1000", "-ST1003", "-ST1016", "-ST1020", "-ST1021", "-ST1022", "-ST1023"]
initialisms = ["ACL", "API", "ASCII", "CPU", "CSS", "DNS",
"EOF", "GUID", "HTML", "HTTP", "HTTPS", "ID",
"IP", "JSON", "QPS", "RAM", "RPC", "SLA",
"SMTP", "SQL", "SSH", "TCP", "TLS", "TTL",
"UDP", "UI", "GID", "UID", "UUID", "URI",
"URL", "UTF8", "VM", "XML", "XMPP", "XSRF",
"XSS", "SIP", "RTP", "AMQP", "DB", "TS"]
dot_import_whitelist = []
http_status_code_whitelist = ["200", "400", "404", "500"]