skull_island 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aee1d0a664e3a03c0ef1139816708264a40d39a324b7698cec10e5ebe303972
-  data.tar.gz: af415232480d26cce9582d68f9e8384dcf0e8027efb7371ad1f9341a5fbd065c
+  metadata.gz: e8e575e528393418b57488afb653a8baa09afa06f97b88e86fcc7d984fb5bba6
+  data.tar.gz: a6a00f4e7c432fa0cfd77f6cc22b3cbbdc936043d12ac68e337d4500e8bb42d8
 SHA512:
-  metadata.gz: cc1cdf72aee4a83b61284f12da0c80112d7fe66e2ddeeafdaadfe55758228c410a23b3f400e0e3bdb5d2e107f370e2c3766508bc99676f135e7aaefbb30db903
-  data.tar.gz: b119e25b9a1557f5faffb204da95e86a20800dfbe0baec31ecdc816a9d39bd40c795b9010f7c832c1255e6c8cb8266c4cbbb662360b0b1da37a4de9e776c5e58
+  metadata.gz: 892f21ee6b9d43f943cbb562ae72d62e936928acc562752f8d3a7b42c3713a7281408fa401f49eb6c6394d34659131c0288c4c7832c3e5608bb58f67ee040ed3
+  data.tar.gz: 047ce3c0207470966af51a017d71ee23bcfa03fbe0a4371defdc4a1405e697549e519349af71ef5c3a6bcdfc8cc41d85201106d19a672d68e2fcbe8ae5d73fa9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    skull_island (1.2.6)
+    skull_island (1.2.7)
       deepsort (~> 0.4)
       erubi (~> 1.8)
       json (~> 2.1)

data/lib/skull_island/resources/basicauth_credential.rb

@@ -5,10 +5,12 @@ module SkullIsland
   module Resources
     # The BasicauthCredential resource class
     #
-    # @see https://docs.konghq.com/hub/kong-inc/key-auth/ Key-Auth API definition
+    # @see https://docs.konghq.com/hub/kong-inc/basic-auth/ Basic-Auth API definition
     class BasicauthCredential < Resource
+      attr_accessor :hashed_password
+
       property :username, required: true, validate: true
-      property :password, validated: true
+      property :password, validated: true, preprocess: true, postprocess: true
       property(
         :consumer,
         required: true, validate: true, preprocess: true, postprocess: true
@@ -44,6 +46,17 @@ module SkullIsland
         consumer ? "#{consumer.relative_uri}/basic-auth" : nil
       end
 
+      def digest
+        Digest::MD5.hexdigest(
+          if new? && !password.match?(/^hash{.+}$/)
+            hashed_pass = Digest::SHA1.hexdigest((password || '') + consumer.id)
+            "#{username}:hash{#{hashed_pass}}"
+          else
+            "#{username}:#{password}"
+          end
+        )
+      end
+
       def export(options = {})
         hash = { 'username' => username, 'password' => password }
         hash['consumer'] = "<%= lookup :consumer, '#{consumer.username}' %>" if consumer
@@ -56,15 +69,41 @@ module SkullIsland
         hash.reject { |_, value| value.nil? }
       end
 
-      # Keys can't be updated, only created or deleted
+      # Credentials can't be updated, only deleted then created
       def modified_existing?
-        false
+        return false unless new?
+
+        # Find credentials of the same username
+        basic_auths = consumer.credentials['basic-auth']
+        return false unless basic_auths
+
+        same_username = basic_auths.where(:username, username)
+
+        existing = same_username.size == 1 ? same_username.first : nil
+        # Need to destroy the old one then save the new one...
+        existing ? existing.destroy && save : false
       end
 
       def project
         consumer ? consumer.project : nil
       end
 
+      def <=>(other)
+        if id
+          if id < other.id
+            -1
+          elsif id > other.id
+            1
+          elsif id == other.id
+            0
+          else
+            raise Exceptions::InvalidArguments
+          end
+        else
+          digest <=> other.digest
+        end
+      end
+
       private
 
       def postprocess_consumer(value)
@@ -87,6 +126,19 @@ module SkullIsland
         end
       end
 
+      def postprocess_password(value)
+        hashed_password || !new? ? "hash{#{value}}" : value
+      end
+
+      def preprocess_password(input)
+        if input.match?(/^hash{.+}$/)
+          @hashed_password = true
+          input.match(/^hash{(.+)}$/)[1]
+        else
+          input
+        end
+      end
+
       # Used to validate {#consumer} on set
       def validate_consumer(value)
         # allow either a Consumer object or a Hash

data/lib/skull_island/version.rb

@@ -4,6 +4,6 @@ module SkullIsland
   VERSION = [
     1, # Major
     2, # Minor
-    6  # Patch
+    7  # Patch
   ].join('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skull_island
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deepsort