-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
Add support for verifying Sunlight checkpoints #99
Changes from all commits
01e5403
7c503a8
59c60d0
a429969
657f5a2
bdf56fb
0c1bd72
9f5c26f
b11d64d
0f11a0c
dc192e9
8d1aba4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,8 @@ | ||
github.com/google/certificate-transparency-go v1.1.8 h1:LGYKkgZF7satzgTak9R4yzfJXEeYVAjV6/EAEJOf1to= | ||
github.com/google/certificate-transparency-go v1.1.8/go.mod h1:bV/o8r0TBKRf1X//iiiSgWrvII4d7/8OiA+3vG26gI8= | ||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= | ||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= | ||
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= | ||
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= | ||
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= | ||
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,266 @@ | ||
// Copyright 2024 Google LLC. All Rights Reserved. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package note | ||
|
||
import ( | ||
"crypto" | ||
"crypto/ecdsa" | ||
"crypto/rsa" | ||
"crypto/sha256" | ||
"crypto/x509" | ||
"encoding/base64" | ||
"encoding/binary" | ||
"encoding/json" | ||
"errors" | ||
"fmt" | ||
"strconv" | ||
"strings" | ||
"time" | ||
|
||
ct "github.com/google/certificate-transparency-go" | ||
"golang.org/x/mod/sumdb/note" | ||
) | ||
|
||
// RFC6962VerifierString creates a note style verifier string for use with NewRFC6962Verifier below. | ||
// logURL is the root URL of the log. | ||
// pubK is the public key of the log. | ||
func RFC6962VerifierString(logURL string, pubK crypto.PublicKey) (string, error) { | ||
if !isValidName(logURL) { | ||
return "", errors.New("invalid name") | ||
} | ||
pubSer, err := x509.MarshalPKIXPublicKey(pubK) | ||
if err != nil { | ||
return "", err | ||
} | ||
logID := sha256.Sum256(pubSer) | ||
name := rfc6962LogName(logURL) | ||
hash := rfc6962Keyhash(name, logID) | ||
return fmt.Sprintf("%s+%08x+%s", name, hash, base64.StdEncoding.EncodeToString(append([]byte{algRFC6962STH}, pubSer...))), nil | ||
} | ||
|
||
// NewRFC6962Verifier creates a note verifier for Sunlight/RFC6962 checkpoint signatures. | ||
func NewRFC6962Verifier(vkey string) (note.Verifier, error) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I have one of these, named just the same, in an (for now) untagged version of the Sunlight module. https://pkg.go.dev/filippo.io/sunlight@main#NewRFC6962Verifier What do you think of it? Would it make sense to import it from here? A key difference is that it allows extracting/validating the timestamp, which I think is critical for verification. I didn't make a string encoding for it though. Should we specify those? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Aha, I was trying to do this "clean room" from the spec :) In general I really like the string vkey idea; it makes it very easy to poke through configs in existing code (e.g. the witness), so I'm all up for specifying for all the note-compatible verifiers we're cooking up! On the extracting the timestamp, the way I was going to go was the same as I've done here for Passing the call-back in at verifier c'tor time means that in apps like the witness you can't really create verifiers out at "config parsing" time (with corresponding error handling there) and then pass them down into other funcs/modules without adding some other complexity around how you pass that callback in too. It also means that the verifier is no longer safe to use from multiple go-routines. It "feels good" to have the timestamp extracted during verification available, but OTOH, since wdyt? |
||
name, vkey, _ := strings.Cut(vkey, "+") | ||
hash16, key64, _ := strings.Cut(vkey, "+") | ||
key, err := base64.StdEncoding.DecodeString(key64) | ||
if len(hash16) != 8 || err != nil || !isValidName(name) || len(key) == 0 { | ||
return nil, errVerifierID | ||
} | ||
|
||
v := &rfc6962Verifer{ | ||
name: name, | ||
} | ||
|
||
alg, key := key[0], key[1:] | ||
if alg != algRFC6962STH { | ||
return nil, errVerifierAlg | ||
} | ||
|
||
pubK, err := x509.ParsePKIXPublicKey(key) | ||
if err != nil { | ||
return nil, errors.New("invalid key") | ||
} | ||
|
||
logID := sha256.Sum256(key) | ||
v.keyHash = rfc6962Keyhash(name, logID) | ||
v.v = verifyRFC6962(pubK) | ||
|
||
return v, nil | ||
} | ||
|
||
// signedTreeHead represents the structure returned by the get-sth CT method | ||
// after base64 decoding; see sections 3.5 and 4.3. | ||
type signedTreeHead struct { | ||
Version int `json:"sth_version"` // The version of the protocol to which the STH conforms | ||
TreeSize uint64 `json:"tree_size"` // The number of entries in the new tree | ||
Timestamp uint64 `json:"timestamp"` // The time at which the STH was created | ||
SHA256RootHash []byte `json:"sha256_root_hash"` // The root hash of the log's Merkle tree | ||
TreeHeadSignature []byte `json:"tree_head_signature"` // Log's signature over a TLS-encoded TreeHeadSignature | ||
LogID []byte `json:"log_id"` // The SHA256 hash of the log's public key | ||
} | ||
|
||
// RFC6962STHToCheckpoint converts the provided RFC6962 JSON representation of a CT Signed Tree Head structure to | ||
// a sunlight style signed checkpoint. | ||
// The passed in verifier must be an RFC6929Verifier containing the correct details for the log which signed the STH. | ||
AlCutter marked this conversation as resolved.
Show resolved
Hide resolved
|
||
func RFC6962STHToCheckpoint(j []byte, v note.Verifier) ([]byte, error) { | ||
var sth signedTreeHead | ||
if err := json.Unmarshal(j, &sth); err != nil { | ||
return nil, err | ||
} | ||
logName := v.Name() | ||
body := fmt.Sprintf("%s\n%d\n%s\n", logName, sth.TreeSize, base64.StdEncoding.EncodeToString(sth.SHA256RootHash)) | ||
sigBytes := binary.BigEndian.AppendUint32(nil, v.KeyHash()) | ||
sigBytes = binary.BigEndian.AppendUint64(sigBytes, sth.Timestamp) | ||
sigBytes = append(sigBytes, sth.TreeHeadSignature...) | ||
sigLine := fmt.Sprintf("\u2014 %s %s", logName, base64.StdEncoding.EncodeToString(sigBytes)) | ||
|
||
AlCutter marked this conversation as resolved.
Show resolved
Hide resolved
|
||
n := []byte(fmt.Sprintf("%s\n%s\n", body, sigLine)) | ||
if _, err := note.Open(n, note.VerifierList(v)); err != nil { | ||
return nil, err | ||
} | ||
return n, nil | ||
} | ||
|
||
// RFC6962STHTimestamp extracts the embedded timestamp from a translated RFC6962 STH signature. | ||
func RFC6962STHTimestamp(s note.Signature) (time.Time, error) { | ||
r, err := base64.StdEncoding.DecodeString(s.Base64) | ||
if err != nil { | ||
return time.UnixMilli(0), errMalformedSig | ||
} | ||
if len(r) <= keyHashSize+timestampSize { | ||
return time.UnixMilli(0), errVerifierAlg | ||
} | ||
r = r[keyHashSize:] // Skip the hash | ||
// Next 8 bytes are the timestamp as Unix millis-since-epoch: | ||
return time.Unix(0, int64(binary.BigEndian.Uint64(r)*1000)), nil | ||
} | ||
|
||
func rfc6962Keyhash(name string, logID [32]byte) uint32 { | ||
h := sha256.New() | ||
h.Write([]byte(name)) | ||
h.Write([]byte{0x0A, algRFC6962STH}) | ||
h.Write(logID[:]) | ||
r := h.Sum(nil) | ||
return binary.BigEndian.Uint32(r) | ||
} | ||
|
||
// rfc6962LogName returns a sunlight checkpoint compatible log name from the | ||
// passed in CT log root URL. | ||
// | ||
// "For example, a log with submission prefix https://rome.ct.example.com/2024h1/ will use rome.ct.example.com/2024h1 as the checkpoint origin line" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The quotes around this sentence have me asking a lot of questions. I suspect it's an accident. If not, it needs an attribution. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Linked to Sunlight spec |
||
// (see https://github.com/C2SP/C2SP/blob/main/sunlight.md#checkpoints) | ||
func rfc6962LogName(logURL string) string { | ||
logURL = strings.ToLower(logURL) | ||
logURL = strings.TrimPrefix(logURL, "http://") | ||
logURL = strings.TrimPrefix(logURL, "https://") | ||
logURL = strings.TrimSuffix(logURL, "/") | ||
return logURL | ||
} | ||
|
||
type rfc6962Verifer struct { | ||
name string | ||
keyHash uint32 | ||
v func(msg []byte, origin string, sig []byte) bool | ||
} | ||
|
||
// Name returns the name associated with the key this verifier is based on. | ||
func (v *rfc6962Verifer) Name() string { | ||
return v.name | ||
} | ||
|
||
// KeyHash returns a truncated hash of the key this verifier is based on. | ||
func (v *rfc6962Verifer) KeyHash() uint32 { | ||
return v.keyHash | ||
} | ||
|
||
// Verify checks that the provided sig is valid over msg for the key this verifier is based on. | ||
func (v *rfc6962Verifer) Verify(msg, sig []byte) bool { | ||
return v.v(msg, v.name, sig) | ||
} | ||
|
||
func verifyRFC6962(key crypto.PublicKey) func([]byte, string, []byte) bool { | ||
return func(msg []byte, origin string, sig []byte) bool { | ||
if len(sig) < timestampSize { | ||
return false | ||
} | ||
t := binary.BigEndian.Uint64(sig) | ||
// slice off timestamp bytes | ||
sig = sig[timestampSize:] | ||
|
||
hAlg := sig[0] | ||
sAlg := sig[1] | ||
// slice off the hAlg and sAlg bytes read above | ||
sig = sig[2:] | ||
phbnf marked this conversation as resolved.
Show resolved
Hide resolved
AlCutter marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
// Figure out sig bytes length | ||
sigLen := binary.BigEndian.Uint16(sig) | ||
sig = sig[2:] // Slice off length bytes | ||
|
||
// All that remains should be the signature bytes themselves, and nothing more. | ||
if len(sig) != int(sigLen) { | ||
return false | ||
} | ||
|
||
// SHA256 (RFC 5246 s7.4.1.4.1.) | ||
if hAlg != 0x04 { | ||
return false | ||
} | ||
|
||
o, m, err := formatRFC6962STH(t, msg) | ||
if err != nil { | ||
return false | ||
} | ||
if origin != o { | ||
return false | ||
} | ||
dgst := sha256.Sum256(m) | ||
switch k := key.(type) { | ||
case *ecdsa.PublicKey: | ||
// RFC 5246 s7.4.1.4.1. | ||
if sAlg != 0x03 { | ||
return false | ||
} | ||
return ecdsa.VerifyASN1(k, dgst[:], sig) | ||
case *rsa.PublicKey: | ||
// RFC 5246 s7.4.1.4.1. | ||
if sAlg != 0x01 { | ||
return false | ||
} | ||
return rsa.VerifyPKCS1v15(k, crypto.SHA256, dgst[:], sig) != nil | ||
default: | ||
return false | ||
} | ||
} | ||
} | ||
|
||
// formatRFC6962STH uses the provided timestamp and checkpoint body to | ||
// recreate the RFC6962 STH structure over which the signature was made. | ||
func formatRFC6962STH(t uint64, msg []byte) (string, []byte, error) { | ||
// Must be: | ||
// origin (schema-less log root url) "\n" | ||
// tree size (decimal) "\n" | ||
// root hash (b64) "\n" | ||
lines := strings.Split(string(msg), "\n") | ||
if len(lines) != 4 { | ||
phbnf marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return "", nil, errors.New("wrong number of lines") | ||
} | ||
if len(lines[3]) != 0 { | ||
return "", nil, errors.New("extension line(s) present") | ||
} | ||
size, err := strconv.ParseUint(lines[1], 10, 64) | ||
if err != nil { | ||
return "", nil, err | ||
} | ||
root, err := base64.StdEncoding.DecodeString(lines[2]) | ||
if err != nil { | ||
return "", nil, err | ||
} | ||
if len(root) != 32 { | ||
return "", nil, errors.New("invalid root hash size") | ||
} | ||
rootHash := [32]byte{} | ||
copy(rootHash[:], root) | ||
|
||
sth := ct.SignedTreeHead{ | ||
TreeSize: size, | ||
Timestamp: t, | ||
SHA256RootHash: rootHash, | ||
} | ||
input, err := ct.SerializeSTHSignatureInput(sth) | ||
if err != nil { | ||
return "", nil, err | ||
} | ||
return lines[0], input, nil | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed, please open an issue about this dependency. Copying out the CT bits we need is reasonable as a solution. We worked very hard to keep the number of deps for this repo to a minimum. This now implicitly depends on trillian, which is a big dependency load that was a prime part of the motivation towards creating these smaller repos.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#105