enquo-core 0.4.0-x86_64-darwin → 0.5.0.1.gab6af4a-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87a75f1b302180c134d1d5e15afb3afeb9864e0540a6ecbfce62f9727086a838
-  data.tar.gz: 6b712512aefa28daa381d9bf57a876928a5acccac08af394075a7f75d580c904
+  metadata.gz: 755bc1c568d6d0719d58e66136dbd2af62f08b2e4a029f2cf49d96ed13bad4e2
+  data.tar.gz: 8b5dd32145583fe646628b4d4778254da79918459194b1460a8e436e763fbd12
 SHA512:
-  metadata.gz: 54f810ab8dffd2cb3440daaa0eb51bf9cd1a59d17bf431dc41b3d42864201e0c805b8311e1c55be6e580f18f9854a2231d28014713028ad5aab8c706002605a3
-  data.tar.gz: '0491e433c396d65bad1bdb8c1ce5f819189516254629a5bb17f6c3c93106abb7c9e413443e52256e407e80b0d0f073bacb42a396dc7f57e2f18bc6c903235af1'
+  metadata.gz: a5e3666c6379ac76b7c21d41e61ea87e6c088bda64bcdcad001886c6f476d0a9e7c648de4881adcf1b05c118b86e6ba0931776882a6c341758b92c1df92f3256
+  data.tar.gz: 94f5d647ccd65f4bb7119f4320b28d5f0004bf95161f080435dc977b95bfcc707767ac64a26e308717575be1a9da731d7ce201b53444a425758afde3718b0182

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,17 +1,19 @@
 #[macro_use]
 extern crate rutie;
 
-use enquo_core::{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);
 class!(EnquoRootKeyStatic);
 class!(EnquoField);
 
