enquo-core 0.2.0.1.g790fccd-arm64-darwin → 0.3.0.1.g08acb85-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c9315e77f2fe1adc49156e43ca05dca5fac169ebcb541455f0d68c0c9873d03
-  data.tar.gz: 97cb80789242681969e4c6b6abff60751b6a187d5a4b54a83d8f994d1e55af76
+  metadata.gz: 1ad733ce6a07d36a16a8a7eb59317591e9bd54fdab30daff3c18bca91bc3434a
+  data.tar.gz: 8aaba74535b773cfaf9922cf1d34bda7e9335f6bcc2ca299f05764dae914470f
 SHA512:
-  metadata.gz: 9ebcc951fc278c9b2749b9abe192d89ed6a5c180d0d1d7a60d6cbe4e6df26239f885c70e7e0fc8d219a679957f8a7a7c2d2840a603998d0bb351b38082529689
-  data.tar.gz: '0768611064af136afde9a9c687e97432792af2be23db966d162fdca23889123ec740dc3c0b9cbd8d784626c8729de3573e1f8598d6f8fe167a248664ad01f2bb'
+  metadata.gz: b98b92a7de23f0cdf3240b7a14efadaa3a02f14eb37ee8424c57c6281022f57ec7307ac38b37c7e17623e7b4a6df9c74517e036e2d5abcf58b6dac84ec712ea0
+  data.tar.gz: 988f105aa2d972dc9ec4b05385ce964919232ebf20d2e2cedeefcfcddf65619421c5ccb1038d246cbb82ebd387e4284f613c78432c4bb5df856da4208fbe9d97

data/ext/enquo/src/lib.rs

@@ -1,8 +1,8 @@
 #[macro_use]
 extern crate rutie;
 
-use enquo_core::{Field, Root, I64};
-use rutie::{Class, Integer, Module, Object, RString, Symbol, VerifiedObject, VM};
+use enquo_core::{Date, Field, Root, I64};
+use rutie::{AnyObject, Class, Integer, Module, Object, RString, Symbol, VerifiedObject, VM};
 
 class!(EnquoRoot);
 class!(EnquoRootKeyStatic);
@@ -57,7 +57,8 @@ methods!(
     EnquoRootKeyStatic,
     _rbself,
     fn enquo_root_key_static_new(root_key: RString) -> EnquoRootKeyStatic {
-        let k = root_key.unwrap().to_vec_u8_unchecked();
+        #[allow(clippy::redundant_clone)]
+        let k = root_key.unwrap().to_vec_u8_unchecked().to_owned();
         let klass = Module::from_existing("Enquo")
             .get_nested_class("RootKey")
             .get_nested_class("Static");
@@ -78,6 +79,8 @@ impl VerifiedObject for EnquoRootKeyStatic {
     }
 }
 
+// rustfmt fucks this so it doesn't compile
+#[rustfmt::skip]
 methods!(
     EnquoField,
     rbself,
@@ -114,6 +117,58 @@ methods!(
             "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
+    ) -> 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 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" {
+                Date::new_with_unsafe_parts(
+                    (y, m, d),
+                    &context.unwrap().to_vec_u8_unchecked(),
+                    field,
+                )
+            } else {
+                Date::new((y, m, d), &context.unwrap().to_vec_u8_unchecked(), field)
+            },
+            "Failed to create encrypted date",
+        );
+        if s_mode == "no_query" {
+            res.drop_ore_ciphertexts();
+        }
+
+        RString::new_utf8(&serde_json::to_string(&res).unwrap())
+    },
+    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");
+
+        let field = rbself.get_data(&*FIELD_WRAPPER);
+
+        let (y, m, d) = maybe_raise(
+            e_value.decrypt(&context.unwrap().to_vec_u8_unchecked(), field),
+            "Failed to decrypt date value",
+        );
+        let klass = Class::from_existing("Date");
+        let args: [AnyObject; 3] = [
+            Integer::from(y as i32).into(),
+            Integer::from(m as i32).into(),
+            Integer::from(d as i32).into(),
+        ];
+        klass.protect_send("new", &args).unwrap()
     }
 );
 
@@ -135,6 +190,8 @@ pub extern "C" fn Init_enquo() {
             .define(|fieldklass| {
                 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);
+                fieldklass.def_private("_decrypt_date", enquo_field_decrypt_date);
             });
         topmod.define_nested_module("RootKey").define(|rkmod| {
             rkmod

data/lib/enquo/field.rb

@@ -1,3 +1,5 @@
+require "date"
+
 module Enquo
 	class Field
 		def self.new(*_)
@@ -35,5 +37,37 @@ module Enquo
 
 			_decrypt_i64(data, ctx)
 		end
+
+		def encrypt_date(d, ctx, safety: true, no_query: false)
+			unless d.is_a?(Date)
+				raise ArgumentError, "Enquo::Field#encrypt_date can only encrypt Dates"
+			end
+
+			unless d.year >= -2 ** 15 && d.year < 2 ** 15 - 1
+				raise RangeError, "Enquo::Field#encrypt_date can only encrypt dates where the year is between -32,768 and 32,767 (got #{d.year})"
+			end
+
+			unless ctx.is_a?(String)
+				raise ArgumentError, "Encryption context must be a string (got a #{ctx.class})"
+			end
+
+			_encrypt_date(d.year, d.month, d.day, ctx, no_query ? :no_query : safety == :unsafe ? :unsafe : :default)
+		end
+
+		def decrypt_date(data, ctx)
+			unless data.is_a?(String)
+				raise ArgumentError, "Enquo::Field#decrypt_date 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_date(data, ctx)
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enquo-core
 version: !ruby/object:Gem::Version
-  version: 0.2.0.1.g790fccd
+  version: 0.3.0.1.g08acb85
 platform: arm64-darwin
 authors:
 - Matt Palmer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler