Small refactor + al test

pkg/dynamicaccess/accesslogic.go

@@ -14,7 +14,7 @@ var hashFunc = sha3.NewLegacyKeccak256
 // Read-only interface for the ACT
 type Decryptor interface {
 	// DecryptRef will return a decrypted reference, for given encrypted reference and grantee
-	DecryptRef(storage kvs.KeyValueStore, encryped_ref swarm.Address, publisher *ecdsa.PublicKey) (swarm.Address, error)
+	DecryptRef(storage kvs.KeyValueStore, encrypedRef swarm.Address, publisher *ecdsa.PublicKey) (swarm.Address, error)
 	// Embedding the Session interface
 	Session
 }
@@ -26,14 +26,14 @@ type Control interface {
 	// Adds a new grantee to the ACT
 	AddGrantee(storage kvs.KeyValueStore, publisherPubKey, granteePubKey *ecdsa.PublicKey, accessKey *encryption.Key) error
 	// Encrypts a Swarm reference for a given grantee
-	EncryptRef(storage kvs.KeyValueStore, grantee *ecdsa.PublicKey, ref swarm.Address) error
+	EncryptRef(storage kvs.KeyValueStore, grantee *ecdsa.PublicKey, ref swarm.Address) (swarm.Address, error)
 }
 
 type ActLogic struct {
 	Session
 }
 
-var _ Decryptor = (*ActLogic)(nil)
+var _ Control = (*ActLogic)(nil)
 
 // Adds a new publisher to an empty act
 func (al ActLogic) AddPublisher(storage kvs.KeyValueStore, publisher *ecdsa.PublicKey) error {
@@ -116,9 +116,9 @@ func (al *ActLogic) getKeys(publicKey *ecdsa.PublicKey) ([][]byte, error) {
 	return al.Session.Key(publicKey, [][]byte{zeroByteArray, oneByteArray})
 }
 
-// DecryptRef will return a decrypted reference, for given encrypted reference and grantee
-func (al ActLogic) DecryptRef(storage kvs.KeyValueStore, encryped_ref swarm.Address, grantee *ecdsa.PublicKey) (swarm.Address, error) {
-	keys, err := al.getKeys(grantee)
+// DecryptRef will return a decrypted reference, for given encrypted reference and publisher
+func (al ActLogic) DecryptRef(storage kvs.KeyValueStore, encrypedRef swarm.Address, publisher *ecdsa.PublicKey) (swarm.Address, error) {
+	keys, err := al.getKeys(publisher)
 	if err != nil {
 		return swarm.EmptyAddress, err
 	}
@@ -140,7 +140,7 @@ func (al ActLogic) DecryptRef(storage kvs.KeyValueStore, encryped_ref swarm.Addr
 
 	// Decrypt reference
 	refCipher := encryption.New(accessKey, 0, uint32(0), hashFunc)
-	ref, err := refCipher.Decrypt(encryped_ref.Bytes())
+	ref, err := refCipher.Decrypt(encrypedRef.Bytes())
 	if err != nil {
 		return swarm.EmptyAddress, err
 	}

pkg/dynamicaccess/accesslogic_test.go

@@ -3,6 +3,7 @@ package dynamicaccess_test
 import (
 	"crypto/ecdsa"
 	"crypto/elliptic"
+	"crypto/rand"
 	"encoding/hex"
 	"math/big"
 	"testing"
@@ -72,6 +73,49 @@ func TestDecryptRef_Success(t *testing.T) {
 	}
 }
 
+func TestDecryptRefWithGrantee_Success(t *testing.T) {
+	id0, _ := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
+	diffieHellman := dynamicaccess.NewDefaultSession(id0)
+	al := dynamicaccess.NewLogic(diffieHellman)
+
+	s := kvsmock.New()
+	err := al.AddPublisher(s, &id0.PublicKey)
+	if err != nil {
+		t.Errorf("AddPublisher: expected no error, got %v", err)
+	}
+
+	id1, _ := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
+	err = al.AddGrantee(s, &id0.PublicKey, &id1.PublicKey, nil)
+	if err != nil {
+		t.Errorf("AddNewGrantee: expected no error, got %v", err)
+	}
+
+	byteRef, _ := hex.DecodeString("39a5ea87b141fe44aa609c3327ecd896c0e2122897f5f4bbacf74db1033c5559")
+
+	expectedRef := swarm.NewAddress(byteRef)
+	t.Logf("encryptedRef: %s", expectedRef.String())
+
+	encryptedRef, err := al.EncryptRef(s, &id0.PublicKey, expectedRef)
+	t.Logf("encryptedRef: %s", encryptedRef.String())
+	if err != nil {
+		t.Errorf("There was an error while calling EncryptRef: ")
+		t.Error(err)
+	}
+
+	diffieHellman2 := dynamicaccess.NewDefaultSession(id1)
+	granteeAccessLogic := dynamicaccess.NewLogic(diffieHellman2)
+	acutalRef, err := granteeAccessLogic.DecryptRef(s, encryptedRef, &id0.PublicKey)
+	if err != nil {
+		t.Errorf("There was an error while calling Get: ")
+		t.Error(err)
+	}
+
+	if expectedRef.Compare(acutalRef) != 0 {
+
+		t.Errorf("Get gave back wrong Swarm reference!")
+	}
+}
+
 func TestDecryptRef_Error(t *testing.T) {
 	id0 := generateFixPrivateKey(0)
 
@@ -89,7 +133,7 @@ func TestDecryptRef_Error(t *testing.T) {
 	r, err := al.DecryptRef(s, encryptedRef, nil)
 	if err == nil {
 		t.Logf("r: %s", r.String())
-		t.Errorf("Get should give back encrypted access key not found error!")
+		t.Errorf("Get should return encrypted access key not found error!")
 	}
 }