mirror of
https://github.com/tailscale/tailscale.git
synced 2025-08-12 05:37:32 +00:00
cmd/dist,release/dist: sign release tarballs with an ECDSA key (#8759)
Pass an optional PEM-encoded ECDSA key to `cmd/dist` to sign all built tarballs. The signature is stored next to the tarball with a `.sig` extension. Tested this with an `openssl`-generated key pair and verified the resulting signature. Updates #8760 Signed-off-by: Andrew Lytvynov <awly@tailscale.com>
This commit is contained in:
26
release/dist/unixpkgs/pkgs.go
vendored
26
release/dist/unixpkgs/pkgs.go
vendored
@@ -7,6 +7,9 @@ package unixpkgs
|
||||
import (
|
||||
"archive/tar"
|
||||
"compress/gzip"
|
||||
"crypto"
|
||||
"crypto/rand"
|
||||
"crypto/sha512"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
@@ -22,6 +25,7 @@ import (
|
||||
type tgzTarget struct {
|
||||
filenameArch string // arch to use in filename instead of deriving from goenv["GOARCH"]
|
||||
goenv map[string]string
|
||||
signer crypto.Signer
|
||||
}
|
||||
|
||||
func (t *tgzTarget) arch() string {
|
||||
@@ -65,7 +69,11 @@ func (t *tgzTarget) Build(b *dist.Build) ([]string, error) {
|
||||
return nil, err
|
||||
}
|
||||
defer f.Close()
|
||||
gw := gzip.NewWriter(f)
|
||||
// Hash the final output we're writing to the file, after tar and gzip
|
||||
// writers did their thing.
|
||||
h := sha512.New()
|
||||
hw := io.MultiWriter(f, h)
|
||||
gw := gzip.NewWriter(hw)
|
||||
defer gw.Close()
|
||||
tw := tar.NewWriter(gw)
|
||||
defer tw.Close()
|
||||
@@ -146,7 +154,21 @@ func (t *tgzTarget) Build(b *dist.Build) ([]string, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return []string{filename}, nil
|
||||
files := []string{filename}
|
||||
|
||||
if t.signer != nil {
|
||||
sig, err := t.signer.Sign(rand.Reader, h.Sum(nil), crypto.SHA512)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
sigFilename := out + ".sig"
|
||||
if err := os.WriteFile(sigFilename, sig, 0644); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
files = append(files, filename+".sig")
|
||||
}
|
||||
|
||||
return files, nil
|
||||
}
|
||||
|
||||
type debTarget struct {
|
||||
|
5
release/dist/unixpkgs/targets.go
vendored
5
release/dist/unixpkgs/targets.go
vendored
@@ -4,6 +4,7 @@
|
||||
package unixpkgs
|
||||
|
||||
import (
|
||||
"crypto"
|
||||
"fmt"
|
||||
"sort"
|
||||
"strings"
|
||||
@@ -14,7 +15,7 @@ import (
|
||||
_ "github.com/goreleaser/nfpm/rpm"
|
||||
)
|
||||
|
||||
func Targets() []dist.Target {
|
||||
func Targets(signer crypto.Signer) []dist.Target {
|
||||
var ret []dist.Target
|
||||
for goosgoarch := range tarballs {
|
||||
goos, goarch := splitGoosGoarch(goosgoarch)
|
||||
@@ -23,6 +24,7 @@ func Targets() []dist.Target {
|
||||
"GOOS": goos,
|
||||
"GOARCH": goarch,
|
||||
},
|
||||
signer: signer,
|
||||
})
|
||||
}
|
||||
for goosgoarch := range debs {
|
||||
@@ -53,6 +55,7 @@ func Targets() []dist.Target {
|
||||
"GOARCH": "386",
|
||||
"GO386": "softfloat",
|
||||
},
|
||||
signer: signer,
|
||||
})
|
||||
|
||||
sort.Slice(ret, func(i, j int) bool {
|
||||
|
Reference in New Issue
Block a user