vestauth 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c89e42127df034e314cc6b11c576f76165c3ba8f99b0b6540eb9aee92e77541
-  data.tar.gz: 74d41456361216beb075c498b1cb6f1f8f1cf381628d64303ab5e8af2daf76cd
+  metadata.gz: c6b8f1d4a5090fe9722110044d32e179747140a59095bfa8cb204da5181d320f
+  data.tar.gz: e5fa5304418ee9327a68828e670c6b32e8df582d3279f85b1babe9158af7608f
 SHA512:
-  metadata.gz: '098e54f2851e34efa9b82d5a5d0afc0f5d531c27f23cb41384764f1a10f6238e232ca14971e98df38dea2ba48f41db2f5946b5c3b8900ab0e8c36ecf322851f2'
-  data.tar.gz: 44a27df536ced66a434eaf705caa617cb545f0883f979fdf8574b7b23544a109870873848ee3c6e802931a6b744d6af325cacaa4bbbf87ea243f0896e37a8dd9
+  metadata.gz: 1f2caff1c291833e5e980181bc80541c5d90190b3863b97fce823c66ebb8f19272c098a9bf2d04511375c0af91d25808de1ba9fecccbe8bb49fe7f9c260f1bb6
+  data.tar.gz: d840d82fc9ce7167e112cfd78b62e98090fcd3085d0c51f7e0390eb7746556ea2071fb0b7489f0ae51c19d8e81996f5f7062a255726d9926f43a20a71d8d1bac

data/lib/vestauth/agent.rb

@@ -4,11 +4,11 @@ module Vestauth
   module Agent
     module_function
 
-    def headers(http_method:, uri:, private_key:, id:)
+    def headers(http_method:, uri:, private_jwk:, id:)
       vestauth_binary.agent_headers(
         http_method: http_method,
         uri: uri,
-        private_key: private_key,
+        private_jwk: private_jwk,
         id: id
       )
     end

data/lib/vestauth/binary.rb

@@ -27,8 +27,8 @@ module Vestauth
       run_json_command(command)
     end
 
-    def agent_headers(http_method:, uri:, private_key:, id:)
-      private_jwk = serialize_json_arg(private_key, name: "private_key")
+    def agent_headers(http_method:, uri:, private_jwk:, id:)
+      private_jwk = serialize_json_arg(private_jwk, name: "private_jwk")
 
       command = [
         @executable,
@@ -45,8 +45,8 @@ module Vestauth
       run_json_command(command)
     end
 
-    def primitives_verify(http_method:, uri:, signature_header:, signature_input_header:, public_key:)
-      public_jwk = serialize_json_arg(public_key, name: "public_key")
+    def primitives_verify(http_method:, uri:, signature_header:, signature_input_header:, public_jwk:)
+      public_jwk = serialize_json_arg(public_jwk, name: "public_jwk")
 
       command = [
         @executable,
@@ -78,11 +78,30 @@ module Vestauth
 
     def serialize_json_arg(value, name:)
       return value if value.is_a?(String)
+
       return JSON.generate(value) if value.is_a?(Hash) || value.is_a?(Array)
-      return JSON.generate(value.to_h) if value.respond_to?(:to_h)
+
+      if value.respond_to?(:to_h)
+        json = serialize_json_arg_from_to_h(value)
+        return json unless json.nil?
+      end
       return JSON.generate(value.as_json) if value.respond_to?(:as_json)
 
       raise ArgumentError, "#{name} must be a JSON string, Hash/Array, or object responding to #to_h"
     end
+
+    def serialize_json_arg_from_to_h(value)
+      JSON.generate(value.to_h)
+    rescue StandardError => e
+      raise unless action_controller_unfiltered_parameters?(e)
+
+      nil
+    end
+
+    def action_controller_unfiltered_parameters?(error)
+      error.instance_of?(Object.const_get("ActionController::UnfilteredParameters"))
+    rescue NameError
+      false
+    end
   end
 end

data/lib/vestauth/primitives.rb

@@ -4,13 +4,13 @@ module Vestauth
   module Primitives
     module_function
 
-    def verify(http_method:, uri:, signature_header:, signature_input_header:, public_key:)
+    def verify(http_method:, uri:, signature_header:, signature_input_header:, public_jwk:)
       vestauth_binary.primitives_verify(
         http_method: http_method,
         uri: uri,
         signature_header: signature_header,
         signature_input_header: signature_input_header,
-        public_key: public_key
+        public_jwk: public_jwk
       )
     end
 

data/lib/vestauth/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vestauth
-  VERSION = "0.4.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vestauth
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - motdotla