fix check printing

biscuit-auth · Feb 18, 2022 · a8e87f7 · a8e87f7
1 parent 84eda43
commit a8e87f7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/datalog/datalog.go b/datalog/datalog.go
@@ -674,10 +674,28 @@ func (d SymbolDebugger) Rule(r Rule) string {
 
 	var expressionsStart string
 	if len(expressions) > 0 {
-		expressionsStart = " @ "
+		expressionsStart = ", "
 	}
 
-	return fmt.Sprintf("*%s <- %s%s%s", head, strings.Join(preds, ", "), expressionsStart, strings.Join(expressions, ", "))
+	return fmt.Sprintf("%s <- %s%s%s", head, strings.Join(preds, ", "), expressionsStart, strings.Join(expressions, ", "))
+}
+
+func (d SymbolDebugger) CheckQuery(r Rule) string {
+	preds := make([]string, len(r.Body))
+	for i, p := range r.Body {
+		preds[i] = d.Predicate(p)
+	}
+	expressions := make([]string, len(r.Expressions))
+	for i, e := range r.Expressions {
+		expressions[i] = d.Expression(e)
+	}
+
+	var expressionsStart string
+	if len(expressions) > 0 {
+		expressionsStart = ", "
+	}
+
+	return fmt.Sprintf("%s%s%s", strings.Join(preds, ", "), expressionsStart, strings.Join(expressions, ", "))
 }
 
 func (d SymbolDebugger) Expression(e Expression) string {
@@ -687,9 +705,9 @@ func (d SymbolDebugger) Expression(e Expression) string {
 func (d SymbolDebugger) Check(c Check) string {
 	queries := make([]string, len(c.Queries))
 	for i, q := range c.Queries {
-		queries[i] = d.Rule(q)
+		queries[i] = d.CheckQuery(q)
 	}
-	return strings.Join(queries, " || ")
+	return  fmt.Sprintf("check if %s", strings.Join(queries, " or "))
 }
 
 func (d SymbolDebugger) World(w *World) string {

diff --git a/samples/samples_test.go b/samples/samples_test.go
@@ -188,7 +188,7 @@ func TestSample8_ScopedChecks(t *testing.T) {
 
 			verifier.AddPolicy(biscuit.DefaultAllowPolicy)
 			res:= verifier.Verify()
-			require.Equal(t, errors.New("biscuit: verification failed: failed to verify block #1 check #0: *check if resource($0), operation(#read), right($0, #read)"), res)
+			require.Equal(t, errors.New("biscuit: verification failed: failed to verify block #1 check #0: check if resource($0), operation(#read), right($0, #read)"), res)
 		})
 	}
 }