biscuit-auth · Geal · Jun 29, 2023 · Jul 3, 2023 · Jul 4, 2023 · May 12, 2024
diff --git a/SPECIFICATIONS.md b/SPECIFICATIONS.md
diff --git a/samples/current/README.md b/samples/current/README.md
diff --git a/samples/current/samples.json b/samples/current/samples.json
diff --git a/samples/current/test017_expressions.bc b/samples/current/test017_expressions.bc
diff --git a/samples/current/test024_third_party.bc b/samples/current/test024_third_party.bc
diff --git a/samples/current/test026_public_keys_interning.bc b/samples/current/test026_public_keys_interning.bc
diff --git a/samples/current/test027_integer_wraparound.bc b/samples/current/test027_integer_wraparound.bc
diff --git a/samples/current/test029_reject_if.bc b/samples/current/test029_reject_if.bc
diff --git a/samples/current/test030_null.bc b/samples/current/test030_null.bc
diff --git a/samples/current/test031_heterogeneous_equal.bc b/samples/current/test031_heterogeneous_equal.bc
diff --git a/samples/current/test032_laziness_closures.bc b/samples/current/test032_laziness_closures.bc
diff --git a/samples/current/test033_typeof.bc b/samples/current/test033_typeof.bc
diff --git a/samples/current/test034_array_map.bc b/samples/current/test034_array_map.bc
diff --git a/samples/current/test035_ffi.bc b/samples/current/test035_ffi.bc
diff --git a/samples/current/test036_secp256r1.bc b/samples/current/test036_secp256r1.bc
diff --git a/schema.proto b/schema.proto
@@ -14,6 +14,7 @@ message SignedBlock {
   required PublicKey nextKey = 2;
   required bytes signature = 3;
   optional ExternalSignature externalSignature = 4;
+  optional uint32 version = 5;
 }
 
 message ExternalSignature {
@@ -26,6 +27,7 @@ message PublicKey {
 
   enum Algorithm {
     Ed25519 = 0;
+    SECP256R1 = 1;
   }
 
   required bytes key = 2;
@@ -80,6 +82,7 @@ message CheckV2 {
   enum Kind {
     One = 0;
     All = 1;
+    Reject = 2;
   }
 }
 
@@ -97,13 +100,36 @@ message TermV2 {
     bytes bytes = 5;
     bool bool = 6;
     TermSet set = 7;
+    Empty null = 8;
+    Array array = 9;
+    Map map = 10;
   }
 }
 
 message TermSet {
   repeated TermV2 set = 1;
 }
 
+message Array {
+  repeated TermV2 array = 1;
+}
+
+message Map {
+  repeated MapEntry entries = 1;
+}
+
+message MapEntry {
+  required MapKey key = 1;
+  required TermV2 value = 2;
+}
+
+message MapKey {
+  oneof Content {
+    int64 integer = 1;
+    uint64 string = 2;
+  }
+}
+
 message ExpressionV2 {
   repeated Op ops = 1;
 }
@@ -113,6 +139,7 @@ message Op {
     TermV2 value = 1;
     OpUnary unary = 2;
     OpBinary Binary = 3;
+    OpClosure closure = 4;
   }
 }
 
@@ -121,9 +148,12 @@ message OpUnary {
     Negate = 0;
     Parens = 1;
     Length = 2;
+    TypeOf = 3;
+    Ffi = 4;
   }
 
   required Kind kind = 1;
+  optional uint64 ffiName = 2;
 }
 
 message OpBinary {
@@ -149,9 +179,23 @@ message OpBinary {
     BitwiseOr = 18;
     BitwiseXor = 19;
     NotEqual = 20;
+    HeterogeneousEqual = 21;
+    HeterogeneousNotEqual = 22;
+    LazyAnd = 23;
+    LazyOr = 24;
+    All = 25;
+    Any = 26;
+    Get = 27;
+    Ffi = 28;
   }
 
   required Kind kind = 1;
+  optional uint64 ffiName = 2;
+}
+
+message OpClosure {
+  repeated uint32 params = 1;
+  repeated Op ops = 2;
 }
 
 message Policy {
@@ -174,8 +218,10 @@ message AuthorizerPolicies {
 }
 
 message ThirdPartyBlockRequest {
-  required PublicKey previousKey = 1;
-  repeated PublicKey publicKeys = 2;
+  optional PublicKey legacyPreviousKey = 1;
+  repeated PublicKey legacyPublicKeys = 2;
+  required bytes previousSignature = 3;
+
 }
 
 message ThirdPartyBlockContents {
@@ -228,4 +274,4 @@ message SnapshotBlock {
   repeated CheckV2 checks_v2 = 5;
   repeated Scope scope = 6;
   optional PublicKey externalKey = 7;
-}
+}