Merge pull request #126 from SenseUnit/cert_auth_sn_interning

Snawoot · web-flow · commit 66d70c0740d7 · 2025-05-07T12:57:28.000+03:00
cert auth: proper cert SN interning
diff --git a/auth/cert.go b/auth/cert.go
@@ -15,6 +15,8 @@ import (
 	"time"
 
 	clog "github.com/SenseUnit/dumbproxy/log"
+
+	us "github.com/Snawoot/uniqueslice"
 )
 
 type serialNumberSetFile struct {
@@ -149,22 +151,20 @@ func formatSerial(serial *big.Int) string {
 	return string(buf[:len(buf)-1])
 }
 
-type serialNumberKey = [20]byte
+type serialNumberKey = us.Handle[[]byte, byte]
 type serialNumberSet struct {
 	sns map[serialNumberKey]struct{}
 }
 
-func normalizeSNBytes(b []byte) serialNumberKey {
-	var k serialNumberKey
-	copy(
-		k[max(len(k)-len(b), 0):],
-		b[max(len(b)-len(k), 0):],
-	)
-	return k
+func cutLeadingZeroes(b []byte) []byte {
+	for len(b) > 1 && b[0] == 0 {
+		b = b[1:]
+	}
+	return b
 }
 
 func (s *serialNumberSet) Has(serial *big.Int) bool {
-	key := normalizeSNBytes(serial.Bytes())
+	key := us.Make(cutLeadingZeroes(serial.Bytes()))
 	if s == nil || s.sns == nil {
 		return false
 	}
@@ -188,7 +188,7 @@ func newSerialNumberSetFromReader(r io.Reader, bad func(error)) (*serialNumberSe
 			}
 			continue
 		}
-		set[normalizeSNBytes(serial)] = struct{}{}
+		set[us.Make(cutLeadingZeroes(serial))] = struct{}{}
 	}
 
 	if err := scanner.Err(); err != nil {
diff --git a/go.mod b/go.mod
@@ -5,6 +5,7 @@ go 1.23.0
 toolchain go1.24.1
 
 require (
+	github.com/Snawoot/uniqueslice v0.1.1
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/dop251/goja v0.0.0-20250309171923-bcd7cc6bf64c
 	github.com/hashicorp/go-multierror v1.1.1
@@ -14,12 +15,11 @@ require (
 	github.com/tg123/go-htpasswd v1.2.3
 	github.com/zeebo/xxh3 v1.0.2
 	golang.org/x/crypto v0.37.0
+	golang.org/x/crypto/x509roots/fallback v0.0.0-20250406160420-959f8f3db0fb
 	golang.org/x/net v0.39.0
 	golang.org/x/time v0.11.0
 )
 
-require golang.org/x/crypto/x509roots/fallback v0.0.0-20250406160420-959f8f3db0fb
-
 require (
 	github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
diff --git a/go.sum b/go.sum
@@ -2,6 +2,8 @@ github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 h1:IEjq88XO4PuBDcv
 github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5/go.mod h1:exZ0C/1emQJAw5tHOaUDyY1ycttqBAPcxuzf7QbY6ec=
 github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
 github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
+github.com/Snawoot/uniqueslice v0.1.1 h1:KEfv3FtAXiNEoxvcc79pFQDhnqwYXQyZIkxOM4e/qpw=
+github.com/Snawoot/uniqueslice v0.1.1/go.mod h1:K9zIaHO43FGLHbqm6WCDFeY6+CN/du5eiio/vxvDVC8=
 github.com/Snawoot/xtime v0.0.0-20250501122004-d1ce456948bb h1:PleTDwc/EQenzLsvIal2BgvIXr2D214M88RFac3WkeI=
 github.com/Snawoot/xtime v0.0.0-20250501122004-d1ce456948bb/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ import (`
`15`	`15`	`"time"`
`16`	`16`
`17`	`17`	`clog "github.com/SenseUnit/dumbproxy/log"`
	`18`	`+`
	`19`	`+ us "github.com/Snawoot/uniqueslice"`
`18`	`20`	`)`
`19`	`21`
`20`	`22`	`type serialNumberSetFile struct {`
`@@ -149,22 +151,20 @@ func formatSerial(serial *big.Int) string {`
`149`	`151`	`return string(buf[:len(buf)-1])`
`150`	`152`	`}`
`151`	`153`
`152`		`-type serialNumberKey = [20]byte`
	`154`	`+type serialNumberKey = us.Handle[[]byte, byte]`
`153`	`155`	`type serialNumberSet struct {`
`154`	`156`	`sns map[serialNumberKey]struct{}`
`155`	`157`	`}`
`156`	`158`
`157`		`-func normalizeSNBytes(b []byte) serialNumberKey {`
`158`		`- var k serialNumberKey`
`159`		`- copy(`
`160`		`- k[max(len(k)-len(b), 0):],`
`161`		`- b[max(len(b)-len(k), 0):],`
`162`		`- )`
`163`		`- return k`
	`159`	`+func cutLeadingZeroes(b []byte) []byte {`
	`160`	`+ for len(b) > 1 && b[0] == 0 {`
	`161`	`+ b = b[1:]`
	`162`	`+ }`
	`163`	`+ return b`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`func (s serialNumberSet) Has(serial big.Int) bool {`
`167`		`- key := normalizeSNBytes(serial.Bytes())`
	`167`	`+ key := us.Make(cutLeadingZeroes(serial.Bytes()))`
`168`	`168`	`if s == nil \|\| s.sns == nil {`
`169`	`169`	`return false`
`170`	`170`	`}`
`@@ -188,7 +188,7 @@ func newSerialNumberSetFromReader(r io.Reader, bad func(error)) (*serialNumberSe`
`188`	`188`	`}`
`189`	`189`	`continue`
`190`	`190`	`}`
`191`		`- set[normalizeSNBytes(serial)] = struct{}{}`
	`191`	`+ set[us.Make(cutLeadingZeroes(serial))] = struct{}{}`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`if err := scanner.Err(); err != nil {`