-type StaticRootKey = Vec<u8>;
-
 wrappable_struct!(Root<'static>, RootWrapper, ROOT_WRAPPER);
-wrappable_struct!(StaticRootKey, StaticRootKeyWrapper, STATIC_ROOT_KEY_WRAPPER);
+wrappable_struct!(
+    key_provider::Static,
+    StaticRootKeyWrapper,
+    STATIC_ROOT_KEY_WRAPPER
+);
 wrappable_struct!(Field, FieldWrapper, FIELD_WRAPPER);
 
 fn maybe_raise<T, E: std::error::Error>(r: Result<T, E>, s: &str) -> T {
@@ -24,27 +26,24 @@ fn maybe_raise<T, E: std::error::Error>(r: Result<T, E>, s: &str) -> T {
     .unwrap()
 }
 
-methods!(
+unsafe_methods!(
     EnquoRoot,
     rbself,
     fn enquo_root_new_from_static_root_key(root_key_obj: EnquoRootKeyStatic) -> EnquoRoot {
-        let root_key = root_key_obj.unwrap();
-        // Not so needless after all, Clippy...
-        #[allow(clippy::needless_borrow)]
-        let rk = root_key.get_data(&*STATIC_ROOT_KEY_WRAPPER);
+        let rk = root_key_obj.get_data(&*STATIC_ROOT_KEY_WRAPPER);
         let root = maybe_raise(Root::new(rk), "Failed to create Enquo::Root");
 
         let klass = Module::from_existing("Enquo").get_nested_class("Root");
         klass.wrap_data(root, &*ROOT_WRAPPER)
     },
-    fn enquo_root_field(relation: RString, name: RString) -> EnquoField {
+    fn enquo_root_field(relation_obj: RString, name_obj: RString) -> EnquoField {
+        let relation = relation_obj.to_vec_u8_unchecked();
+        let name = name_obj.to_vec_u8_unchecked();
+
         let root = rbself.get_data(&*ROOT_WRAPPER);
 
         let field = maybe_raise(
-            root.field(
-                &relation.unwrap().to_vec_u8_unchecked(),
-                &name.unwrap().to_vec_u8_unchecked(),
-            ),
+            root.field(&relation, &name),
             "Failed to create Enquo::Field",
         );
 
@@ -53,12 +52,13 @@ methods!(
     }
 );
 
-methods!(
+unsafe_methods!(
     EnquoRootKeyStatic,
     _rbself,
-    fn enquo_root_key_static_new(root_key: RString) -> EnquoRootKeyStatic {
-        #[allow(clippy::redundant_clone)]
-        let k = root_key.unwrap().to_vec_u8_unchecked().to_owned();
+    fn enquo_root_key_static_new(root_key_obj: RString) -> EnquoRootKeyStatic {
+        let root_key = root_key_obj.to_vec_u8_unchecked();
+
+        let k = key_provider::Static::new(&root_key);
         let klass = Module::from_existing("Enquo")
             .get_nested_class("RootKey")
             .get_nested_class("Static");
@@ -81,85 +81,90 @@ impl VerifiedObject for EnquoRootKeyStatic {
 
 // rustfmt fucks this so it doesn't compile
 #[rustfmt::skip]
-methods!(
+unsafe_methods!(
     EnquoField,
     rbself,
-    fn enquo_field_encrypt_i64(value: Integer, context: RString, mode: Symbol) -> RString {
-        let i = value.unwrap().to_i64();
+    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();
+        let mode = mode_obj.to_str();
+
         let field = rbself.get_data(&*FIELD_WRAPPER);
-        let r_mode = mode.unwrap();
-        let s_mode = r_mode.to_str();
 
         let mut res = maybe_raise(
-            if s_mode == "unsafe" {
-                I64::new_with_unsafe_parts(i, &context.unwrap().to_vec_u8_unchecked(), field)
+            if mode == "unsafe" {
+                I64::new_with_unsafe_parts(i, &context, field)
             } else {
-                I64::new(i, &context.unwrap().to_vec_u8_unchecked(), field)
+                I64::new(i, &context, field)
             },
             "Failed to create encrypted i64",
         );
-        if s_mode == "no_query" {
+        if mode == "no_query" {
             res.drop_ore_ciphertext();
         }
 
-        RString::new_utf8(&serde_json::to_string(&res).unwrap())
+        RString::new_utf8(&maybe_raise(serde_json::to_string(&res), "Failed to JSONify ciphertext"))
     },
-    fn enquo_field_decrypt_i64(ciphertext: RString, context: RString) -> Integer {
-        let ct_r = ciphertext.unwrap();
-        let ct = ct_r.to_str_unchecked();
+    fn enquo_field_decrypt_i64(ciphertext_obj: RString, context_obj: RString) -> Integer {
+        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: I64 =
             maybe_raise(serde_json::from_str(ct), "Failed to deserialize ciphertext");
 
-        let field = rbself.get_data(&*FIELD_WRAPPER);
 
         let value = maybe_raise(
-            e_value.decrypt(&context.unwrap().to_vec_u8_unchecked(), field),
+            e_value.decrypt(&context, field),
             "Failed to decrypt i64 value",
         );
         Integer::from(value)
     },
     fn enquo_field_encrypt_date(
-        y_r: Integer,
-        m_r: Integer,
-        d_r: Integer,
-        context: RString,
-        mode: Symbol
+        y_obj: Integer,
+        m_obj: Integer,
+        d_obj: Integer,
+        context_obj: RString,
+        mode_obj: Symbol
     ) -> RString {
-        let y = y_r.unwrap().to_i32() as i16;
-        let m = m_r.unwrap().to_i32() as u8;
-        let d = d_r.unwrap().to_i32() as u8;
+        let y = y_obj.to_i32() as i16;
+        let m = m_obj.to_i32() as u8;
+        let d = d_obj.to_i32() as u8;
+        let context = context_obj.to_vec_u8_unchecked();
+        let mode = mode_obj.to_str();
+
         let field = rbself.get_data(&*FIELD_WRAPPER);
-        let r_mode = mode.unwrap();
-        let s_mode = r_mode.to_str();
 
         let mut res = maybe_raise(
-            if s_mode == "unsafe" {
+            if mode == "unsafe" {
                 Date::new_with_unsafe_parts(
                     (y, m, d),
-                    &context.unwrap().to_vec_u8_unchecked(),
+                    &context,
                     field,
                 )
             } else {
-                Date::new((y, m, d), &context.unwrap().to_vec_u8_unchecked(), field)
+                Date::new((y, m, d), &context, field)
             },
             "Failed to create encrypted date",
         );
-        if s_mode == "no_query" {
+        if mode == "no_query" {
             res.drop_ore_ciphertexts();
         }
 
-        RString::new_utf8(&serde_json::to_string(&res).unwrap())
+        RString::new_utf8(&maybe_raise(serde_json::to_string(&res), "Failed to JSONify ciphertext"))
     },
-    fn enquo_field_decrypt_date(ciphertext: RString, context: RString) -> AnyObject {
-        let ct_r = ciphertext.unwrap();
-        let ct = ct_r.to_str_unchecked();
-        let e_value: Date =
-            maybe_raise(serde_json::from_str(ct), "Failed to deserialize ciphertext");
+    fn enquo_field_decrypt_date(ciphertext_obj: RString, context_obj: RString) -> AnyObject {
+        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: Date =
+            maybe_raise(serde_json::from_str(ct), "Failed to deserialize ciphertext");
+
         let (y, m, d) = maybe_raise(
-            e_value.decrypt(&context.unwrap().to_vec_u8_unchecked(), field),
+            e_value.decrypt(&context, field),
             "Failed to decrypt date value",
         );
         let klass = Class::from_existing("Date");
@@ -170,6 +175,48 @@ 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)]
@@ -192,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

data/lib/enquo/root.rb

@@ -6,6 +6,10 @@ module Enquo
 				_new_from_static_root_key(key)
 			else
 				raise ArgumentError, "key must be a root key provider object (got a #{key.class})"
+			end.tap do |k|
+				# DIRTY HACK ALERT: take a reference to the key so it doesn't get GC'd
+				# If someone can come up with a better way to acheive this, I'm all ears
+				k.instance_variable_set(:@_key, key)
 			end
 		end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enquo-core
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0.1.gab6af4a
 platform: x86_64-darwin
 authors:
 - Matt Palmer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-04 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: