enquo-core 0.6.0.7.gc8b36a2 → 0.6.0.11.g8d4f25f

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 132f8ef68cd26acba61017a8c4e580ee8546c040ef24d38693bb68d831945749
-  data.tar.gz: 909eb8bbd08642446829eef0b450da5d6746554ecb8979af84efcb69843a9a52
+  metadata.gz: 94ead69e0c6bf0e50f4c4a78560594d6a5e18e29dffedf9aee04b996b3a9368d
+  data.tar.gz: befbf19e7843e70274f13a1c5a9f86626ba85e10f12a88ce129f86c49efe627e
 SHA512:
-  metadata.gz: 209dd96442ef7d01a42c2e42f1a568522c76b85d2fe9fbc23b2da64fb82daa2ddd408215929b4ede3f2d19cad087a532a75e7959b6a122bb434e1f9ab42eefb7
-  data.tar.gz: 16671334b24e3c221e442af0dd595f8ed3d003b5bd85908a9a39d0acd56c4fe390d63fa4c99ca3f1d98422a88f2506726010410adbe67cf74dcb1eabce846c1a
+  metadata.gz: 87c16c88179682cf5510cf6497d861361567144233d00ca1b9823c1629267056537afb48e22ffcaf2f7db814fc3fdf95a6072df9cd2cc4dc93a183c35c4e6f65
+  data.tar.gz: 65405aed7f47b863f2c8ce7f161150978df1aeb9a32918882d46e4282c97b4414c997f2ad7f5124d799a658f11a249e9adde4f31504c24fc299a96fd52f587e9

data/enquo-core.gemspec

@@ -24,15 +24,17 @@ Gem::Specification.new do |s|
 	s.metadata["bug_tracker_uri"] = "https://github.com/enquo/enquo-core/issues"
 
 	s.files = `git ls-files -z`.split("\0").reject { |f| f =~ /^(G|spec|Rakefile)/ }
+	s.extensions = ["ext/enquo/extconf.rb"]
 
 	s.required_ruby_version = ">= 2.7.0"
 
+	s.add_runtime_dependency 'rb_sys', '~> 0.1'
+
 	s.add_development_dependency 'bundler'
 	s.add_development_dependency 'github-release'
 	s.add_development_dependency 'rake', '~> 13.0'
 	s.add_development_dependency 'rake-compiler', '~> 1.2'
 	s.add_development_dependency 'rake-compiler-dock', '~> 1.2'
-	s.add_development_dependency 'rb_sys', '~> 0.1'
 	s.add_development_dependency 'redcarpet'
 	s.add_development_dependency 'rspec'
 	s.add_development_dependency 'simplecov'

data/ext/enquo/Cargo.lock

