2018-03-12 12:29:51 +00:00
|
|
|
package mcrypto
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
|
|
|
"crypto/hmac"
|
|
|
|
"crypto/rand"
|
|
|
|
"crypto/sha256"
|
|
|
|
"encoding/binary"
|
|
|
|
"encoding/hex"
|
2018-03-23 15:10:53 +00:00
|
|
|
"encoding/json"
|
2018-03-12 12:29:51 +00:00
|
|
|
"errors"
|
|
|
|
"io"
|
|
|
|
"time"
|
|
|
|
|
|
|
|
"github.com/mediocregopher/mediocre-go-lib/mlog"
|
|
|
|
)
|
|
|
|
|
|
|
|
var (
|
|
|
|
errMalformedSig = errors.New("malformed signature")
|
|
|
|
|
|
|
|
// ErrInvalidSig is returned by Signer related functions when an invalid
|
|
|
|
// signature is used, e.g. it is a signature for different data, or uses a
|
|
|
|
// different secret key, or has expired
|
|
|
|
ErrInvalidSig = errors.New("invalid signature")
|
|
|
|
)
|
|
|
|
|
2018-03-23 15:10:53 +00:00
|
|
|
// Signature marshals/unmarshals an actual signature, produced internally by a
|
|
|
|
// Signer, along with the timestamp the signing took place and a random salt.
|
|
|
|
//
|
|
|
|
// All signatures produced in this package will have had the timestamp and salt
|
|
|
|
// included in the signature's input data, and so are also checked by the
|
|
|
|
// Verifier.
|
|
|
|
type Signature struct {
|
|
|
|
sig, salt []byte // neither of these should ever be more than 255 bytes long
|
|
|
|
t time.Time
|
|
|
|
}
|
|
|
|
|
|
|
|
// Time returns the timestamp the Signature was generated at
|
|
|
|
func (s Signature) Time() time.Time {
|
|
|
|
return s.t
|
|
|
|
}
|
|
|
|
|
|
|
|
func (s Signature) String() string {
|
|
|
|
// ts:8 + saltHeader:1 + salt + sigHeader:1 + sig
|
|
|
|
b := make([]byte, 10+len(s.salt)+len(s.sig))
|
|
|
|
// It will be year 2286 before the nano doesn't fit in uint64
|
|
|
|
binary.BigEndian.PutUint64(b, uint64(s.t.UnixNano()))
|
|
|
|
ptr := 8
|
|
|
|
b[ptr], ptr = uint8(len(s.salt)), ptr+1
|
|
|
|
ptr += copy(b[ptr:], s.salt)
|
|
|
|
b[ptr], ptr = uint8(len(s.sig)), ptr+1
|
|
|
|
copy(b[ptr:], s.sig)
|
|
|
|
return sigV0 + hex.EncodeToString(b)
|
|
|
|
}
|
|
|
|
|
|
|
|
// KV implements the method for the mlog.KVer interface
|
|
|
|
func (s Signature) KV() mlog.KV {
|
|
|
|
return mlog.KV{"sig": s.String()}
|
|
|
|
}
|
|
|
|
|
|
|
|
// MarshalText implements the method for the encoding.TextMarshaler interface
|
|
|
|
func (s Signature) MarshalText() ([]byte, error) {
|
|
|
|
return []byte(s.String()), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// UnmarshalText implements the method for the encoding.TextUnmarshaler
|
|
|
|
// interface
|
|
|
|
func (s *Signature) UnmarshalText(b []byte) error {
|
|
|
|
str := string(b)
|
|
|
|
strEnc, ok := stripPrefix(str, sigV0)
|
|
|
|
if !ok || len(strEnc) < hex.EncodedLen(10) {
|
|
|
|
return mlog.ErrWithKV(errMalformedSig, mlog.KV{"sigStr": str})
|
|
|
|
}
|
|
|
|
|
|
|
|
b, err := hex.DecodeString(strEnc)
|
|
|
|
if err != nil {
|
|
|
|
return mlog.ErrWithKV(err, mlog.KV{"sigStr": str})
|
|
|
|
}
|
|
|
|
|
|
|
|
unixNano, b := int64(binary.BigEndian.Uint64(b[:8])), b[8:]
|
|
|
|
s.t = time.Unix(0, unixNano).Local()
|
|
|
|
|
|
|
|
readBytes := func() []byte {
|
|
|
|
if err != nil {
|
|
|
|
return nil
|
|
|
|
} else if len(b) < 1+int(b[0]) {
|
|
|
|
err = mlog.ErrWithKV(errMalformedSig, mlog.KV{"sigStr": str})
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
out := b[1 : 1+b[0]]
|
|
|
|
b = b[1+b[0]:]
|
|
|
|
return out
|
|
|
|
}
|
|
|
|
|
|
|
|
s.salt = readBytes()
|
|
|
|
s.sig = readBytes()
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// MarshalJSON implements the method for the json.Marshaler interface
|
|
|
|
func (s Signature) MarshalJSON() ([]byte, error) {
|
|
|
|
return json.Marshal(s.String())
|
|
|
|
}
|
|
|
|
|
|
|
|
// UnmarshalJSON implements the method for the json.Unmarshaler interface
|
|
|
|
func (s *Signature) UnmarshalJSON(b []byte) error {
|
|
|
|
var str string
|
|
|
|
if err := json.Unmarshal(b, &str); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return s.UnmarshalText([]byte(str))
|
|
|
|
}
|
|
|
|
|
|
|
|
// returns an io.Reader which will first read out information about the
|
|
|
|
// Signature which is going to be generated for the data, and then the data from
|
|
|
|
// the io.Reader itself. When used in conjunction with the Signer/Verifier's
|
|
|
|
// hashing algorithm this ensures that the other data encoded in the Signature
|
|
|
|
// (the time and salt) are also encompassed in the sig.
|
|
|
|
func sigPrefixReader(r io.Reader, sigLen uint8, salt []byte, t time.Time) io.Reader {
|
|
|
|
// ts:8 + saltHeader:1 + salt + sigLen:1
|
|
|
|
b := make([]byte, 10+len(salt))
|
|
|
|
binary.BigEndian.PutUint64(b, uint64(t.UnixNano()))
|
|
|
|
b[9] = uint8(len(salt))
|
|
|
|
copy(b[9:9+len(salt)], salt)
|
|
|
|
b[9+len(salt)] = sigLen
|
|
|
|
return io.MultiReader(bytes.NewBuffer(b), r)
|
|
|
|
}
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2018-03-12 12:29:51 +00:00
|
|
|
// Signer is some entity which can generate signatures for arbitrary data and
|
|
|
|
// can later verify those signatures
|
|
|
|
type Signer interface {
|
2018-03-23 15:10:53 +00:00
|
|
|
sign(io.Reader) (Signature, error)
|
|
|
|
}
|
2018-03-12 12:29:51 +00:00
|
|
|
|
2018-03-23 15:10:53 +00:00
|
|
|
// Verifier is some entity which can verify Signatures produced by a Signer for
|
|
|
|
// some arbitrary data
|
|
|
|
type Verifier interface {
|
|
|
|
// returns an error if io.Reader returns one ever, or if the Signature
|
2018-03-12 12:29:51 +00:00
|
|
|
// couldn't be verified
|
2018-03-23 15:10:53 +00:00
|
|
|
verify(Signature, io.Reader) error
|
2018-03-12 12:29:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Sign reads all data from the io.Reader and signs it using the given Signer
|
2018-03-23 15:10:53 +00:00
|
|
|
func Sign(s Signer, r io.Reader) (Signature, error) {
|
2018-03-12 12:29:51 +00:00
|
|
|
return s.sign(r)
|
|
|
|
}
|
|
|
|
|
2018-03-23 15:10:53 +00:00
|
|
|
// SignBytes uses the Signer to generate a Signature for the given []bytes
|
|
|
|
func SignBytes(s Signer, b []byte) Signature {
|
2018-03-12 12:29:51 +00:00
|
|
|
sig, err := s.sign(bytes.NewBuffer(b))
|
|
|
|
if err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
|
|
|
return sig
|
|
|
|
}
|
|
|
|
|
2018-03-23 15:10:53 +00:00
|
|
|
// SignString uses the Signer to generate a Signature for the given string
|
|
|
|
func SignString(s Signer, in string) Signature {
|
2018-03-12 12:29:51 +00:00
|
|
|
return SignBytes(s, []byte(in))
|
|
|
|
}
|
|
|
|
|
2018-03-23 15:10:53 +00:00
|
|
|
// Verify reads all data from the io.Reader and uses the Verifier to verify that
|
|
|
|
// the Signature is for that data.
|
2018-03-12 12:29:51 +00:00
|
|
|
//
|
|
|
|
// Returns any errors from io.Reader, or ErrInvalidSig (use merry.Is(err,
|
|
|
|
// mcrypto.ErrInvalidSig) to check).
|
2018-03-23 15:10:53 +00:00
|
|
|
func Verify(v Verifier, s Signature, r io.Reader) error {
|
|
|
|
return v.verify(s, r)
|
2018-03-12 12:29:51 +00:00
|
|
|
}
|
|
|
|
|
2018-03-23 15:10:53 +00:00
|
|
|
// VerifyBytes uses the Verifier to verify that the Signature is for the given
|
2018-03-12 12:29:51 +00:00
|
|
|
// []bytes.
|
|
|
|
//
|
|
|
|
// Returns any errors from io.Reader, or ErrInvalidSig (use merry.Is(err,
|
|
|
|
// mcrypto.ErrInvalidSig) to check).
|
2018-03-23 15:10:53 +00:00
|
|
|
func VerifyBytes(v Verifier, s Signature, b []byte) error {
|
|
|
|
return v.verify(s, bytes.NewBuffer(b))
|
2018-03-12 12:29:51 +00:00
|
|
|
}
|
|
|
|
|
2018-03-23 15:10:53 +00:00
|
|
|
// VerifyString uses the Verifier to verify that the Signature is for the given
|
2018-03-12 12:29:51 +00:00
|
|
|
// string.
|
|
|
|
//
|
|
|
|
// Returns any errors from io.Reader, or ErrInvalidSig (use merry.Is(err,
|
|
|
|
// mcrypto.ErrInvalidSig) to check).
|
2018-03-23 15:10:53 +00:00
|
|
|
func VerifyString(v Verifier, s Signature, in string) error {
|
|
|
|
return VerifyBytes(v, s, []byte(in))
|
2018-03-12 12:29:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2018-03-23 15:10:53 +00:00
|
|
|
type signVerifier struct {
|
2018-03-12 12:29:51 +00:00
|
|
|
outSize uint8 // in bytes, shouldn't be more than 32, cause sha256
|
|
|
|
secret []byte
|
|
|
|
|
|
|
|
// only used during tests
|
|
|
|
testNow time.Time
|
|
|
|
}
|
|
|
|
|
2018-03-23 15:10:53 +00:00
|
|
|
// NewSignerVerifier returns Signer and Verifier instances which will use the
|
|
|
|
// given secret to sign and verify all Signatures
|
|
|
|
func NewSignerVerifier(secret []byte) (Signer, Verifier) {
|
|
|
|
sv := signVerifier{outSize: 20, secret: secret}
|
|
|
|
return sv, sv
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewWeakSignerVerifier returns Signer and Verifier instances, similar to how
|
|
|
|
// NewSignVerifier does. The Signatures generated by this Signer will be smaller
|
|
|
|
// in text size, and therefore weaker, but are still fine for most applications.
|
2018-03-12 12:29:51 +00:00
|
|
|
//
|
2018-03-23 15:10:53 +00:00
|
|
|
// The Verifiers returned by both NewSignVerifier and NewWeakSignVerifier can
|
|
|
|
// verify each-other's signatures, as long as the secret is the same.
|
|
|
|
func NewWeakSignerVerifier(secret []byte) (Signer, Verifier) {
|
|
|
|
sv := signVerifier{outSize: 8, secret: secret}
|
|
|
|
return sv, sv
|
2018-03-12 12:29:51 +00:00
|
|
|
}
|
|
|
|
|
2018-03-23 15:10:53 +00:00
|
|
|
func (sv signVerifier) now() time.Time {
|
|
|
|
if !sv.testNow.IsZero() {
|
|
|
|
return sv.testNow
|
2018-03-12 12:29:51 +00:00
|
|
|
}
|
|
|
|
return time.Now()
|
|
|
|
}
|
|
|
|
|
2018-03-23 15:10:53 +00:00
|
|
|
func (sv signVerifier) signRaw(
|
|
|
|
r io.Reader,
|
|
|
|
sigLen uint8, salt []byte, t time.Time,
|
|
|
|
) (
|
|
|
|
[]byte, error,
|
|
|
|
) {
|
|
|
|
h := hmac.New(sha256.New, sv.secret)
|
|
|
|
r = sigPrefixReader(r, sigLen, salt, t)
|
|
|
|
if _, err := io.Copy(h, r); err != nil {
|
|
|
|
return nil, err
|
2018-03-12 12:29:51 +00:00
|
|
|
}
|
2018-03-23 15:10:53 +00:00
|
|
|
return h.Sum(nil)[:sigLen], nil
|
2018-03-12 12:29:51 +00:00
|
|
|
}
|
|
|
|
|
2018-03-23 15:10:53 +00:00
|
|
|
func (sv signVerifier) sign(r io.Reader) (Signature, error) {
|
|
|
|
salt := make([]byte, 8)
|
|
|
|
if _, err := rand.Read(salt); err != nil {
|
2018-03-12 12:29:51 +00:00
|
|
|
panic(err)
|
|
|
|
}
|
|
|
|
|
2018-03-23 15:10:53 +00:00
|
|
|
t := sv.now()
|
|
|
|
sig, err := sv.signRaw(r, sv.outSize, salt, t)
|
|
|
|
return Signature{sig: sig, salt: salt, t: t}, err
|
|
|
|
}
|
2018-03-12 12:29:51 +00:00
|
|
|
|
2018-03-23 15:10:53 +00:00
|
|
|
func (sv signVerifier) verify(s Signature, r io.Reader) error {
|
|
|
|
sig, err := sv.signRaw(r, uint8(len(s.sig)), s.salt, s.t)
|
2018-03-12 12:29:51 +00:00
|
|
|
if err != nil {
|
2018-03-23 15:10:53 +00:00
|
|
|
return mlog.ErrWithKV(err, s)
|
|
|
|
} else if !hmac.Equal(sig, s.sig) {
|
|
|
|
return mlog.ErrWithKV(ErrInvalidSig, s)
|
2018-03-12 12:29:51 +00:00
|
|
|
}
|
2018-03-23 15:10:53 +00:00
|
|
|
return nil
|
2018-03-12 12:29:51 +00:00
|
|
|
}
|