enquo-core 0.5.0-aarch64-linux → 0.5.0.2.g015cdff-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b30675da9cddc9e757446df84024bb0be24512d484732460fdae3316a3808ee
-  data.tar.gz: 400b52836e010030474a09d3bca8b1ffac54f38f6ea3be906b94792286bb1354
+  metadata.gz: a9a076320c4c35d3ab688ee2aa3fa8559772ab4b6505ea456350a99cb72027ab
+  data.tar.gz: f88e08ee73d64a2bb8bc14a9eaec80d87e1e98bafe2e8e18d0a0392e8edf1c47
 SHA512:
-  metadata.gz: d87e366269feed4f22733c9cba25e26034a99a9d8bd25b8287b851b219921165c5dede5ecaa8b5b737632e629fd52a386a2a6f90edc7a78022bb4907d48f2970
-  data.tar.gz: c8eb5ca4f435e7c448085bfdcc63688ddb87429681f183beaaf3761cdb476dd76544c2e9622d7395663fc5ccdbf44a63a793284ddb49aaf5af0c2d02fe2095ee
+  metadata.gz: 0abbc0c9840d3b1a2388d198d8ae93b8b94d18869eb05fecca980e3c8197ecbad9f2b607442e23a3612adc6d4c8b8ebb9779dbd1b9dd2154afcdbc117e67dedd
+  data.tar.gz: 43b9456b853f0f0d1c9f4b7e054c4c97fa267befae28ad780d642fad529225fa09b78cd5c9ef8a8de5351dd049b11a969f3e0858bbc6d6a55fb02dc48aa64088

data/ext/enquo/Cargo.lock

@@ -296,6 +296,7 @@ dependencies = [
  "serde_bytes",
  "sha2",
  "thiserror",
+ "unicode-normalization",
 ]
 
 [[package]]
@@ -788,6 +789,21 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+
 [[package]]
 name = "typenum"
 version = "1.15.0"
@@ -800,6 +816,15 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
 
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
 [[package]]
 name = "unicode-width"
 version = "0.1.9"

data/ext/enquo/src/lib.rs

@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate rutie;
 
-use enquo_core::{key_provider, Date, Field, Root, I64};
+use enquo_core::{key_provider, Date, Field, Root, Text, I64};
 use rutie::{AnyObject, Class, Integer, Module, Object, RString, Symbol, VerifiedObject, VM};
 
 class!(EnquoRoot);
@@ -100,7 +100,7 @@ unsafe_methods!(
             "Failed to create encrypted i64",
         );
         if mode == "no_query" {
-            res.drop_ore_ciphertext();
+            res.make_unqueryable();
         }
 
         RString::new_utf8(&maybe_raise(serde_json::to_string(&res), "Failed to JSONify ciphertext"))
@@ -149,7 +149,7 @@ unsafe_methods!(
             "Failed to create encrypted date",
         );
         if mode == "no_query" {
-            res.drop_ore_ciphertexts();
+            res.make_unqueryable();
         }
 
         RString::new_utf8(&maybe_raise(serde_json::to_string(&res), "Failed to JSONify ciphertext"))
@@ -175,6 +175,48 @@ unsafe_methods!(
         ];
         klass.protect_send("new", &args).unwrap()
     }
+    fn enquo_field_encrypt_text(
+        text_obj: RString,
+        context_obj: RString,
+        mode_obj: Symbol
+    ) -> RString {
+        let text = text_obj.to_str();
+        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" {
+                Text::new_with_unsafe_parts(
+                    text,
+                    &context,
+                    field,
+                )
+            } else {
+                Text::new(text, &context, field)
+            },
+            "Failed to create encrypted date",
+        );
+        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_text(ciphertext_obj: RString, context_obj: RString) -> RString {
+        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: Text =
+            maybe_raise(serde_json::from_str(ct), "Failed to deserialize ciphertext");
+
+        let s = maybe_raise(e_value.decrypt(&context, field), "Failed to decrypt text value");
+
+        RString::new_utf8(&s)
+    }
 );
 
 #[allow(non_snake_case)]
@@ -197,6 +239,8 @@ pub extern "C" fn Init_enquo() {
                 fieldklass.def_private("_decrypt_i64", enquo_field_decrypt_i64);
                 fieldklass.def_private("_encrypt_date", enquo_field_encrypt_date);
                 fieldklass.def_private("_decrypt_date", enquo_field_decrypt_date);
+                fieldklass.def_private("_encrypt_text", enquo_field_encrypt_text);
+                fieldklass.def_private("_decrypt_text", enquo_field_decrypt_text);
             });
         topmod.define_nested_module("RootKey").define(|rkmod| {
             rkmod

data/lib/enquo/field.rb

@@ -69,5 +69,41 @@ module Enquo
 
 			_decrypt_date(data, ctx)
 		end
+
+		def encrypt_text(t, ctx, safety: true, no_query: false)
+			unless t.is_a?(String)
+				raise ArgumentError, "Enquo::Field#encrypt_string can only encrypt Strings"
+			end
+
+			unless t.encoding == Encoding::UTF_8
+				raise ArgumentError, "Enquo::Field#encrypt_string can only encrypt UTF-8 strings (got a string encoding of #{t.encoding})"
+			end
+
+			unless t.valid_encoding?
+				raise ArgumentError, "Enquo::Field#encrypt_string can only encrypt validly-encoded UTF-8 strings"
+			end
+
+			unless ctx.is_a?(String)
+				raise ArgumentError, "Encryption context must be a string (got a #{ctx.class})"
+			end
+
+			_encrypt_text(t, ctx, no_query ? :no_query : safety == :unsafe ? :unsafe : :default)
+		end
+
+		def decrypt_text(data, ctx)
+			unless data.is_a?(String)
+				raise ArgumentError, "Enquo::Field#decrypt_text can only decrypt from a string (got #{data.class})"
+			end
+
+			unless data.encoding == Encoding::UTF_8 && data.valid_encoding?
+				raise ArgumentError, "Enquo::Field#decrypt_date 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_text(data, ctx)
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enquo-core
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.0.2.g015cdff
 platform: aarch64-linux
 authors:
 - Matt Palmer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -193,9 +193,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.2.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.22
 signing_key: