Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
8431b6adf5
|
|||
24e923fe84
|
|||
10ddc7c190
|
|||
7f88a0726c
|
|||
2224db8e85
|
|||
c60afc89bb
|
|||
bbb33e9fd6
|
142
cmdext/cmdrunner.go
Normal file
142
cmdext/cmdrunner.go
Normal file
@@ -0,0 +1,142 @@
|
||||
package cmdext
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"os/exec"
|
||||
"time"
|
||||
)
|
||||
|
||||
type CommandResult struct {
|
||||
StdOut string
|
||||
StdErr string
|
||||
StdCombined string
|
||||
ExitCode int
|
||||
CommandTimedOut bool
|
||||
}
|
||||
|
||||
func RunCommand(program string, args []string, timeout *time.Duration) (CommandResult, error) {
|
||||
|
||||
cmd := exec.Command(program, args...)
|
||||
|
||||
stdoutPipe, err := cmd.StdoutPipe()
|
||||
if err != nil {
|
||||
return CommandResult{}, err
|
||||
}
|
||||
|
||||
stderrPipe, err := cmd.StderrPipe()
|
||||
if err != nil {
|
||||
return CommandResult{}, err
|
||||
}
|
||||
|
||||
err = cmd.Start()
|
||||
if err != nil {
|
||||
return CommandResult{}, err
|
||||
}
|
||||
|
||||
errch := make(chan error, 1)
|
||||
go func() { errch <- cmd.Wait() }()
|
||||
|
||||
combch := make(chan string, 32)
|
||||
stopCombch := make(chan bool)
|
||||
|
||||
stdout := ""
|
||||
go func() {
|
||||
scanner := bufio.NewScanner(stdoutPipe)
|
||||
for scanner.Scan() {
|
||||
txt := scanner.Text()
|
||||
stdout += txt
|
||||
combch <- txt
|
||||
}
|
||||
}()
|
||||
|
||||
stderr := ""
|
||||
go func() {
|
||||
scanner := bufio.NewScanner(stderrPipe)
|
||||
for scanner.Scan() {
|
||||
txt := scanner.Text()
|
||||
stderr += txt
|
||||
combch <- txt
|
||||
}
|
||||
}()
|
||||
|
||||
defer func() {
|
||||
stopCombch <- true
|
||||
}()
|
||||
|
||||
stdcombined := ""
|
||||
go func() {
|
||||
for {
|
||||
select {
|
||||
case txt := <-combch:
|
||||
stdcombined += txt
|
||||
case <-stopCombch:
|
||||
return
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
if timeout != nil {
|
||||
|
||||
select {
|
||||
|
||||
case <-time.After(*timeout):
|
||||
_ = cmd.Process.Kill()
|
||||
return CommandResult{
|
||||
StdOut: stdout,
|
||||
StdErr: stderr,
|
||||
StdCombined: stdcombined,
|
||||
ExitCode: -1,
|
||||
CommandTimedOut: true,
|
||||
}, nil
|
||||
|
||||
case err := <-errch:
|
||||
if exiterr, ok := err.(*exec.ExitError); ok {
|
||||
return CommandResult{
|
||||
StdOut: stdout,
|
||||
StdErr: stderr,
|
||||
StdCombined: stdcombined,
|
||||
ExitCode: exiterr.ExitCode(),
|
||||
CommandTimedOut: false,
|
||||
}, nil
|
||||
} else if err != nil {
|
||||
return CommandResult{}, err
|
||||
} else {
|
||||
return CommandResult{
|
||||
StdOut: stdout,
|
||||
StdErr: stderr,
|
||||
StdCombined: stdcombined,
|
||||
ExitCode: 0,
|
||||
CommandTimedOut: false,
|
||||
}, nil
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
select {
|
||||
|
||||
case err := <-errch:
|
||||
if exiterr, ok := err.(*exec.ExitError); ok {
|
||||
return CommandResult{
|
||||
StdOut: stdout,
|
||||
StdErr: stderr,
|
||||
StdCombined: stdcombined,
|
||||
ExitCode: exiterr.ExitCode(),
|
||||
CommandTimedOut: false,
|
||||
}, nil
|
||||
} else if err != nil {
|
||||
return CommandResult{}, err
|
||||
} else {
|
||||
return CommandResult{
|
||||
StdOut: stdout,
|
||||
StdErr: stderr,
|
||||
StdCombined: stdcombined,
|
||||
ExitCode: 0,
|
||||
CommandTimedOut: false,
|
||||
}, nil
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
270
cryptext/passHash.go
Normal file
270
cryptext/passHash.go
Normal file
@@ -0,0 +1,270 @@
|
||||
package cryptext
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"crypto/sha256"
|
||||
"encoding/base64"
|
||||
"encoding/hex"
|
||||
"errors"
|
||||
"fmt"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/totpext"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
const LatestPassHashVersion = 4
|
||||
|
||||
// PassHash
|
||||
// - [v0]: plaintext password ( `0|...` )
|
||||
// - [v1]: sha256(plaintext)
|
||||
// - [v2]: seed | sha256<seed>(plaintext)
|
||||
// - [v3]: seed | sha256<seed>(plaintext) | [hex(totp)]
|
||||
// - [v4]: bcrypt(plaintext) | [hex(totp)]
|
||||
type PassHash string
|
||||
|
||||
func (ph PassHash) Valid() bool {
|
||||
_, _, _, _, _, valid := ph.Data()
|
||||
return valid
|
||||
}
|
||||
|
||||
func (ph PassHash) HasTOTP() bool {
|
||||
_, _, _, otp, _, _ := ph.Data()
|
||||
return otp
|
||||
}
|
||||
|
||||
func (ph PassHash) Data() (_version int, _seed []byte, _payload []byte, _totp bool, _totpsecret []byte, _valid bool) {
|
||||
|
||||
split := strings.Split(string(ph), "|")
|
||||
if len(split) == 0 {
|
||||
return -1, nil, nil, false, nil, false
|
||||
}
|
||||
|
||||
version, err := strconv.ParseInt(split[0], 10, 32)
|
||||
if err != nil {
|
||||
return -1, nil, nil, false, nil, false
|
||||
}
|
||||
|
||||
if version == 0 {
|
||||
if len(split) != 2 {
|
||||
return -1, nil, nil, false, nil, false
|
||||
}
|
||||
return int(version), nil, []byte(split[1]), false, nil, true
|
||||
}
|
||||
|
||||
if version == 1 {
|
||||
if len(split) != 2 {
|
||||
return -1, nil, nil, false, nil, false
|
||||
}
|
||||
payload, err := base64.RawStdEncoding.DecodeString(split[1])
|
||||
if err != nil {
|
||||
return -1, nil, nil, false, nil, false
|
||||
}
|
||||
return int(version), nil, payload, false, nil, true
|
||||
}
|
||||
|
||||
//
|
||||
if version == 2 {
|
||||
if len(split) != 3 {
|
||||
return -1, nil, nil, false, nil, false
|
||||
}
|
||||
seed, err := base64.RawStdEncoding.DecodeString(split[1])
|
||||
if err != nil {
|
||||
return -1, nil, nil, false, nil, false
|
||||
}
|
||||
payload, err := base64.RawStdEncoding.DecodeString(split[2])
|
||||
if err != nil {
|
||||
return -1, nil, nil, false, nil, false
|
||||
}
|
||||
return int(version), seed, payload, false, nil, true
|
||||
}
|
||||
|
||||
if version == 3 {
|
||||
if len(split) != 4 {
|
||||
return -1, nil, nil, false, nil, false
|
||||
}
|
||||
seed, err := base64.RawStdEncoding.DecodeString(split[1])
|
||||
if err != nil {
|
||||
return -1, nil, nil, false, nil, false
|
||||
}
|
||||
payload, err := base64.RawStdEncoding.DecodeString(split[2])
|
||||
if err != nil {
|
||||
return -1, nil, nil, false, nil, false
|
||||
}
|
||||
totp := false
|
||||
totpsecret := make([]byte, 0)
|
||||
if split[3] != "0" {
|
||||
totpsecret, err = hex.DecodeString(split[3])
|
||||
totp = true
|
||||
}
|
||||
return int(version), seed, payload, totp, totpsecret, true
|
||||
}
|
||||
|
||||
if version == 4 {
|
||||
if len(split) != 3 {
|
||||
return -1, nil, nil, false, nil, false
|
||||
}
|
||||
payload := []byte(split[1])
|
||||
totp := false
|
||||
totpsecret := make([]byte, 0)
|
||||
if split[2] != "0" {
|
||||
totpsecret, err = hex.DecodeString(split[3])
|
||||
totp = true
|
||||
}
|
||||
return int(version), nil, payload, totp, totpsecret, true
|
||||
}
|
||||
|
||||
return -1, nil, nil, false, nil, false
|
||||
}
|
||||
|
||||
func (ph PassHash) Verify(plainpass string, totp *string) bool {
|
||||
version, seed, payload, hastotp, totpsecret, valid := ph.Data()
|
||||
if !valid {
|
||||
return false
|
||||
}
|
||||
|
||||
if hastotp && totp == nil {
|
||||
return false
|
||||
}
|
||||
|
||||
if version == 0 {
|
||||
return langext.ArrEqualsExact([]byte(plainpass), payload)
|
||||
}
|
||||
|
||||
if version == 1 {
|
||||
return langext.ArrEqualsExact(hash256(plainpass), payload)
|
||||
}
|
||||
|
||||
if version == 2 {
|
||||
return langext.ArrEqualsExact(hash256Seeded(plainpass, seed), payload)
|
||||
}
|
||||
|
||||
if version == 3 {
|
||||
if !hastotp {
|
||||
return langext.ArrEqualsExact(hash256Seeded(plainpass, seed), payload)
|
||||
} else {
|
||||
return langext.ArrEqualsExact(hash256Seeded(plainpass, seed), payload) && totpext.Validate(totpsecret, *totp)
|
||||
}
|
||||
}
|
||||
|
||||
if version == 4 {
|
||||
if !hastotp {
|
||||
return bcrypt.CompareHashAndPassword(payload, []byte(plainpass)) == nil
|
||||
} else {
|
||||
return bcrypt.CompareHashAndPassword(payload, []byte(plainpass)) == nil && totpext.Validate(totpsecret, *totp)
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func (ph PassHash) NeedsPasswordUpgrade() bool {
|
||||
version, _, _, _, _, valid := ph.Data()
|
||||
return valid && version < LatestPassHashVersion
|
||||
}
|
||||
|
||||
func (ph PassHash) Upgrade(plainpass string) (PassHash, error) {
|
||||
version, _, _, hastotp, totpsecret, valid := ph.Data()
|
||||
if !valid {
|
||||
return "", errors.New("invalid password")
|
||||
}
|
||||
if version == LatestPassHashVersion {
|
||||
return ph, nil
|
||||
}
|
||||
if hastotp {
|
||||
return HashPassword(plainpass, totpsecret)
|
||||
} else {
|
||||
return HashPassword(plainpass, nil)
|
||||
}
|
||||
}
|
||||
|
||||
func (ph PassHash) String() string {
|
||||
return string(ph)
|
||||
}
|
||||
|
||||
func HashPassword(plainpass string, totpSecret []byte) (PassHash, error) {
|
||||
return HashPasswordV4(plainpass, totpSecret)
|
||||
}
|
||||
|
||||
func HashPasswordV4(plainpass string, totpSecret []byte) (PassHash, error) {
|
||||
var strtotp string
|
||||
|
||||
if totpSecret == nil {
|
||||
strtotp = "0"
|
||||
} else {
|
||||
strtotp = hex.EncodeToString(totpSecret)
|
||||
}
|
||||
|
||||
payload, err := bcrypt.GenerateFromPassword([]byte(plainpass), bcrypt.MinCost)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return PassHash(fmt.Sprintf("4|%s|%s", string(payload), strtotp)), nil
|
||||
}
|
||||
|
||||
func HashPasswordV3(plainpass string, totpSecret []byte) (PassHash, error) {
|
||||
var strtotp string
|
||||
|
||||
if totpSecret == nil {
|
||||
strtotp = "0"
|
||||
} else {
|
||||
strtotp = hex.EncodeToString(totpSecret)
|
||||
}
|
||||
|
||||
seed, err := newSeed()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
checksum := hash256Seeded(plainpass, seed)
|
||||
|
||||
return PassHash(fmt.Sprintf("3|%s|%s|%s",
|
||||
base64.RawStdEncoding.EncodeToString(seed),
|
||||
base64.RawStdEncoding.EncodeToString(checksum),
|
||||
strtotp)), nil
|
||||
}
|
||||
|
||||
func HashPasswordV2(plainpass string) (PassHash, error) {
|
||||
seed, err := newSeed()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
checksum := hash256Seeded(plainpass, seed)
|
||||
|
||||
return PassHash(fmt.Sprintf("2|%s|%s", base64.RawStdEncoding.EncodeToString(seed), base64.RawStdEncoding.EncodeToString(checksum))), nil
|
||||
}
|
||||
|
||||
func HashPasswordV1(plainpass string) (PassHash, error) {
|
||||
return PassHash(fmt.Sprintf("1|%s", base64.RawStdEncoding.EncodeToString(hash256(plainpass)))), nil
|
||||
}
|
||||
|
||||
func HashPasswordV0(plainpass string) (PassHash, error) {
|
||||
return PassHash(fmt.Sprintf("0|%s", plainpass)), nil
|
||||
}
|
||||
|
||||
func hash256(s string) []byte {
|
||||
h := sha256.New()
|
||||
h.Write([]byte(s))
|
||||
bs := h.Sum(nil)
|
||||
return bs
|
||||
}
|
||||
|
||||
func hash256Seeded(s string, seed []byte) []byte {
|
||||
h := sha256.New()
|
||||
h.Write(seed)
|
||||
h.Write([]byte(s))
|
||||
bs := h.Sum(nil)
|
||||
return bs
|
||||
}
|
||||
|
||||
func newSeed() ([]byte, error) {
|
||||
secret := make([]byte, 32)
|
||||
_, err := rand.Read(secret)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return secret, nil
|
||||
}
|
@@ -8,10 +8,10 @@ import (
|
||||
type brcMode int
|
||||
|
||||
const (
|
||||
modeSourceReading = 0
|
||||
modeSourceFinished = 1
|
||||
modeBufferReading = 2
|
||||
modeBufferFinished = 3
|
||||
modeSourceReading brcMode = 0
|
||||
modeSourceFinished brcMode = 1
|
||||
modeBufferReading brcMode = 2
|
||||
modeBufferFinished brcMode = 3
|
||||
)
|
||||
|
||||
type BufferedReadCloser interface {
|
||||
|
9
go.mod
9
go.mod
@@ -3,8 +3,11 @@ module gogs.mikescher.com/BlackForestBytes/goext
|
||||
go 1.19
|
||||
|
||||
require (
|
||||
golang.org/x/sys v0.1.0
|
||||
golang.org/x/term v0.1.0
|
||||
golang.org/x/sys v0.3.0
|
||||
golang.org/x/term v0.3.0
|
||||
)
|
||||
|
||||
require github.com/jmoiron/sqlx v1.3.5 // indirect
|
||||
require (
|
||||
github.com/jmoiron/sqlx v1.3.5 // indirect
|
||||
golang.org/x/crypto v0.4.0 // indirect
|
||||
)
|
||||
|
6
go.sum
6
go.sum
@@ -3,7 +3,13 @@ github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
|
||||
github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
|
||||
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
||||
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
|
||||
golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
|
||||
golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
|
||||
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
|
||||
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
|
||||
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
|
||||
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
|
||||
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
|
||||
|
116
sq/scanner.go
116
sq/scanner.go
@@ -6,24 +6,78 @@ import (
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
func ScanSingle[TData any](rows *sqlx.Rows, close bool) (TData, error) {
|
||||
type StructScanMode string
|
||||
|
||||
const (
|
||||
SModeFast StructScanMode = "FAST"
|
||||
SModeExtended StructScanMode = "EXTENDED"
|
||||
)
|
||||
|
||||
type StructScanSafety string
|
||||
|
||||
const (
|
||||
Safe StructScanSafety = "SAFE"
|
||||
Unsafe StructScanSafety = "UNSAFE"
|
||||
)
|
||||
|
||||
func ScanSingle[TData any](rows *sqlx.Rows, mode StructScanMode, sec StructScanSafety, close bool) (TData, error) {
|
||||
if rows.Next() {
|
||||
var strscan *StructScanner
|
||||
|
||||
if sec == Safe {
|
||||
strscan = NewStructScanner(rows, false)
|
||||
var data TData
|
||||
err := strscan.Start(&data)
|
||||
if err != nil {
|
||||
return *new(TData), err
|
||||
}
|
||||
} else if sec == Unsafe {
|
||||
strscan = NewStructScanner(rows, true)
|
||||
var data TData
|
||||
err := strscan.Start(&data)
|
||||
if err != nil {
|
||||
return *new(TData), err
|
||||
}
|
||||
} else {
|
||||
return *new(TData), errors.New("unknown value for <sec>")
|
||||
}
|
||||
|
||||
var data TData
|
||||
err := rows.StructScan(&data)
|
||||
if err != nil {
|
||||
return *new(TData), err
|
||||
|
||||
if mode == SModeFast {
|
||||
err := strscan.StructScanBase(&data)
|
||||
if err != nil {
|
||||
return *new(TData), err
|
||||
}
|
||||
} else if mode == SModeExtended {
|
||||
err := strscan.StructScanExt(&data)
|
||||
if err != nil {
|
||||
return *new(TData), err
|
||||
}
|
||||
} else {
|
||||
return *new(TData), errors.New("unknown value for <mode>")
|
||||
}
|
||||
|
||||
if rows.Next() {
|
||||
_ = rows.Close()
|
||||
return *new(TData), errors.New("sql returned more than onw row")
|
||||
if close {
|
||||
_ = rows.Close()
|
||||
}
|
||||
return *new(TData), errors.New("sql returned more than one row")
|
||||
}
|
||||
|
||||
if close {
|
||||
err = rows.Close()
|
||||
err := rows.Close()
|
||||
if err != nil {
|
||||
return *new(TData), err
|
||||
}
|
||||
}
|
||||
|
||||
if err := rows.Err(); err != nil {
|
||||
return *new(TData), err
|
||||
}
|
||||
|
||||
return data, nil
|
||||
|
||||
} else {
|
||||
if close {
|
||||
_ = rows.Close()
|
||||
@@ -32,21 +86,55 @@ func ScanSingle[TData any](rows *sqlx.Rows, close bool) (TData, error) {
|
||||
}
|
||||
}
|
||||
|
||||
func ScanAll[TData any](rows *sqlx.Rows, close bool) ([]TData, error) {
|
||||
func ScanAll[TData any](rows *sqlx.Rows, mode StructScanMode, sec StructScanSafety, close bool) ([]TData, error) {
|
||||
var strscan *StructScanner
|
||||
|
||||
if sec == Safe {
|
||||
strscan = NewStructScanner(rows, false)
|
||||
var data TData
|
||||
err := strscan.Start(&data)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
} else if sec == Unsafe {
|
||||
strscan = NewStructScanner(rows, true)
|
||||
var data TData
|
||||
err := strscan.Start(&data)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
} else {
|
||||
return nil, errors.New("unknown value for <sec>")
|
||||
}
|
||||
|
||||
res := make([]TData, 0)
|
||||
for rows.Next() {
|
||||
var data TData
|
||||
err := rows.StructScan(&data)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
if mode == SModeFast {
|
||||
var data TData
|
||||
err := strscan.StructScanBase(&data)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
res = append(res, data)
|
||||
} else if mode == SModeExtended {
|
||||
var data TData
|
||||
err := strscan.StructScanExt(&data)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
res = append(res, data)
|
||||
} else {
|
||||
return nil, errors.New("unknown value for <mode>")
|
||||
}
|
||||
res = append(res, data)
|
||||
}
|
||||
if close {
|
||||
err := rows.Close()
|
||||
err := strscan.rows.Close()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return res, nil
|
||||
}
|
||||
|
223
sq/structscanner.go
Normal file
223
sq/structscanner.go
Normal file
@@ -0,0 +1,223 @@
|
||||
package sq
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/jmoiron/sqlx"
|
||||
"github.com/jmoiron/sqlx/reflectx"
|
||||
"reflect"
|
||||
)
|
||||
|
||||
// forked from sqlx, but added ability to unmarshal optional-nested structs
|
||||
|
||||
type StructScanner struct {
|
||||
rows *sqlx.Rows
|
||||
Mapper *reflectx.Mapper
|
||||
unsafe bool
|
||||
|
||||
fields [][]int
|
||||
values []any
|
||||
columns []string
|
||||
}
|
||||
|
||||
func NewStructScanner(rows *sqlx.Rows, unsafe bool) *StructScanner {
|
||||
return &StructScanner{
|
||||
rows: rows,
|
||||
Mapper: reflectx.NewMapper("db"),
|
||||
unsafe: unsafe,
|
||||
}
|
||||
}
|
||||
|
||||
func (r *StructScanner) Start(dest any) error {
|
||||
v := reflect.ValueOf(dest)
|
||||
|
||||
if v.Kind() != reflect.Ptr {
|
||||
return errors.New("must pass a pointer, not a value, to StructScan destination")
|
||||
}
|
||||
|
||||
columns, err := r.rows.Columns()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
r.columns = columns
|
||||
r.fields = r.Mapper.TraversalsByName(v.Type(), columns)
|
||||
// if we are not unsafe and are missing fields, return an error
|
||||
if f, err := missingFields(r.fields); err != nil && !r.unsafe {
|
||||
return fmt.Errorf("missing destination name %s in %T", columns[f], dest)
|
||||
}
|
||||
r.values = make([]interface{}, len(columns))
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// StructScanExt forked from github.com/jmoiron/sqlx@v1.3.5/sqlx.go
|
||||
// does also wok with nullabel structs (from LEFT JOIN's)
|
||||
func (r *StructScanner) StructScanExt(dest any) error {
|
||||
v := reflect.ValueOf(dest)
|
||||
|
||||
if v.Kind() != reflect.Ptr {
|
||||
return errors.New("must pass a pointer, not a value, to StructScan destination")
|
||||
}
|
||||
|
||||
// ========= STEP 1 :: =========
|
||||
|
||||
v = v.Elem()
|
||||
|
||||
err := fieldsByTraversalExtended(v, r.fields, r.values)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// scan into the struct field pointers and append to our results
|
||||
err = r.rows.Scan(r.values...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
nullStructs := make(map[string]bool)
|
||||
|
||||
for i, traversal := range r.fields {
|
||||
if len(traversal) == 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
isnsil := reflect.ValueOf(r.values[i]).Elem().IsNil()
|
||||
|
||||
for i := 1; i < len(traversal); i++ {
|
||||
|
||||
canParentNil := reflectx.FieldByIndexes(v, traversal[0:i]).Kind() == reflect.Pointer
|
||||
|
||||
k := fmt.Sprintf("%v", traversal[0:i])
|
||||
if v, ok := nullStructs[k]; ok {
|
||||
|
||||
nullStructs[k] = canParentNil && v && isnsil
|
||||
|
||||
} else {
|
||||
nullStructs[k] = canParentNil && isnsil
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
forcenulled := make(map[string]bool)
|
||||
|
||||
for i, traversal := range r.fields {
|
||||
if len(traversal) == 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
anyparentnull := false
|
||||
for i := 1; i < len(traversal); i++ {
|
||||
k := fmt.Sprintf("%v", traversal[0:i])
|
||||
if nv, ok := nullStructs[k]; ok && nv {
|
||||
|
||||
if _, ok := forcenulled[k]; !ok {
|
||||
f := reflectx.FieldByIndexes(v, traversal[0:i])
|
||||
f.Set(reflect.Zero(f.Type())) // set to nil
|
||||
forcenulled[k] = true
|
||||
}
|
||||
|
||||
anyparentnull = true
|
||||
break
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if anyparentnull {
|
||||
continue
|
||||
}
|
||||
|
||||
f := reflectx.FieldByIndexes(v, traversal)
|
||||
|
||||
val1 := reflect.ValueOf(r.values[i])
|
||||
val2 := val1.Elem()
|
||||
val3 := val2.Elem()
|
||||
|
||||
if val2.IsNil() {
|
||||
if f.Kind() != reflect.Pointer {
|
||||
return errors.New(fmt.Sprintf("Cannot set field %v to NULL value from column '%s' (type: %s)", traversal, r.columns[i], f.Type().String()))
|
||||
}
|
||||
|
||||
f.Set(reflect.Zero(f.Type())) // set to nil
|
||||
} else {
|
||||
f.Set(val3)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return r.rows.Err()
|
||||
}
|
||||
|
||||
// StructScanBase forked from github.com/jmoiron/sqlx@v1.3.5/sqlx.go
|
||||
// without (relevant) changes
|
||||
func (r *StructScanner) StructScanBase(dest any) error {
|
||||
v := reflect.ValueOf(dest)
|
||||
|
||||
if v.Kind() != reflect.Ptr {
|
||||
return errors.New("must pass a pointer, not a value, to StructScan destination")
|
||||
}
|
||||
|
||||
v = v.Elem()
|
||||
|
||||
err := fieldsByTraversalBase(v, r.fields, r.values, true)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// scan into the struct field pointers and append to our results
|
||||
err = r.rows.Scan(r.values...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return r.rows.Err()
|
||||
}
|
||||
|
||||
// fieldsByTraversal forked from github.com/jmoiron/sqlx@v1.3.5/sqlx.go
|
||||
func fieldsByTraversalExtended(v reflect.Value, traversals [][]int, values []interface{}) error {
|
||||
v = reflect.Indirect(v)
|
||||
if v.Kind() != reflect.Struct {
|
||||
return errors.New("argument not a struct")
|
||||
}
|
||||
|
||||
for i, traversal := range traversals {
|
||||
if len(traversal) == 0 {
|
||||
values[i] = new(interface{})
|
||||
continue
|
||||
}
|
||||
f := reflectx.FieldByIndexes(v, traversal)
|
||||
|
||||
values[i] = reflect.New(reflect.PointerTo(f.Type())).Interface()
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// fieldsByTraversal forked from github.com/jmoiron/sqlx@v1.3.5/sqlx.go
|
||||
func fieldsByTraversalBase(v reflect.Value, traversals [][]int, values []interface{}, ptrs bool) error {
|
||||
v = reflect.Indirect(v)
|
||||
if v.Kind() != reflect.Struct {
|
||||
return errors.New("argument not a struct")
|
||||
}
|
||||
|
||||
for i, traversal := range traversals {
|
||||
if len(traversal) == 0 {
|
||||
values[i] = new(interface{})
|
||||
continue
|
||||
}
|
||||
f := reflectx.FieldByIndexes(v, traversal)
|
||||
if ptrs {
|
||||
values[i] = f.Addr().Interface()
|
||||
} else {
|
||||
values[i] = f.Interface()
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// missingFields forked from github.com/jmoiron/sqlx@v1.3.5/sqlx.go
|
||||
func missingFields(transversals [][]int) (field int, err error) {
|
||||
for i, t := range transversals {
|
||||
if len(t) == 0 {
|
||||
return i, errors.New("missing field")
|
||||
}
|
||||
}
|
||||
return 0, nil
|
||||
}
|
Reference in New Issue
Block a user