427316a707
* swarm/storage/mru: Add embedded publickey and remove ENS dep This commit breaks swarm, swarm/api... but tests in swarm/storage/mru pass * swarm: Refactor swarm, swarm/api to mru changes, make tests pass * swarm/storage/mru: Remove self from recv, remove test ens vldtr * swarm/storage/mru: Remove redundant test, expose ResourceHash mthd * swarm/storage/mru: Make HeaderGetter mandatory + godoc fixes * swarm/storage: Remove validator prefix for metadata chunk * swarm/storage/mru: Use Address instead of PublicKey * swarm/storage/mru: Change index from name to metadata chunk addr * swarm/storage/mru: Refactor swarm/api/... to MRU index changes * swarm/storage/mru: Refactor cleanup * swarm/storage/mru: Rebase cleanup * swarm: Use constructor for GenericSigner MRU in swarm.go * swarm/storage: Change to BMTHash for MRU hashing * swarm/storage: Reduce loglevel on chunk validator logs * swarm/storage/mru: Delint * swarm: MRU Rebase cleanup * swarm/storage/mru: client-side mru signatures Rebase to PR #668 and fix all conflicts * swarm/storage/mru: refactor and documentation * swarm/resource/mru: error-checking tests for parseUpdate/newUpdateChunk * swarm/storage/mru: Added resourcemetadata tests * swarm/storage/mru: Added tests for UpdateRequest * swarm/storage/mru: more test coverage for UpdateRequest and comments * swarm/storage/mru: Avoid fake chunks in parseUpdate() * swarm/storage/mru: Documented resource.go extensively moved some functions where they make most sense * swarm/storage/mru: increase test coverage for UpdateRequest and variable name changes throughout to increase consistency * swarm/storage/mru: moved default timestamp to NewCreateRequest- * swarm/storage/mru: lookup refactor * swarm/storage/mru: added comments and renamed raw flag to rawmru * swarm/storage/mru: fix receiver typo * swarm/storage/mru: refactored update chunk new/create * swarm/storage/mru: refactored signature digest to avoid malleability * swarm/storage/mru: optimize update data serialization * swarm/storage/mru: refactor and cleanup * swarm/storage/mru: add timestamp struct and serialization * swarm/storage/mru: fix lint error and mark some old code for deletion * swarm/storage/mru: remove unnecessary variable * swarm/storage/mru: Added more comments throughout * swarm/storage/mru: Refactored metadata chunk layout + extensive error... * swarm/storage/mru: refactor cli parser Changed resource info output to JSON * swarm/storage/mru: refactor serialization for extensibility refactored error messages to NewErrorf * swarm/storage/mru: Moved Signature to resource_sign. Check Sign errors in server tests * swarm/storage/mru: Remove isSafeName() checks * swarm/storage/mru: scrubbed off all references to "block" for time * swarm/storage/mru: removed superfluous isSynced() call. * swarm/storage/mru: remove isMultihash() and ToSafeName functions * swarm/storage/mru: various fixes and comments * swarm/storage/mru: decoupled cli for independent create/update * Made resource name optional * Removed unused LookupPrevious * swarm/storage/mru: Decoupled resource create / update & refactor * swarm/storage/mru: Fixed some comments as per issues raised in PR #743 * swarm/storage/mru: Cosmetic changes as per #743 comments * swarm/storage/mru: refct request encoder/decoder > marshal/unmarshal * swarm/storage/mru: Cosmetic changes as per review in #748 * swarm/storage/mru: removed timestamp proof placeholder * swarm/storage/mru: cosmetic/doc/fixes changes as per comments in #704 * swarm/storage/mru: removed unnecessary check in Handler.update * swarm/storage/mru: Implemented Marshaler/Unmarshaler iface in Request * swarm/storage/mru: Fixed linter error * swarm/storage/mru: removed redundant address in signature digest * swarm/storage/mru: fixed bug: LookupLatestVersionInPeriod not working * swarm/storage/mru: Unfold Request creation API for create or update+create set common time source for mru package * swarm/api/http: fix HandleGetResource error variable shadowed when requesting a resource that does not exist * swarm/storage/mru: Add simple check to detect duplicate updates * swarm/storage/mru: moved Multihash() to the right place. * cmd/swarm: remove unneeded clientaccountmanager.go * swarm/storage/mru: Changed some comments as per reviews in #784 * swarm/storage/mru: Made SignedResourceUpdate.GetDigest() public * swarm/storage/mru: cosmetic changes as per comments in #784 * cmd/swarm: Inverted --multihash flag default * swarm/storage/mru: removed Verify from SignedResourceUpdate.fromChunk * swarm/storage/mru: Moved validation code out of serializer Cosmetic / comment changes * swarm/storage/mru: Added unit tests for UpdateLookup * swarm/storage/mru: Increased coverage of metadata serialization * swarm/storage/mru: Increased test coverage of updateHeader serializers * swarm/storage/mru: Add resourceUpdate serializer test
185 lines
6.3 KiB
Go
185 lines
6.3 KiB
Go
// Copyright 2018 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package mru
|
|
|
|
import (
|
|
"bytes"
|
|
"hash"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
"github.com/ethereum/go-ethereum/swarm/storage"
|
|
)
|
|
|
|
// SignedResourceUpdate represents a resource update with all the necessary information to prove ownership of the resource
|
|
type SignedResourceUpdate struct {
|
|
resourceUpdate // actual content that will be put on the chunk, less signature
|
|
signature *Signature
|
|
updateAddr storage.Address // resulting chunk address for the update (not serialized, for internal use)
|
|
binaryData []byte // resulting serialized data (not serialized, for efficiency/internal use)
|
|
}
|
|
|
|
// Verify checks that signatures are valid and that the signer owns the resource to be updated
|
|
func (r *SignedResourceUpdate) Verify() (err error) {
|
|
if len(r.data) == 0 {
|
|
return NewError(ErrInvalidValue, "Update does not contain data")
|
|
}
|
|
if r.signature == nil {
|
|
return NewError(ErrInvalidSignature, "Missing signature field")
|
|
}
|
|
|
|
digest, err := r.GetDigest()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// get the address of the signer (which also checks that it's a valid signature)
|
|
ownerAddr, err := getOwner(digest, *r.signature)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if !bytes.Equal(r.updateAddr, r.UpdateAddr()) {
|
|
return NewError(ErrInvalidSignature, "Signature address does not match with ownerAddr")
|
|
}
|
|
|
|
// Check if who signed the resource update really owns the resource
|
|
if !verifyOwner(ownerAddr, r.metaHash, r.rootAddr) {
|
|
return NewErrorf(ErrUnauthorized, "signature is valid but signer does not own the resource: %v", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// Sign executes the signature to validate the resource
|
|
func (r *SignedResourceUpdate) Sign(signer Signer) error {
|
|
|
|
r.binaryData = nil //invalidate serialized data
|
|
digest, err := r.GetDigest() // computes digest and serializes into .binaryData
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
signature, err := signer.Sign(digest)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Although the Signer interface returns the public address of the signer,
|
|
// recover it from the signature to see if they match
|
|
ownerAddress, err := getOwner(digest, signature)
|
|
if err != nil {
|
|
return NewError(ErrInvalidSignature, "Error verifying signature")
|
|
}
|
|
|
|
if ownerAddress != signer.Address() { // sanity check to make sure the Signer is declaring the same address used to sign!
|
|
return NewError(ErrInvalidSignature, "Signer address does not match ownerAddr")
|
|
}
|
|
|
|
r.signature = &signature
|
|
r.updateAddr = r.UpdateAddr()
|
|
return nil
|
|
}
|
|
|
|
// create an update chunk.
|
|
func (r *SignedResourceUpdate) toChunk() (*storage.Chunk, error) {
|
|
|
|
// Check that the update is signed and serialized
|
|
// For efficiency, data is serialized during signature and cached in
|
|
// the binaryData field when computing the signature digest in .getDigest()
|
|
if r.signature == nil || r.binaryData == nil {
|
|
return nil, NewError(ErrInvalidSignature, "newUpdateChunk called without a valid signature or payload data. Call .Sign() first.")
|
|
}
|
|
|
|
chunk := storage.NewChunk(r.updateAddr, nil)
|
|
resourceUpdateLength := r.resourceUpdate.binaryLength()
|
|
chunk.SData = r.binaryData
|
|
|
|
// signature is the last item in the chunk data
|
|
copy(chunk.SData[resourceUpdateLength:], r.signature[:])
|
|
|
|
chunk.Size = int64(len(chunk.SData))
|
|
return chunk, nil
|
|
}
|
|
|
|
// fromChunk populates this structure from chunk data. It does not verify the signature is valid.
|
|
func (r *SignedResourceUpdate) fromChunk(updateAddr storage.Address, chunkdata []byte) error {
|
|
// for update chunk layout see SignedResourceUpdate definition
|
|
|
|
//deserialize the resource update portion
|
|
if err := r.resourceUpdate.binaryGet(chunkdata); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Extract the signature
|
|
var signature *Signature
|
|
cursor := r.resourceUpdate.binaryLength()
|
|
sigdata := chunkdata[cursor : cursor+signatureLength]
|
|
if len(sigdata) > 0 {
|
|
signature = &Signature{}
|
|
copy(signature[:], sigdata)
|
|
}
|
|
|
|
r.signature = signature
|
|
r.updateAddr = updateAddr
|
|
r.binaryData = chunkdata
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
// GetDigest creates the resource update digest used in signatures (formerly known as keyDataHash)
|
|
// the serialized payload is cached in .binaryData
|
|
func (r *SignedResourceUpdate) GetDigest() (result common.Hash, err error) {
|
|
hasher := hashPool.Get().(hash.Hash)
|
|
defer hashPool.Put(hasher)
|
|
hasher.Reset()
|
|
dataLength := r.resourceUpdate.binaryLength()
|
|
if r.binaryData == nil {
|
|
r.binaryData = make([]byte, dataLength+signatureLength)
|
|
if err := r.resourceUpdate.binaryPut(r.binaryData[:dataLength]); err != nil {
|
|
return result, err
|
|
}
|
|
}
|
|
hasher.Write(r.binaryData[:dataLength]) //everything except the signature.
|
|
|
|
return common.BytesToHash(hasher.Sum(nil)), nil
|
|
}
|
|
|
|
// getOwner extracts the address of the resource update signer
|
|
func getOwner(digest common.Hash, signature Signature) (common.Address, error) {
|
|
pub, err := crypto.SigToPub(digest.Bytes(), signature[:])
|
|
if err != nil {
|
|
return common.Address{}, err
|
|
}
|
|
return crypto.PubkeyToAddress(*pub), nil
|
|
}
|
|
|
|
// verifyResourceOwnerhsip checks that the signer of the update actually owns the resource
|
|
// H(ownerAddr, metaHash) is computed. If it matches the rootAddr the update chunk is claiming
|
|
// to update, it is proven that signer of the resource update owns the resource.
|
|
// See metadataHash in metadata.go for a more detailed explanation
|
|
func verifyOwner(ownerAddr common.Address, metaHash []byte, rootAddr storage.Address) bool {
|
|
hasher := hashPool.Get().(hash.Hash)
|
|
defer hashPool.Put(hasher)
|
|
hasher.Reset()
|
|
hasher.Write(metaHash)
|
|
hasher.Write(ownerAddr.Bytes())
|
|
rootAddr2 := hasher.Sum(nil)
|
|
return bytes.Equal(rootAddr2, rootAddr)
|
|
}
|