sun_gem 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c659d56fe9bca58b2e77ab8ba79b99364cb720aa
-  data.tar.gz: a1a7f67b9ff5bb059c3649f9c62ad3672b3f48fa
+  metadata.gz: dcface399c1ea87448cb225159f1cd72323ff274
+  data.tar.gz: 1922a37e2a189584b513abb10981e130616ee639
 SHA512:
-  metadata.gz: 110890f197774efbd55cbc17e42539dc20df9041ede74e9236e1aea20af48bc5e1e499693366fbb54d4e83bd0d926a05c4cdd11018ce342afb96561bc5500edd
-  data.tar.gz: c083fa550aca7c33a7397a071039c63e08fda7afa47bbceeecfb05af196b8185938c95a5972c78eca7c42327a37f715f8ecd996c088b92ea62dc63d9716e88e1
+  metadata.gz: ec0aeaa2f594b30867c6e75e6441b6e3e3be2ba02e48e80a49b23ce854b269b11bba7ddf0b03449acdbc056ef8f253f62242e2e4a144b73b3b6d8bfdf237ce15
+  data.tar.gz: 87b4dd199974a7b4c5ac10dc95c0e4aa2e276dd18bbaf112f9824800c5d91e1ca452522585cd346d30aacc743de722eb8471ac733f2284d32d28beb4c6f591f6

data/lib/sun_gem/version.rb

@@ -1,3 +1,3 @@
 module SunGem
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/sun_gem.rb

@@ -2,29 +2,34 @@ require "sun_gem/version"
 
 module SunGem
   class << self
-    # REQUIRED_KEYS = %w(access_key kind time)
+    REQUIRED_KEYS = %w(access_key kind time)
     TIMEOUT_MINUTES = 2
 
-    def generate_signature(params)
-      params = params.merge(secret_key: secret_key)
-      Digest::SHA1.hexdigest(convert_params(params).flatten.join)
-    end
+    # def generate_signature(params)
+    #   params = params.merge(secret_key: secret_key)
+    #   Digest::SHA1.hexdigest(convert_params(params).flatten.join)
+    # end
 
-    def secret_key
-      data = YAML.load_file("#{Rails.root}/config/sun_gem.yml")
-      data["secret_key"]
-    end
+    def authenticate(params, optional_params = {})
+      return false, 'invalid_parameter', 400 unless params[:signature]
+      required_params = ActiveSupport::HashWithIndifferentAccess.new(params).slice(*REQUIRED_KEYS)
+      return false, 'invalid_parameter', 400 if required_params.size != REQUIRED_KEYS.size
+      return false, 'expired_signature', 400 if expired_signature?(required_params[:time])
+      return false, 'invalid_server', 401 unless secret_key
 
-    def authenticate(signature, params, optional_params = {})
-      return false, 'expired_signature', 400 if expired_signature?(params[:time])
-      server_signature = Digest::SHA1.hexdigest(convert_params(params.merge(optional_params).merge(secret_key: secret_key)))
-      if signature == server_signature
+      signature = Digest::SHA1.hexdigest(required_params.merge(optional_params).merge(secret_key: secret_key))
+      if signature == params[:signature]
         true
       else
         return false, 'invalid_signature', 400
       end
     end
 
+    def secret_key
+      data = YAML.load_file("#{Rails.root}/config/sun_gem.yml")
+      data["secret_key"]
+    end
+
     private
 
     def expired_signature?(time)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sun_gem
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - frozenapr