enquo-core 0.3.0 → 0.3.0.1.g08acb85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '019495fa89d0d738dcc9a233d4184e8d3cf58cdd9c27969e24ca613eb5a02a66'
-  data.tar.gz: a8ec7915b1a274cacf663914ee7bca2cbda0bcb92ba32dbd8dd45270069fef79
+  metadata.gz: ff9be64dbe69ec736b3fc0e0a15c66b499d42136a85ac88d4842f1d7f0938973
+  data.tar.gz: 6da855b9be817b0b124542bfc7c051f74436533f1d8696cf1631a58f21fa4ce1
 SHA512:
-  metadata.gz: b10d02c6c60da77891c80b1d1d3992dcbf1eb3fa185632e302c72866f23edd92b1da0aa083012dc2a08c1c3d6e9e490239e6856074d8af3c89741061b18b8fd6
-  data.tar.gz: 413cb390002789a07e1a0a3b5d1785d662ad59c9d96f43a37be0ded27c0240f5b2b96b2685a8954528ab124400d4b7f68f611d1233c4970403c2a5bdcdce7c1b
+  metadata.gz: 40ae1e354032b06be568220c48b340dc3fedb8027e66f5c0abc05a871bef5554ad20f87b318b3271dfe9150016219143b7e91ed5ebb749396988129e379792bf
+  data.tar.gz: af2fca1a6c1492db7afae290730653da83e69b3b9df9315c764eb6318051e05eb97d595fef2048a1a40e94e5913d012d0497237ca68937a5af0c90344f8e2f27

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.3.0
+  version: 0.3.0.1.g08acb85
 platform: ruby
 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
@@ -187,9 +187,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: