enquo-core 0.2.0.1.g790fccd-aarch64-linux → 0.3.0.1.g08acb85-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80d97dbb5acdc74c0890e4b0044459f1e2cbfba647cff52340c15dd7f2e65621
-  data.tar.gz: 4d79f25e5d84cba8efd52da5619c1a9b4b0db73a91921c9bed81815d48c809b8
+  metadata.gz: 70433c7409454ce78ecce0e272edfd482f5d8e96767dd32b54aa1d68f4974e01
+  data.tar.gz: c13a49c68a5ba440f2888a5159d7f2a5941e73b2d06be3f5837d1a0374c4a778
 SHA512:
-  metadata.gz: 7db93429bd9f918c42640ae3b73f1aae446c0e7e7f262f7a224a6de2ea79d17287d6dd5b2a6bd307e9fa982a144e7f03cd8fa407d26d6f8d38c89b51b8f2ce15
-  data.tar.gz: fc3c4d0291c078bb0314b0fc891f359138b224aaeb69bf3e029443af32e090f98f0e017df049e92bab894b93bef2db32ba566f159d13d1e9329645df7fc44b82
+  metadata.gz: b3f6c08827e00614e59804698c5f5f9363173e43dfcc041e3badccf25d88fc3d1ab04daa76365aa1d85ce3de5c8a8cc83eb46027ca101067b0436416ce908e99
+  data.tar.gz: e5e2c1004bb8385b135e4fc6d6874d4c83f81d3c1351a0592c96c969718f1ba1d2d70901c36c2abb912a156ec32799d70a26cbad96234ceeee9129e065f83feb

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: aarch64-linux
 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