remove the symbol type

symbols were a kind of strings with less available operations and some specific optimizations: they store in index into a symbol table carried by the token, to reduce size by avoiding repetitions. They were too confusing for users, and now that #authority and #ambient are gone, we can remove them completely. The symbol table was useful though, so now the symbol table is used for all predicate names and strings
biscuit-auth · Sep 6, 2021 · a195fb4 · a195fb4
1 parent a0fd497
commit a195fb4
Show file tree

Hide file tree

Showing 22 changed files with 295 additions and 272 deletions.
diff --git a/samples/v2/README.md b/samples/v2/README.md
diff --git a/samples/v2/samples.json b/samples/v2/samples.json
diff --git a/samples/v2/test10_verifier_scope.bc b/samples/v2/test10_verifier_scope.bc
diff --git a/samples/v2/test11_verifier_authority_caveats.bc b/samples/v2/test11_verifier_authority_caveats.bc
@@ -1,5 +1,7 @@
-�
-
-read"
-"file1 C���[?��P�j*}�Z��m��m|�Iٮ�p��@�޽cx�{���#�����ٷ��y����)}�	Y5�qO�k�h�E�N�V���촃'o	""
+�
+
+file1
+read"
+
+ C���[?��P�j*}�Z��m��m|�Iٮ�p��@�)��(JR�2R��EG��%��`��q��[sˀ�vzҜ���͸m���.җ��7M�'Q""
  &���U����PFw���?3�L]��K�ea��
diff --git a/samples/v2/test12_authority_caveats.bc b/samples/v2/test12_authority_caveats.bc
@@ -1,6 +1,8 @@
-�
-(
-check12
-
-"file1"file1 ܤ����x�7�ɇ�H_�O�U/����@&�3�v�n���bX����3��%���c8���Fy8'�=ًQG�P�\�ت�*/�Ѫ��w	""
+�
+%
+check1
+file12
+
+ ܤ����x�7�ɇ�H_�O�U/����@�g=Z�I�)�͜�K��r(�
+1	� ��>�����8?��^Ȏ|�����lٹ""
  ��F�w�n*b�J��X���oZ�:��z�b�3q

diff --git a/samples/v2/test13_block_rules.bc b/samples/v2/test13_block_rules.bc
diff --git a/samples/v2/test14_regex_constraint.bc b/samples/v2/test14_regex_constraint.bc
@@ -1,12 +1,13 @@
-�
-K
+�
+M
 resource_match
-024
-2
- 
+0
+file[0-9]+.txt2&
+$
+
 
-
-
-"file[0-9]+.txt
- ι�G���V��`*k��)��_��<�^dM'�B@��:��y{�1�����.�(:�SA�ʄ��B`�ԎL��(��ji��gJ�7ˊ����vz""
+
+
+	
+ ι�G���V��`*k��)��_��<�^dM'�B@}s���p^��M����}�=��;�����v"b����y�W7#�w����-7m���ң7��U�""
  �Ɩ��]�<T�~�Eq��2��e�p���9QS�
diff --git a/samples/v2/test15_multi_queries_caveats.bc b/samples/v2/test15_multi_queries_caveats.bc
diff --git a/samples/v2/test16_caveat_head_name.bc b/samples/v2/test16_caveat_head_name.bc
diff --git a/samples/v2/test17_expressions.bc b/samples/v2/test17_expressions.bc
diff --git a/samples/v2/test18_unbound_variables_in_rule.bc b/samples/v2/test18_unbound_variables_in_rule.bc
diff --git a/samples/v2/test19_generating_ambient_from_variables.bc b/samples/v2/test19_generating_ambient_from_variables.bc
@@ -4,9 +4,10 @@
 test
 read2
 
-	 ���D��~[� N�$�PZ�!�����؃��@�Um	��|>�-SL4?^���9ԉ�f��H�q�����E�@�������O��Ѿ}@�
+	 ���D��~[� N�$�PZ�!�����؃��@�?@�i?C���W,o����(����d%��U�*3����N�����/v� ��JT�k�}wN	
 
 any*
-	
- �a�0�c���L�BlA|3�(Z�=��R��:��@�w�T�u�;��)��DUQAKy"}��3r�Ą�"�h�˨ރ��E� �{ύ�р~�WӁ{�`""
+	
+ �a�0�c���L�BlA|3�(Z�=��R��:��@ĕi8�n)�	�3�M�-Ė64O:@��
+�����$S�"�ң;�P�u���RA_�K{}�m���""
  ��+o\�����eȽs�����6G�;�cFwa�
diff --git a/samples/v2/test1_basic.bc b/samples/v2/test1_basic.bc
diff --git a/samples/v2/test2_different_root_key.bc b/samples/v2/test2_different_root_key.bc
diff --git a/samples/v2/test3_invalid_signature_format.bc b/samples/v2/test3_invalid_signature_format.bc
diff --git a/samples/v2/test4_random_block.bc b/samples/v2/test4_random_block.bc
diff --git a/samples/v2/test5_invalid_signature.bc b/samples/v2/test5_invalid_signature.bc
diff --git a/samples/v2/test6_reordered_blocks.bc b/samples/v2/test6_reordered_blocks.bc
diff --git a/samples/v2/test7_scoped_rules.bc b/samples/v2/test7_scoped_rules.bc
diff --git a/samples/v2/test8_scoped_checks.bc b/samples/v2/test8_scoped_checks.bc
diff --git a/samples/v2/test9_expired_token.bc b/samples/v2/test9_expired_token.bc
diff --git a/schema.proto b/schema.proto
@@ -52,14 +52,13 @@ message PredicateV2 {
 
 message IDV2 {
   oneof Content {
-    uint64 symbol = 1;
-    uint32 variable = 2;
-    int64 integer = 3;
-    string string = 4;
-    uint64 date = 5;
-    bytes bytes = 6;
-    bool bool = 7;
-    IDSet set = 8;
+    uint32 variable = 1;
+    int64 integer = 2;
+    uint64 string = 3;
+    uint64 date = 4;
+    bytes bytes = 5;
+    bool bool = 6;
+    IDSet set = 7;
   }
 }
 
@@ -74,8 +73,7 @@ message ConstraintV2 {
     IntConstraintV2 int = 2;
     StringConstraintV2 string = 3;
     DateConstraintV2 date = 4;
-    SymbolConstraintV2 symbol = 5;
-    BytesConstraintV2 bytes = 6;
+    BytesConstraintV2 bytes = 5;
   }
 }
 
@@ -107,7 +105,7 @@ message StringConstraintV2 {
 }
 
 message StringSet {
-  repeated string set = 1;
+  repeated uint64 set = 1 [packed=true];
 }
 
 message DateConstraintV2 {
@@ -117,17 +115,6 @@ message DateConstraintV2 {
   }
 }
 
-message SymbolConstraintV2 {
-  oneof Constraint {
-    SymbolSet in_set = 1;
-    SymbolSet not_in_set = 2;
-  }
-}
-
-message SymbolSet {
-  repeated uint64 set = 1 [packed=true];
-}
-
 message BytesConstraintV2 {
   oneof Constraint {
     bytes equal = 1;
@@ -203,5 +190,4 @@ message VerifierPolicies {
   repeated RuleV2 rules = 4;
   repeated CheckV2 checks = 5;
   repeated Policy policies = 6;
-  repeated RuleV2 privileged_rules = 7;
 }