feat: improved account validation

Author: ascandone

internal/interpreter/evaluate_expr.go

@@ -36,8 +36,7 @@ func (st *programState) evaluateExpr(expr parser.ValueExpr) (Value, InterpreterE
 			}
 		}
 		name := strings.Join(parts, ":")
-		// TODO validate valid names
-		return AccountAddress(name), nil
+		return NewAccountAddress(name)
 
 	case *parser.StringLiteral:
 		return String(expr.String), nil

internal/interpreter/interpreter.go

@@ -89,7 +89,7 @@ func parseVar(type_ string, rawValue string, r parser.Range) (Value, Interpreter
 	case analysis.TypeMonetary:
 		return parseMonetary(rawValue)
 	case analysis.TypeAccount:
-		return AccountAddress(rawValue), nil
+		return NewAccountAddress(rawValue)
 	case analysis.TypePortion:
 		bi, err := ParsePortionSpecific(rawValue)
 		if err != nil {

internal/interpreter/interpreter_error.go

@@ -211,3 +211,12 @@ type CannotCastToString struct {
 func (e CannotCastToString) Error() string {
 	return fmt.Sprintf("Cannot cast this value to string: %s", e.Value)
 }
+
+type InvalidAccountName struct {
+	parser.Range
+	Name string
+}
+
+func (e InvalidAccountName) Error() string {
+	return fmt.Sprintf("Invalid account name: @%s", e.Name)
+}

internal/interpreter/interpreter_test.go

@@ -3836,6 +3836,58 @@ func TestOneofDestinationRemainingClause(t *testing.T) {
 	testWithFeatureFlag(t, tc, machine.ExperimentalOneofFeatureFlag)
 }
 
+func TestInvalidAccount(t *testing.T) {
+	script := `
+		vars {
+			account $acc
+		}
+ 		set_tx_meta("k", $acc)
+	`
+
+	tc := NewTestCase()
+	tc.setVarsFromJSON(t, `
+		{
+			"acc": "!invalid acc.."
+		}
+	`)
+
+	tc.compile(t, script)
+
+	tc.expected = CaseResult{
+		Postings: []Posting{},
+		Error: machine.InvalidAccountName{
+			Name: "!invalid acc..",
+		},
+	}
+	test(t, tc)
+}
+
+func TestInvalidInterpAccount(t *testing.T) {
+	script := `
+		vars {
+			string $status
+		}
+ 		set_tx_meta("k", @user:$status)
+	`
+
+	tc := NewTestCase()
+	tc.setVarsFromJSON(t, `
+		{
+			"status": "!invalid acc.."
+		}
+	`)
+
+	tc.compile(t, script)
+
+	tc.expected = CaseResult{
+		Postings: []Posting{},
+		Error: machine.InvalidAccountName{
+			Name: "user:!invalid acc..",
+		},
+	}
+	testWithFeatureFlag(t, tc, machine.ExperimentalAccountInterpolationFlag)
+}
+
 func TestAccountInterp(t *testing.T) {
 	script := `
 		vars {

internal/interpreter/value.go

@@ -3,6 +3,7 @@ package interpreter
 import (
 	"fmt"
 	"math/big"
+	"regexp"
 
 	"github.com/formancehq/numscript/internal/analysis"
 	"github.com/formancehq/numscript/internal/parser"
@@ -30,6 +31,13 @@ func (Monetary) value()       {}
 func (Portion) value()        {}
 func (Asset) value()          {}
 
+func NewAccountAddress(src string) (AccountAddress, InterpreterError) {
+	if !validateAddress(src) {
+		return AccountAddress(""), InvalidAccountName{Name: src}
+	}
+	return AccountAddress(src), nil
+}
+
 func (v MonetaryInt) MarshalJSON() ([]byte, error) {
 	bigInt := big.Int(v)
 	s := fmt.Sprintf(`"%s"`, bigInt.String())
@@ -227,3 +235,12 @@ func (m MonetaryInt) Sub(other MonetaryInt) MonetaryInt {
 	sum := new(big.Int).Sub(&bi, &otherBi)
 	return MonetaryInt(*sum)
 }
+
+const segmentRegex = "[a-zA-Z0-9_-]+"
+const accountPattern = "^" + segmentRegex + "(:" + segmentRegex + ")*$"
+
+var Regexp = regexp.MustCompile(accountPattern)
+
+func validateAddress(addr string) bool {
+	return Regexp.Match([]byte(addr))
+}