mirror of
https://github.com/cloudflare/redoctober.git
synced 2026-04-22 17:20:46 +00:00
This change addresses several points: 1. The integration tests didn't verify that delegations could be used for decryption following a restore. The integration tests now verify this. 2. There was no functionality for clearing persisted delegations if needed. The vault admin can now do this via the command line tool. 3. Restoring active delegations wasn't storing the key with the delegation. Keys are now serialised properly. 4. [Minor] The MSP package now reports the name of the offending user when it can't find a user name in the database.
293 lines
7.2 KiB
Go
293 lines
7.2 KiB
Go
package msp
|
|
|
|
import (
|
|
"container/heap"
|
|
"crypto/rand"
|
|
"errors"
|
|
"fmt"
|
|
"strings"
|
|
)
|
|
|
|
// A UserDatabase is an abstraction over the name -> share map returned by the
|
|
// secret splitter that allows an application to only decrypt or request shares
|
|
// when needed, rather than re-build a partial map of known data.
|
|
type UserDatabase interface {
|
|
ValidUser(name string) bool
|
|
CanGetShare(name string) bool
|
|
GetShare(name string) ([][]byte, error)
|
|
}
|
|
|
|
type Condition interface { // Represents one condition in a predicate
|
|
Ok(UserDatabase) bool
|
|
}
|
|
|
|
type Name struct { // Type of condition
|
|
string
|
|
index int
|
|
}
|
|
|
|
func (n Name) Ok(db UserDatabase) bool {
|
|
return db.CanGetShare(n.string)
|
|
}
|
|
|
|
type TraceElem struct {
|
|
loc int
|
|
names []string
|
|
trace []string
|
|
}
|
|
|
|
type TraceSlice []TraceElem
|
|
|
|
func (ts TraceSlice) Len() int { return len(ts) }
|
|
func (ts TraceSlice) Swap(i, j int) { ts[i], ts[j] = ts[j], ts[i] }
|
|
|
|
func (ts TraceSlice) Less(i, j int) bool {
|
|
return len(ts[i].trace) > len(ts[j].trace)
|
|
}
|
|
|
|
func (ts *TraceSlice) Push(te interface{}) { *ts = append(*ts, te.(TraceElem)) }
|
|
func (ts *TraceSlice) Pop() interface{} {
|
|
old := *ts
|
|
n := len(old)
|
|
|
|
*ts = old[0 : n-1]
|
|
out := old[n-1]
|
|
|
|
return out
|
|
}
|
|
|
|
// Compact takes a trace slice and merges all of its fields.
|
|
//
|
|
// index: Union of all locations in the slice.
|
|
// names: Union of all names in the slice.
|
|
// trace: Union of all the traces in the slice.
|
|
func (ts TraceSlice) Compact() (index []int, names []string, trace []string) {
|
|
for _, te := range ts {
|
|
index = append(index, te.loc)
|
|
names = append(names, te.names...)
|
|
trace = append(trace, te.trace...)
|
|
}
|
|
|
|
// This is a QuickSort related algorithm. It makes all the names in the trace unique so we don't double-count people.
|
|
//
|
|
// Invariant: There are no duplicates in trace[0:ptr]
|
|
// Algorithm: Advance ptr by 1 and enforce the invariant.
|
|
ptr, cutoff := 0, len(trace)
|
|
|
|
TopLoop:
|
|
for ptr < cutoff { // Choose the next un-checked element of the slice.
|
|
for i := 0; i < ptr; i++ { // Compare it to all elements before it.
|
|
if trace[i] == trace[ptr] { // If we find a duplicate...
|
|
trace[ptr], trace[cutoff-1] = trace[cutoff-1], trace[ptr] // Push the dup to the end of the surviving slice.
|
|
cutoff-- // Mark it for removal.
|
|
|
|
continue TopLoop // Because trace[ptr] has been mutated, try to verify the invariant again w/o advancing ptr.
|
|
}
|
|
}
|
|
|
|
ptr++ // There are no duplicates; move the ptr forward and start again.
|
|
}
|
|
trace = trace[0:cutoff]
|
|
|
|
return
|
|
}
|
|
|
|
type MSP Formatted
|
|
|
|
func StringToMSP(pred string) (m MSP, err error) {
|
|
var f Formatted
|
|
|
|
if -1 == strings.Index(pred, ",") {
|
|
var r Raw
|
|
r, err = StringToRaw(pred)
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
f = r.Formatted()
|
|
} else {
|
|
f, err = StringToFormatted(pred)
|
|
if err != nil {
|
|
return
|
|
}
|
|
}
|
|
|
|
return MSP(f), nil
|
|
}
|
|
|
|
// DerivePath returns the cheapest way to satisfy the MSP (the one with the minimal number of delegations).
|
|
//
|
|
// ok: True if the MSP can be satisfied with current delegations; false if not.
|
|
// names: The names in the top-level threshold gate that need to be delegated.
|
|
// locs: The index in the treshold gate for each name.
|
|
// trace: All names that must be delegated for for this gate to be satisfied.
|
|
func (m MSP) DerivePath(db UserDatabase) (ok bool, names []string, locs []int, trace []string) {
|
|
ts := &TraceSlice{}
|
|
|
|
for i, cond := range m.Conds {
|
|
switch cond := cond.(type) {
|
|
case Name:
|
|
if db.CanGetShare(cond.string) {
|
|
heap.Push(ts, TraceElem{
|
|
i,
|
|
[]string{cond.string},
|
|
[]string{cond.string},
|
|
})
|
|
}
|
|
|
|
case Formatted:
|
|
sok, _, _, strace := MSP(cond).DerivePath(db)
|
|
if sok {
|
|
heap.Push(ts, TraceElem{i, []string{}, strace})
|
|
}
|
|
}
|
|
|
|
if (*ts).Len() > m.Min { // If we can otherwise satisfy the threshold gate
|
|
heap.Pop(ts) // Drop the TraceElem with the heaviest trace (the one that requires the most delegations).
|
|
}
|
|
}
|
|
|
|
ok = (*ts).Len() >= m.Min
|
|
locs, names, trace = ts.Compact()
|
|
return
|
|
}
|
|
|
|
// DistributeShares takes as input a secret and a user database and returns secret shares according to access structure
|
|
// described by the MSP.
|
|
func (m MSP) DistributeShares(sec []byte, db UserDatabase) (map[string][][]byte, error) {
|
|
out := make(map[string][][]byte)
|
|
|
|
// Generate a Vandermonde matrix.
|
|
height, width := len(m.Conds), m.Min
|
|
M := Matrix(make([]Row, height))
|
|
|
|
for i := 0; i < height; i++ {
|
|
M[i] = NewRow(width)
|
|
|
|
for j := 0; j < width; j++ {
|
|
M[i][j][0] = byte(i + 1)
|
|
M[i][j] = M[i][j].Exp(j)
|
|
}
|
|
}
|
|
|
|
// Convert secret vector.
|
|
s := NewRow(width)
|
|
s[0] = FieldElem(sec)
|
|
|
|
for i := 1; i < width; i++ {
|
|
r := NewFieldElem()
|
|
rand.Read(r)
|
|
|
|
s[i] = FieldElem(r)
|
|
}
|
|
|
|
// Calculate shares.
|
|
shares := M.Mul(s)
|
|
|
|
// Distribute the shares.
|
|
for i, cond := range m.Conds {
|
|
share := shares[i]
|
|
|
|
switch cond := cond.(type) {
|
|
case Name:
|
|
name := cond.string
|
|
if !db.ValidUser(name) {
|
|
return nil, fmt.Errorf("Unknown user '%s' in predicate.", name)
|
|
}
|
|
|
|
out[name] = append(out[name], share)
|
|
case Formatted:
|
|
below := MSP(cond)
|
|
subOut, err := below.DistributeShares(share, db)
|
|
if err != nil {
|
|
return out, err
|
|
}
|
|
|
|
for name, shares := range subOut {
|
|
out[name] = append(out[name], shares...)
|
|
}
|
|
}
|
|
}
|
|
|
|
return out, nil
|
|
}
|
|
|
|
// ErrNotEnoughShares is returned if there aren't enough shares to
|
|
// decrypt the secret.
|
|
var ErrNotEnoughShares = errors.New("Not enough shares to recover.")
|
|
|
|
// RecoverSecret takes a user database storing secret shares as input and returns the original secret.
|
|
func (m MSP) RecoverSecret(db UserDatabase) ([]byte, error) {
|
|
cache := make(map[string][][]byte, 0) // Caches un-used shares for a user.
|
|
return m.recoverSecret(db, cache)
|
|
}
|
|
|
|
func (m MSP) recoverSecret(db UserDatabase, cache map[string][][]byte) ([]byte, error) {
|
|
var (
|
|
index = []int{} // Indexes where given shares were in the matrix.
|
|
shares = []FieldElem{} // Contains shares that will be used in reconstruction.
|
|
)
|
|
|
|
ok, names, locs, _ := m.DerivePath(db)
|
|
if !ok {
|
|
return nil, ErrNotEnoughShares
|
|
}
|
|
|
|
for _, name := range names {
|
|
if _, cached := cache[name]; !cached {
|
|
out, err := db.GetShare(name)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
cache[name] = out
|
|
}
|
|
}
|
|
|
|
for _, loc := range locs {
|
|
gate := m.Conds[loc]
|
|
index = append(index, loc+1)
|
|
|
|
switch gate := gate.(type) {
|
|
case Name:
|
|
if len(cache[gate.string]) <= gate.index {
|
|
return nil, errors.New("Predicate / database mismatch!")
|
|
}
|
|
|
|
shares = append(shares, FieldElem(cache[gate.string][gate.index]))
|
|
|
|
case Formatted:
|
|
share, err := MSP(gate).recoverSecret(db, cache)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
shares = append(shares, FieldElem(share))
|
|
}
|
|
}
|
|
|
|
// Generate the Vandermonde matrix specific to whichever users' shares we're using.
|
|
MSub := Matrix(make([]Row, m.Min))
|
|
|
|
for i := 0; i < m.Min; i++ {
|
|
MSub[i] = NewRow(m.Min)
|
|
|
|
for j := 0; j < m.Min; j++ {
|
|
MSub[i][j][0] = byte(index[i])
|
|
MSub[i][j] = MSub[i][j].Exp(j)
|
|
}
|
|
}
|
|
|
|
// Calculate the reconstruction vector and use it to recover the secret.
|
|
r, ok := MSub.Recovery()
|
|
if !ok {
|
|
return nil, errors.New("Unable to find a reconstruction vector!")
|
|
}
|
|
|
|
// Compute dot product of the shares vector and the reconstruction vector to
|
|
// recover the secret.
|
|
s := Row(shares).DotProduct(r)
|
|
|
|
return []byte(s), nil
|
|
}
|