Merge remote-tracking branch 'couchbase/trinity'

Change-Id: I8c84ac1d5c23b68bd1523dcbd46a0d3b29e026bc

Author: GauravJayaraj

go.sum

@@ -546,8 +546,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
-golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

server/completed_requests.go

@@ -675,17 +675,7 @@ func LogRequest(request_time, service_time, transactionElapsedTime time.Duration
 		}
 	}
 
-	// MB-63043
-	prependDollar := func(namedArgs map[string]value.Value) map[string]value.Value {
-		prependedNamedArgs := make(map[string]value.Value, len(namedArgs))
-
-		for k, v := range namedArgs {
-			prependedNamedArgs["$"+k] = v
-		}
-
-		return prependedNamedArgs
-	}
-	re.NamedArgs = prependDollar(request.RedactedNamedArgs())
+	re.NamedArgs = request.FormattedRedactedNamedArgs()
 	re.PositionalArgs = request.RedactedPositionalArgs()
 
 	re.Users = datastore.CredsString(request.Credentials())

server/http/service_request.go

@@ -251,7 +251,7 @@ func newHttpRequest(rv *httpRequest, resp http.ResponseWriter, req *http.Request
 		data["statement"] = rv.EventStatement()
 		data["natural"] = rv.Natural()
 		data["query_context"] = rv.QueryContext()
-		data["named_args"] = httpArgs.getNamedArgs()
+		data["named_args"] = httpArgs.getFormattedNamedArgs()
 		data["client_context_id"] = rv.ClientContextId()
 		// only include fields not already processed in args
 		a := make(map[string]interface{})
@@ -1333,6 +1333,7 @@ type httpRequestArgs interface {
 	getTristateVal(field string, v interface{}) (value.Tristate, errors.Error)
 	getPreparedName(field string, v interface{}) (string, errors.Error)
 	getNamedArgs() map[string]value.Value
+	getFormattedNamedArgs() map[string]value.Value
 	getPositionalArgs(parm string, val interface{}) (value.Values, errors.Error)
 	getCredentials() (*auth.Credentials, errors.Error)
 	getScanVector() (timestamp.Vector, errors.Error)
@@ -1446,6 +1447,18 @@ func (this *urlArgs) getNamedArgs() map[string]value.Value {
 	return this.named
 }
 
+func (this *urlArgs) getFormattedNamedArgs() map[string]value.Value {
+	fnamedArgs := make(map[string]value.Value, len(this.named))
+	for k, v := range this.named {
+		if server.IsSpecialNamedParam(k) {
+			fnamedArgs[k] = server.REDACTED_VALUE
+		} else {
+			fnamedArgs[k] = v
+		}
+	}
+	return fnamedArgs
+}
+
 func getJsonDecoder(r io.Reader) (*json.Decoder, errors.Error) {
 	if r == nil {
 		return nil, errors.NewServiceErrorDecodeNil()
@@ -1838,6 +1851,18 @@ func (this *jsonArgs) getNamedArgs() map[string]value.Value {
 	return this.named
 }
 
+func (this *jsonArgs) getFormattedNamedArgs() map[string]value.Value {
+	fnamedArgs := make(map[string]value.Value, len(this.named))
+	for k, v := range this.named {
+		if server.IsSpecialNamedParam(k) {
+			fnamedArgs[k] = server.REDACTED_VALUE
+		} else {
+			fnamedArgs[k] = v
+		}
+	}
+	return fnamedArgs
+}
+
 func (this *jsonArgs) getPositionalArgs(parm string, val interface{}) (value.Values, errors.Error) {
 	var positionalArgs value.Values
 

server/http/service_response.go

@@ -1039,7 +1039,7 @@ func (this *httpRequest) writeControls(controls bool, prefix, indent string) boo
 		return true
 	}
 
-	namedArgs := this.NamedArgs()
+	namedArgs := this.FormattedRedactedNamedArgs()
 	positionalArgs := this.PositionalArgs()
 
 	if prefix != "" {
@@ -1165,7 +1165,7 @@ func (this *httpRequest) writeControlsXML(controls bool, prefix string, indent s
 		return true
 	}
 
-	namedArgs := this.NamedArgs()
+	namedArgs := this.FormattedRedactedNamedArgs()
 	positionalArgs := this.PositionalArgs()
 
 	var newPrefix string

server/request.go

@@ -234,7 +234,7 @@ type Request interface {
 
 	Sensitive() bool
 	RedactedStatement() string
-	RedactedNamedArgs() map[string]value.Value
+	FormattedRedactedNamedArgs() map[string]value.Value
 	RedactedPositionalArgs() value.Values
 
 	SessionMemory() uint64
@@ -628,16 +628,33 @@ func (this *BaseRequest) IsPrepare() bool {
 	return this.isPrepare
 }
 
+var REDACTED_VALUE = value.NewValue(map[string]interface{}{"redacted": true})
+
+func IsSpecialNamedParam(param string) bool {
+	return len(param) > 2 && param[0] == '_' && param[len(param)-1] == '_'
+}
+
 func (this *BaseRequest) NamedArgs() map[string]value.Value {
 	return this.namedArgs
 }
 
 var _REDACTED_VALUE = value.NewValue(map[string]interface{}{"redacted": true})
 
-func (this *BaseRequest) RedactedNamedArgs() map[string]value.Value {
+func (this *BaseRequest) FormattedRedactedNamedArgs() map[string]value.Value {
+
 	if !this.Sensitive() {
-		return this.namedArgs
+		prependedNamedArgs := make(map[string]value.Value, len(this.namedArgs))
+
+		for k, v := range this.namedArgs {
+			if IsSpecialNamedParam(k) {
+				prependedNamedArgs["$"+k] = REDACTED_VALUE
+			} else {
+				prependedNamedArgs["$"+k] = v
+			}
+		}
+		return prependedNamedArgs
 	}
+
 	rv := make(map[string]value.Value, len(this.namedArgs))
 	for k, _ := range this.namedArgs {
 		rv[k] = _REDACTED_VALUE
@@ -1581,7 +1598,7 @@ func (this *BaseRequest) EventUsers() []string {
 
 // For audit.Auditable interface.
 func (this *BaseRequest) EventNamedArgs() map[string]interface{} {
-	argsMap := this.RedactedNamedArgs()
+	argsMap := this.FormattedRedactedNamedArgs()
 	ret := make(map[string]interface{}, len(argsMap))
 	for name, argValue := range argsMap {
 		ret[name] = argValue.Actual()
@@ -1840,7 +1857,7 @@ func (this *BaseRequest) Format(durStyle util.DurationStyle, controls bool, prof
 	}
 
 	if controls {
-		na := this.RedactedNamedArgs()
+		na := this.FormattedRedactedNamedArgs()
 		if na != nil {
 			item["namedArgs"] = util.InterfaceRedacted(na, redact)
 		}

shell/cbq/command/set.go

@@ -123,7 +123,15 @@ func (this *Set) ExecCommand(args []string) (errors.ErrorCode, string) {
 			for i := range names {
 				name := names[i]
 				value := NamedParam[name]
-				werr = printSET(name, fmt.Sprintf("%v", *value))
+				if len(name) > 2 && name[0] == '_' && name[len(name)-1] == '_' {
+					vals := make([]string, len(*value))
+					for i := range vals {
+						vals[i] = "***"
+					}
+					werr = printSET(name, fmt.Sprintf("%v", vals))
+				} else {
+					werr = printSET(name, fmt.Sprintf("%v", *value))
+				}
 				if werr != nil {
 					return processOutputError(werr)
 				}

shell/cbq/history.go

@@ -11,6 +11,7 @@ package main
 import (
 	"bufio"
 	"os"
+	"regexp"
 	"strings"
 
 	"github.com/couchbase/query/errors"
@@ -35,8 +36,11 @@ func LoadHistory(liner *liner.State, dir string) (errors.ErrorCode, string) {
 	return 0, ""
 }
 
+var redactSpecialNamedParamRegex = regexp.MustCompile(`(\s+-[\$@]_\w+_\s+).*?;`)
+
 func UpdateHistory(liner *liner.State, dir, line string) (errors.ErrorCode, string) {
-	liner.AppendHistory(line)
+	rline := redactSpecialNamedParamRegex.ReplaceAllString(line, "$1***;")
+	liner.AppendHistory(rline)
 	if dir != "" {
 		path := command.GetPath(dir, command.HISTFILE)
 		err_code, err_str := WriteHistoryToFile(liner, path)