PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

service/rpccommon: log error for conns rejected by --only-same-user (#2211)

Browse Source 
* service/rpccommon: log error for conns rejected by --only-same-user

If no logger is enabled manually write to stderr instead.

Fixes #2209

* logflags: fix style complaints from DeepSource
This commit is contained in:
Alessandro Arzilli 2020-10-22 17:23:55 +02:00 committed by GitHub
parent 9a3c9ebad1
commit 1a782d321d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/logflags/logflags.go
View File

@ -16,6 +16,7 @@ import (
"github.com/sirupsen/logrus"
)
var any = false
var debugger = false
var gdbWire = false
var lldbServerOutput = false
@ -40,6 +41,11 @@ func makeLogger(flag bool, fields logrus.Fields) *logrus.Entry {
return logger
}
// Any returns true if any logging is enabled.
func Any() bool {
return any
}
// GdbWire returns true if the gdbserial package should log all the packets
// exchanged with the stub.
func GdbWire() bool {
@ -121,7 +127,7 @@ func WriteAPIListeningMessage(addr string) {
writeListeningMessage("API", addr)
}
func writeListeningMessage(server string, addr string) {
func writeListeningMessage(server, addr string) {
msg := fmt.Sprintf("%s server listening at: %s", server, addr)
if logOut != nil {
fmt.Fprintln(logOut, msg)
@ -135,7 +141,7 @@ var errLogstrWithoutLog = errors.New("--log-output specified without --log")
// Setup sets debugger flags based on the contents of logstr.
// If logDest is not empty logs will be redirected to the file descriptor or
// file path specified by logDest.
func Setup(logFlag bool, logstr string, logDest string) error {
func Setup(logFlag bool, logstr, logDest string) error {
if logDest != "" {
n, err := strconv.Atoi(logDest)
if err == nil {
@ -159,6 +165,7 @@ func Setup(logFlag bool, logstr string, logDest string) error {
if logstr == "" {
logstr = "debugger"
}
any = true
v := strings.Split(logstr, ",")
for _, logcmd := range v {
// If adding another value, do make sure to

6
service/rpccommon/sameuser_linux.go
View File

@ -11,6 +11,8 @@ import (
"net"
"os"
"strings"
"github.com/go-delve/delve/pkg/logflags"
)
// for testing
@ -108,7 +110,11 @@ func canAccept(listenAddr, remoteAddr net.Addr) bool {
log.Printf("cannot check remote address: %v", err)
}
if !same {
if logflags.Any() {
log.Printf("closing connection from different user (%v): connections to localhost are only accepted from the same UNIX user for security reasons", addr)
} else {
fmt.Fprintf(os.Stderr, "closing connection from different user (%v): connections to localhost are only accepted from the same UNIX user for security reasons", addr)
}
return false
}
return true