Skip to content

fix: use consistent cert common name #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agaffney merged 1 commit into from
Oct 12, 2025
Merged

fix: use consistent cert common name #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions internal/ca/ca.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func (c *Ca) loadKey(cfg *config.Config) error {

func (c *Ca) GenerateClientCert(clientName string) (*ClientCert, error) {
// Generate cert serial number from client name
clientSerial := ClientNameToSerialNumber([]byte(clientName))
clientSerial := ClientNameToSerialNumber(clientName)
// Cert template
cert := &x509.Certificate{
SerialNumber: clientSerial,
Expand Down Expand Up @@ -212,10 +212,10 @@ func (c *Ca) GenerateCRL(
return ret, nil
}

func ClientNameToSerialNumber(clientName []byte) *big.Int {
func ClientNameToSerialNumber(clientName string) *big.Int {
// Hash client name using blake2b-160 to use as cert serial number
hasher, _ := blake2b.New(20, nil)
hasher.Write(clientName)
hasher.Write([]byte(clientName))
clientNameHash := hasher.Sum(nil)
return new(big.Int).SetBytes(clientNameHash)
}
13 changes: 1 addition & 12 deletions internal/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
"github.com/blinklabs-io/vpn-indexer/internal/ca"
"github.com/blinklabs-io/vpn-indexer/internal/config"
"golang.org/x/crypto/blake2b"
)

const profileTemplate = `
Expand Down Expand Up @@ -56,7 +55,6 @@ type Client struct {
config *config.Config
ca *ca.Ca
assetName []byte
id string
}

func New(cfg *config.Config, caObj *ca.Ca, assetName []byte) *Client {
Expand Down Expand Up @@ -179,14 +177,5 @@ func (c *Client) createS3Client() (*s3.Client, error) {
}

func (c *Client) identifier() string {
// Returned cached response
if c.id != "" {
return c.id
}
// Create blake2b-256 hash from client name and encode as hex
hasher, _ := blake2b.New(32, nil)
hasher.Write(c.assetName)
hash := hasher.Sum(nil)
c.id = hex.EncodeToString(hash)
return c.id
return hex.EncodeToString(c.assetName)
}
2 changes: 1 addition & 1 deletion internal/crl/crl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func (c *Crl) updateConfigMap() error {
revokedCerts = append(
revokedCerts,
pkix.RevokedCertificate{
SerialNumber: ca.ClientNameToSerialNumber(client.AssetName),
SerialNumber: ca.ClientNameToSerialNumber(hex.EncodeToString(client.AssetName)),
RevocationTime: client.Expiration,
},
)
Expand Down
Loading