@@ -211,9 +211,9 @@ dependencies = [
 
 [[package]]
 name = "cretrit"
-version = "0.2.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4760922c5f3dd56f84699b523b2aa6ce0b4b82845eff8eb4efc3e642dadf0"
+checksum = "0b424f56a53c945d026954e4b431c9d8bd3cd8c431574c8f4b77f59e860c366a"
 dependencies = [
  "aes",
  "cmac",

data/ext/enquo/src/lib.rs

@@ -1,8 +1,11 @@
 #[macro_use]
 extern crate rutie;
 
-use enquo_core::{key_provider, Date, Field, Root, Text, I64};
-use rutie::{AnyObject, Class, Integer, Module, Object, RString, Symbol, VerifiedObject, VM};
+use enquo_core::{key_provider, Boolean, Date, Field, Root, Text, I64};
+use rutie::{
+    AnyObject, Boolean as RBoolean, Class, Integer, Module, Object, RString, Symbol,
+    VerifiedObject, VM,
+};
 
 class!(EnquoRoot);
 class!(EnquoRootKeyStatic);
@@ -84,6 +87,42 @@ impl VerifiedObject for EnquoRootKeyStatic {
 unsafe_methods!(
     EnquoField,
     rbself,
+    fn enquo_field_encrypt_bool(b_obj: RBoolean, context_obj: RString, mode_obj: Symbol) -> RString {
+        let b = b_obj.to_bool();
+        let context = context_obj.to_vec_u8_unchecked();
+        let mode = mode_obj.to_str();
+
+        let field = rbself.get_data(&*FIELD_WRAPPER);
+
+        let mut res = maybe_raise(
+            if mode == "unsafe" {
+                Boolean::new_with_unsafe_parts(b, &context, field)
+            } else {
+                Boolean::new(b, &context, field)
+            },
+            "Failed to create encrypted bool",
+        );
+        if mode == "no_query" {
+            res.make_unqueryable();
+        }
+
+        RString::new_utf8(&maybe_raise(serde_json::to_string(&res), "Failed to JSONify ciphertext"))
+    },
+    fn enquo_field_decrypt_bool(ciphertext_obj: RString, context_obj: RString) -> RBoolean {
+        let ct = ciphertext_obj.to_str_unchecked();
+        let context = context_obj.to_vec_u8_unchecked();
+
+        let field = rbself.get_data(&*FIELD_WRAPPER);
+
+        let e_value: Boolean =
+            maybe_raise(serde_json::from_str(ct), "Failed to deserialize ciphertext");
+
+        let value = maybe_raise(
+            e_value.decrypt(&context, field),
+            "Failed to decrypt bool value",
+        );
+        RBoolean::new(value)
+    },
     fn enquo_field_encrypt_i64(i_obj: Integer, context_obj: RString, mode_obj: Symbol) -> RString {
         let i = i_obj.to_i64();
         let context = context_obj.to_vec_u8_unchecked();
@@ -235,6 +274,8 @@ pub extern "C" fn Init_enquo() {
         topmod
             .define_nested_class("Field", None)
             .define(|fieldklass| {
+                fieldklass.def_private("_encrypt_bool", enquo_field_encrypt_bool);
+                fieldklass.def_private("_decrypt_bool", enquo_field_decrypt_bool);
                 fieldklass.def_private("_encrypt_i64", enquo_field_encrypt_i64);
                 fieldklass.def_private("_decrypt_i64", enquo_field_decrypt_i64);
                 fieldklass.def_private("_encrypt_date", enquo_field_encrypt_date);

data/lib/enquo/field.rb

@@ -6,6 +6,34 @@ module Enquo
 			raise RuntimeError, "Enquo::Field cannot be instantiated directly; use Enquo::Crypto#field instead"
 		end
 
+		def encrypt_bool(b, ctx, safety: true, no_query: false)
+			unless b.is_a?(TrueClass) || b.is_a?(FalseClass)
+				raise ArgumentError, "Enquo::Field#encrypt_bool can only encrypt booleans"
+			end
+
+			unless ctx.is_a?(String)
+				raise ArgumentError, "Encryption context must be a string (got a #{ctx.class})"
+			end
+
+			_encrypt_bool(b, ctx, no_query ? :no_query : safety == :unsafe ? :unsafe : :default)
+		end
+
+		def decrypt_bool(data, ctx)
+			unless data.is_a?(String)
+				raise ArgumentError, "Enquo::Field#decrypt_i64 can only decrypt from a string (got #{data.class})"
+			end
+
+			unless data.encoding == Encoding::UTF_8 && data.valid_encoding?
+				raise ArgumentError, "Enquo::Field#decrypt_i64 can only decrypt validly-encoded UTF-8 strings (got #{data.encoding})"
+			end
+
+			unless ctx.is_a?(String)
+				raise ArgumentError, "Encryption context must be a string (got a #{ctx.class})"
+			end
+
+			_decrypt_bool(data, ctx)
+		end
+
 		def encrypt_i64(i, ctx, safety: true, no_query: false)
 			unless i.is_a?(Integer)
 				raise ArgumentError, "Enquo::Field#encrypt_i64 can only encrypt integers"

metadata

@@ -1,15 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: enquo-core
 version: !ruby/object:Gem::Version
-  version: 0.6.0.7.gc8b36a2
+  version: 0.6.0.11.g8d4f25f
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-26 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rb_sys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +95,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rb_sys
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +155,8 @@ description:
 email:
 - matt@enquo.org
 executables: []
-extensions: []
+extensions:
+- ext/enquo/extconf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"