capbac 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44848813257e696a0d0aa3ee32740481dced5a2400821e69a4fe31b130e60476
-  data.tar.gz: 9e7bc540cba3a4a0be51ed7d91f06455f493dbae694b5a003716d75143196bb5
+  metadata.gz: 1bd36669dadaa15cc19abc91afa54f986bce85fe171ed7b9851c8a4bfcdb323d
+  data.tar.gz: a9630ec9063f4effef544f22b522b0ecf0da91ba5c3d01f8412d156f6a69911f
 SHA512:
-  metadata.gz: 3a05e44960b0368b3fa77def316ead43fd2aef59586ae5900e738b0b1f4f5329fba514270a52cd565301a60ec6c3e1d99cfe596bb52eaa667cd13da6c28999b2
-  data.tar.gz: 1a30dc257457acd1bb747ab6a4d9452c65d3833aa05459c48a7c61adc73957519516c68e6c21b00683d3ce7f7562cd908ac6542164e9358fa79371babfd7302d
+  metadata.gz: 9e60cd11841ba5ea225a4f1e7e7bf6d2ec37ef2ef6fa8ef0ac031431c917c67fc71d09902727b06f041e9c886620e2f85bf285d2e6867aac2e287d9c3a04a621
+  data.tar.gz: 3bf141c3eaf5b569a609081061e7b0e72fd8b16f4b1c3cb8f5ac29952524ca54f9f756278174b03cd95ec6d1875c345bbec8ddc92ff42decf9cea8173bc21904

data/lib/capbac/version.rb

@@ -1,3 +1,3 @@
 module CapBAC
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/src/lib.rs

@@ -15,11 +15,51 @@ use ring::{
 };
 use rutie::{
     AnyObject, Boolean, Class, Encoding, Fixnum, Hash, Module, Object, RString, Symbol,
-    VerifiedObject, GC, VM,
+    VerifiedObject, GC, VM, Array,
 };
 use std::{fmt, str};
 use url::Url;
 
+class!(ASCIIRString);
+
+impl VerifiedObject for ASCIIRString {
+    fn is_correct_type<T: Object>(object: &T) -> bool {
+        object
+            .class()
+            .ancestors()
+            .iter()
+            .any(|class| *class == Class::from_existing("String"))
+    }
+
+    fn error_message() -> &'static str {
+        "Error converting to ASCII String"
+    }
+}
+
+impl From<ASCIIRString> for RString {
+    fn from(rstring: ASCIIRString) -> Self {
+        let bytes = rstring
+            .protect_send("bytes", &[])
+            .map_err(VM::raise_ex)
+            .unwrap()
+            .try_convert_to::<Array>()
+            .map_err(VM::raise_ex)
+            .unwrap();
+
+        let mut res = Vec::new();
+
+        for n in bytes.into_iter() {
+            let n = n.try_convert_to::<Fixnum>()
+                .map_err(|e| VM::raise_ex(e))
+                .unwrap();
+
+            res.push(n.to_i64() as u8);
+        }
+
+        RString::from_bytes(&res, &Encoding::us_ascii())
+    }
+}
+
 class!(URI);
 
 impl VerifiedObject for URI {
@@ -109,14 +149,12 @@ fn options_to_cert_blueprint(options: Hash) -> CertificateBlueprint {
 fn options_to_invoke_blueprint(options: Hash) -> InvokeBlueprint {
     let cert_content = options
         .at(&Symbol::new("cert"))
-        .try_convert_to::<RString>()
+        .try_convert_to::<ASCIIRString>()
         .map_err(VM::raise_ex)
-        .unwrap()
-        .to_string()
-        .into_bytes();
+        .unwrap();
 
     let mut cert = capbac::proto::Certificate::new();
-    cert.merge_from_bytes(&cert_content).unwrap();
+    cert.merge_from_bytes(&RString::from(cert_content).to_vec_u8_unchecked()).unwrap();
 
     let action = options
         .at(&Symbol::new("action"))
@@ -187,15 +225,15 @@ methods!(
         RString::from_bytes(&cert.write_to_bytes().unwrap(), &Encoding::us_ascii())
     }
 
-    fn ruby_holder_delegate(cert: RString, options: Hash) -> RString {
+    fn ruby_holder_delegate(cert: ASCIIRString, options: Hash) -> RString {
         let ruby_options = options.map_err(VM::raise_ex).unwrap();
         let options = options_to_cert_blueprint(ruby_options);
         let holder = itself.get_data(&*HOLDER_WRAPPER);
 
-        let cert_content = cert.unwrap().to_string_unchecked();
+        let cert_content = RString::from(cert.map_err(VM::raise_ex).unwrap()).to_vec_u8_unchecked();
 
         let mut cert = capbac::proto::Certificate::new();
-        cert.merge_from_bytes(&cert_content.as_bytes()).unwrap();
+        cert.merge_from_bytes(&cert_content).unwrap();
 
         let cert = holder.delegate(cert, options).unwrap();
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capbac
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kirill Chernyshov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-24 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thermite