mirror of
https://github.com/hanzo-ds/go.git
synced 2026-10-30 19:45:01 +00:00
zeekay
057c09c529
The server reads X-Datastore-User/-Key/-SSL-Certificate-Auth verbatim and defines no alias for the upstream vendor spelling, so the TLS branch of applyOptionsToRequest could not authenticate at all: the server ignored the headers, fell back to the default user and answered 401. Only the TLS branch was affected. The plaintext branch sets req.URL.User, which net/http sends as HTTP Basic, and Basic authenticates fine — which is why every current consumer works and this stayed latent. A DSN with scheme https or secure=true routes into the broken branch. The three names are now declared once in headers.go, and covered by tests that exercise the branch over a real TLS round trip. Also reports ClientName as datastore-go; it is a self-reported label that lands in system.query_log, and nothing filters on its value.
100 lines
2.0 KiB
Go
100 lines
2.0 KiB
Go
package datastore
|
|
|
|
import (
|
|
"fmt"
|
|
"runtime"
|
|
"sort"
|
|
"strings"
|
|
|
|
"github.com/hanzo-ds/go/lib/proto"
|
|
)
|
|
|
|
const ClientName = "datastore-go"
|
|
|
|
const (
|
|
ClientVersionMajor = 2
|
|
ClientVersionMinor = 44
|
|
ClientVersionPatch = 0
|
|
ClientTCPProtocolVersion = proto.DBMS_TCP_PROTOCOL_VERSION
|
|
)
|
|
|
|
type ClientInfo struct {
|
|
Products []struct {
|
|
Name string
|
|
Version string
|
|
}
|
|
|
|
Comment []string
|
|
}
|
|
|
|
// Append returns a new copy of the combined ClientInfo structs
|
|
func (a ClientInfo) Append(b ClientInfo) ClientInfo {
|
|
c := ClientInfo{
|
|
Products: make([]struct {
|
|
Name string
|
|
Version string
|
|
}, 0, len(a.Products)+len(b.Products)),
|
|
Comment: make([]string, 0, len(a.Comment)+len(b.Comment)),
|
|
}
|
|
|
|
for _, p := range a.Products {
|
|
c.Products = append(c.Products, p)
|
|
}
|
|
for _, p := range b.Products {
|
|
c.Products = append(c.Products, p)
|
|
}
|
|
|
|
for _, cm := range a.Comment {
|
|
c.Comment = append(c.Comment, cm)
|
|
}
|
|
for _, cm := range b.Comment {
|
|
c.Comment = append(c.Comment, cm)
|
|
}
|
|
|
|
return c
|
|
}
|
|
|
|
func (o ClientInfo) String() string {
|
|
var s strings.Builder
|
|
|
|
info := o
|
|
|
|
info.Products = append(info.Products, struct{ Name, Version string }{
|
|
Name: ClientName,
|
|
Version: fmt.Sprintf("%d.%d.%d", ClientVersionMajor, ClientVersionMinor, ClientVersionPatch),
|
|
})
|
|
|
|
encodedProducts := make([]string, len(info.Products))
|
|
for i, product := range info.Products {
|
|
encodedProducts[i] = fmt.Sprintf("%s/%s", product.Name, product.Version)
|
|
}
|
|
s.WriteString(strings.Join(encodedProducts, " "))
|
|
|
|
lvMeta := "lv:go/" + runtime.Version()[2:]
|
|
osMeta := "os:" + runtime.GOOS
|
|
|
|
chunks := make([]string, 0, len(info.Comment)+2)
|
|
chunks = append(chunks, info.Comment...)
|
|
chunks = append(chunks, lvMeta, osMeta)
|
|
|
|
s.WriteByte(' ')
|
|
s.WriteByte('(')
|
|
s.WriteString(strings.Join(chunks, "; "))
|
|
s.WriteByte(')')
|
|
|
|
return s.String()
|
|
}
|
|
|
|
func mapKeysInOrder[V any](m map[string]V) []string {
|
|
keys := make([]string, 0, len(m))
|
|
for key := range m {
|
|
keys = append(keys, key)
|
|
}
|
|
|
|
sort.Slice(keys, func(i, j int) bool {
|
|
return keys[i] < keys[j]
|
|
})
|
|
|
|
return keys
|
|
}
|