Add height to context, cleanup, add to app and stack

stack/context.go

@@ -1,9 +1,6 @@
 package stack
 
 import (
-	"bytes"
-	"math/rand"
-
 	"github.com/pkg/errors"
 
 	"github.com/tendermint/tmlibs/log"
@@ -16,28 +13,20 @@ import (
 type nonce int64
 
 type secureContext struct {
-	id    nonce
-	chain string
-	app   string
-	perms []basecoin.Actor
-	log.Logger
+	app string
+	// this exposes the log.Logger and all other methods we don't override
+	naiveContext
 }
 
 // NewContext - create a new secureContext
-func NewContext(chain string, logger log.Logger) basecoin.Context {
+func NewContext(chain string, height uint64, logger log.Logger) basecoin.Context {
 	return secureContext{
-		id:     nonce(rand.Int63()),
-		chain:  chain,
-		Logger: logger,
+		naiveContext: MockContext(chain, height).(naiveContext),
 	}
 }
 
 var _ basecoin.Context = secureContext{}
 
-func (c secureContext) ChainID() string {
-	return c.chain
-}
-
 // WithPermissions will panic if they try to set permission without the proper app
 func (c secureContext) WithPermissions(perms ...basecoin.Actor) basecoin.Context {
 	// the guard makes sure you only set permissions for the app you are inside
@@ -50,32 +39,18 @@ func (c secureContext) WithPermissions(perms ...basecoin.Actor) basecoin.Context
 	}
 
 	return secureContext{
-		id:     c.id,
-		chain:  c.chain,
-		app:    c.app,
-		perms:  append(c.perms, perms...),
-		Logger: c.Logger,
+		app:          c.app,
+		naiveContext: c.naiveContext.WithPermissions(perms...).(naiveContext),
 	}
 }
 
-func (c secureContext) HasPermission(perm basecoin.Actor) bool {
-	for _, p := range c.perms {
-		if perm.App == p.App && bytes.Equal(perm.Address, p.Address) {
-			return true
-		}
+// Reset should clear out all permissions,
+// but carry on knowledge that this is a child
+func (c secureContext) Reset() basecoin.Context {
+	return secureContext{
+		app:          c.app,
+		naiveContext: c.naiveContext.Reset().(naiveContext),
 	}
-	return false
-}
-
-func (c secureContext) GetPermissions(chain, app string) (res []basecoin.Actor) {
-	for _, p := range c.perms {
-		if chain == p.ChainID {
-			if app == "" || app == p.App {
-				res = append(res, p)
-			}
-		}
-	}
-	return res
 }
 
 // IsParent ensures that this is derived from the given secureClient
@@ -84,19 +59,7 @@ func (c secureContext) IsParent(other basecoin.Context) bool {
 	if !ok {
 		return false
 	}
-	return c.id == so.id
-}
-
-// Reset should clear out all permissions,
-// but carry on knowledge that this is a child
-func (c secureContext) Reset() basecoin.Context {
-	return secureContext{
-		id:     c.id,
-		chain:  c.chain,
-		app:    c.app,
-		perms:  nil,
-		Logger: c.Logger,
-	}
+	return c.naiveContext.IsParent(so.naiveContext)
 }
 
 // withApp is a private method that we can use to properly set the
@@ -107,11 +70,8 @@ func withApp(ctx basecoin.Context, app string) basecoin.Context {
 		return ctx
 	}
 	return secureContext{
-		id:     sc.id,
-		chain:  sc.chain,
-		app:    app,
-		perms:  sc.perms,
-		Logger: sc.Logger,
+		app:          app,
+		naiveContext: sc.naiveContext,
 	}
 }
 

stack/helpers_test.go

@@ -15,7 +15,7 @@ import (
 func TestOK(t *testing.T) {
 	assert := assert.New(t)
 
-	ctx := NewContext("test-chain", log.NewNopLogger())
+	ctx := NewContext("test-chain", 20, log.NewNopLogger())
 	store := state.NewMemKVStore()
 	data := "this looks okay"
 	tx := basecoin.Tx{}
@@ -33,7 +33,7 @@ func TestOK(t *testing.T) {
 func TestFail(t *testing.T) {
 	assert := assert.New(t)
 
-	ctx := NewContext("test-chain", log.NewNopLogger())
+	ctx := NewContext("test-chain", 20, log.NewNopLogger())
 	store := state.NewMemKVStore()
 	msg := "big problem"
 	tx := basecoin.Tx{}
@@ -53,7 +53,7 @@ func TestFail(t *testing.T) {
 func TestPanic(t *testing.T) {
 	assert := assert.New(t)
 
-	ctx := NewContext("test-chain", log.NewNopLogger())
+	ctx := NewContext("test-chain", 20, log.NewNopLogger())
 	store := state.NewMemKVStore()
 	msg := "system crash!"
 	tx := basecoin.Tx{}

stack/middleware_test.go

@@ -22,7 +22,7 @@ func TestPermissionSandbox(t *testing.T) {
 	require := require.New(t)
 
 	// generic args
-	ctx := NewContext("test-chain", log.NewNopLogger())
+	ctx := NewContext("test-chain", 20, log.NewNopLogger())
 	store := state.NewMemKVStore()
 	raw := NewRawTx([]byte{1, 2, 3, 4})
 	rawBytes, err := data.ToWire(raw)

stack/mock.go

@@ -2,40 +2,55 @@ package stack
 
 import (
 	"bytes"
+	"math/rand"
 
 	"github.com/tendermint/tmlibs/log"
 
 	"github.com/tendermint/basecoin"
 )
 
-type mockContext struct {
-	perms []basecoin.Actor
-	chain string
+type naiveContext struct {
+	id     nonce
+	chain  string
+	height uint64
+	perms  []basecoin.Actor
 	log.Logger
 }
 
-func MockContext(chain string) basecoin.Context {
-	return mockContext{
+// MockContext returns a simple, non-checking context for test cases.
+//
+// Always use NewContext() for production code to sandbox malicious code better
+func MockContext(chain string, height uint64) basecoin.Context {
+	return naiveContext{
+		id:     nonce(rand.Int63()),
 		chain:  chain,
+		height: height,
 		Logger: log.NewNopLogger(),
 	}
 }
 
-var _ basecoin.Context = mockContext{}
+var _ basecoin.Context = naiveContext{}
 
-func (c mockContext) ChainID() string {
+func (c naiveContext) ChainID() string {
 	return c.chain
 }
 
+func (c naiveContext) BlockHeight() uint64 {
+	return c.height
+}
+
 // WithPermissions will panic if they try to set permission without the proper app
-func (c mockContext) WithPermissions(perms ...basecoin.Actor) basecoin.Context {
-	return mockContext{
+func (c naiveContext) WithPermissions(perms ...basecoin.Actor) basecoin.Context {
+	return naiveContext{
+		id:     c.id,
+		chain:  c.chain,
+		height: c.height,
 		perms:  append(c.perms, perms...),
 		Logger: c.Logger,
 	}
 }
 
-func (c mockContext) HasPermission(perm basecoin.Actor) bool {
+func (c naiveContext) HasPermission(perm basecoin.Actor) bool {
 	for _, p := range c.perms {
 		if perm.App == p.App && bytes.Equal(perm.Address, p.Address) {
 			return true
@@ -44,7 +59,7 @@ func (c mockContext) HasPermission(perm basecoin.Actor) bool {
 	return false
 }
 
-func (c mockContext) GetPermissions(chain, app string) (res []basecoin.Actor) {
+func (c naiveContext) GetPermissions(chain, app string) (res []basecoin.Actor) {
 	for _, p := range c.perms {
 		if chain == p.ChainID {
 			if app == "" || app == p.App {
@@ -56,15 +71,21 @@ func (c mockContext) GetPermissions(chain, app string) (res []basecoin.Actor) {
 }
 
 // IsParent ensures that this is derived from the given secureClient
-func (c mockContext) IsParent(other basecoin.Context) bool {
-	_, ok := other.(mockContext)
-	return ok
+func (c naiveContext) IsParent(other basecoin.Context) bool {
+	nc, ok := other.(naiveContext)
+	if !ok {
+		return false
+	}
+	return c.id == nc.id
 }
 
 // Reset should clear out all permissions,
 // but carry on knowledge that this is a child
-func (c mockContext) Reset() basecoin.Context {
-	return mockContext{
+func (c naiveContext) Reset() basecoin.Context {
+	return naiveContext{
+		id:     c.id,
+		chain:  c.chain,
+		height: c.height,
 		Logger: c.Logger,
 	}
 }

stack/recovery_test.go

@@ -17,7 +17,7 @@ func TestRecovery(t *testing.T) {
 	assert := assert.New(t)
 
 	// generic args here...
-	ctx := NewContext("test-chain", log.NewNopLogger())
+	ctx := NewContext("test-chain", 20, log.NewNopLogger())
 	store := state.NewMemKVStore()
 	tx := basecoin.Tx{}