simple-service 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddfef08de84da78d9ffbc767ed827300fd1c17e354b3227dc896c0271870eece
-  data.tar.gz: 71682a1f87227f246a4ab7d62c5884e2a7babb5052c175e16c902a39572b21d1
+  metadata.gz: 5300b67f8c93b974d4ae19f285aa80915b195f8c5483c340b1716ecf2b41f969
+  data.tar.gz: 4272fc5ea6add6f0bb774c7faee8d2abe00ad0f1bda1056b80cc3a57a9ab6df5
 SHA512:
-  metadata.gz: 760810f36df807705637d39079501aebc79a80be8423a25bc41371c5d4c2f5ee165a2dff4ae55d518e04dd0e07e58f5b306a6566e51dd4a7d8e75cc7fe9bd12b
-  data.tar.gz: 315b4b8ff7d70687e8cfb5cc1a8206d3bdc1bd3200663c1c26ec41c599884e83f96a2be41435400d42f6c763f03aa2e0fd91e1a7d42627b3df415bc8bf4fcdef
+  metadata.gz: 83233c349d6a144183f0ca2a18993712a4902dcc65934a63dcc7cfed370ffc1ddcdfa7754a1ffff85f11c8875007de7843f8c5d7fd8d6f7eb799dd14c1e3b373
+  data.tar.gz: '0268ef5da51bcca27e9a3a1766f9ede7d67a8213cf52b97206d000836012cd7c3220511098dad734c316fa3a068f3e853301ffaf8b8dac73712b3f3757dd674b'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/simple/service.rb

@@ -70,7 +70,6 @@ module Simple::Service
   #
   # You cannot call this method if the context is not set.
   def self.invoke2(service, name, args: {}, flags: {})
-    args.each { |key, _| expect! key => Symbol }
     raise ContextMissingError, "Need to set context before calling ::Simple::Service.invoke" unless context
 
     action(service, name).invoke2(args: args, flags: flags)

data/lib/simple/service/action.rb

@@ -5,6 +5,7 @@ end
 
 require_relative "./action/comment"
 require_relative "./action/parameter"
+require_relative "./action/indie_hash"
 
 module Simple::Service
   # rubocop:disable Metrics/AbcSize
@@ -89,6 +90,12 @@ module Simple::Service
     #
     # You cannot call this method if the context is not set.
     def invoke2(args:, flags:)
+      # args and flags are being stringified. This is necessary to not allow any
+      # unchecked input to DOS this process by just providing always changing
+      # key values.
+      args = IndieHash.new(args)
+      flags = IndieHash.new(flags)
+
       verify_required_args!(args, flags)
 
       positionals = build_positional_arguments(args, flags)
@@ -110,7 +117,7 @@ module Simple::Service
 
     # returns an error if the keywords hash does not define all required keyword arguments.
     def verify_required_args!(args, flags) # :nodoc:
-      @required_names ||= parameters.select(&:required?).map(&:name)
+      @required_names ||= parameters.select(&:required?).map(&:name).map(&:to_s)
 
       missing_parameters = @required_names - args.keys - flags.keys
       return if missing_parameters.empty?
@@ -121,12 +128,14 @@ module Simple::Service
     # Enumerating all parameters it puts all named parameters into a Hash
     # of keyword arguments.
     def build_keyword_arguments(args)
-      @keyword_names ||= parameters.select(&:keyword?).map(&:name)
+      @keyword_names ||= parameters.select(&:keyword?).map(&:name).map(&:to_s)
 
       keys = @keyword_names & args.keys
       values = args.fetch_values(*keys)
 
-      Hash[keys.zip(values)]
+      # Note that +keys+ now only contains names of keyword arguments that actually exist.
+      # This is therefore not a way to DOS this process.
+      Hash[keys.map(&:to_sym).zip(values)]
     end
 
     def variadic_parameter

data/lib/simple/service/action/indie_hash.rb

@@ -0,0 +1,37 @@
+class Simple::Service::Action
+  # The IndieHash class defines as much of the Hash interface as necessary for simple-service
+  # to successfully run.
+  class IndieHash
+    def initialize(hsh)
+      @hsh = hsh.each_with_object({}) { |(k, v), h| h[k.to_s] = v }
+    end
+
+    def keys
+      @hsh.keys
+    end
+
+    def fetch_values(*keys)
+      keys = keys.map(&:to_s)
+      @hsh.fetch_values(*keys)
+    end
+
+    def key?(sym)
+      @hsh.key?(sym.to_s)
+    end
+
+    def [](sym)
+      @hsh[sym.to_s]
+    end
+
+    def merge(other_hsh)
+      @hsh = @hsh.merge(other_hsh.send(:__hsh__))
+      self
+    end
+
+    private
+
+    def __hsh__
+      @hsh
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-service
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - radiospiel
@@ -46,6 +46,7 @@ files:
 - lib/simple/service.rb
 - lib/simple/service/action.rb
 - lib/simple/service/action/comment.rb
+- lib/simple/service/action/indie_hash.rb
 - lib/simple/service/action/method_reflection.rb
 - lib/simple/service/action/parameter.rb
 - lib/simple/service/context.rb