knife-ec2 1.0.18 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0efb7449ec88881f143653d3bb282ca3d0e4e682773487cd17c4943e6631b9
-  data.tar.gz: c89dfbbbb331f2258af0797273a58e77f13a321d62b17ec58346f07139fb27a9
+  metadata.gz: b6444d46c88ab7fe3b303af2b9cb993633791d89d98a53690658ca5932825d29
+  data.tar.gz: 00321d501e212ec768eb08357645d740f33abea1cd0b63c31e6fc2e9f7ab80dd
 SHA512:
-  metadata.gz: 19f0cfcf4ced0fadfc2763cab088c15faa743f932f334fd8ffdd869c011284b32e281576cfaa3195e1a6b4fd97f7cf28bd29f1142b5983e8fba33ad7ed707830
-  data.tar.gz: ba73cea8ba3d9baed0553ed7dca881e3b4756b8324015a99672937e0cbb7ba4dc0c00412200ffb21db61a15ec1090dbc5b9d1d9d49a197289c9dfcaef58585ba
+  metadata.gz: 703b96ddffb5e8a282d37b6e730dbea8872d2fa9792d097e1315f6cfffea42ef14c6b87cda9b06089263f5a184f22f509c3e68783e30906cdc2fe74ac7c28279
+  data.tar.gz: 278c42337c36b0dd30e3d5a7bfcd7a9976573545a6673bdea928197f1b27513f77a8e06d893492217c5f36ea05e8fd8d913f763a8b2d0ad38d40b404491fda63

data/lib/chef/knife/ec2_base.rb

@@ -88,7 +88,8 @@ class Chef
             Chef::Log.debug "Using iam profile for authentication as use_iam_profile set"
             Aws::InstanceProfileCredentials.new
           else
-            Chef::Log.debug "Setting up AWS connection using aws_access_key_id #{locate_config_value(:aws_access_key_id)} aws_secret_access_key: #{locate_config_value(:aws_secret_access_key)} aws_session_token: #{locate_config_value(:aws_session_token)}"
+            Chef::Log.debug "Setting up AWS connection using aws_access_key_id: #{mask(locate_config_value(:aws_access_key_id))} aws_secret_access_key: #{mask(locate_config_value(:aws_secret_access_key))} aws_session_token: #{mask(locate_config_value(:aws_session_token))}"
+
             Aws::Credentials.new(locate_config_value(:aws_access_key_id), locate_config_value(:aws_secret_access_key), locate_config_value(:aws_session_token))
           end
         conn
@@ -343,5 +344,16 @@ class Chef
         raise ArgumentError, "The provided --aws-profile '#{profile}' is invalid. Does the credential file at '#{aws_cred_file_location}' contain this profile?"
       end
     end
+
+    # Mask the given string with char `X`
+    # Discard the chars based on from value
+    def mask(key, from = 4)
+      str = key.dup
+      if str && str.length > from
+        str[from...str.length] = "X" * (str[from...str.length].length)
+      end
+
+      str
+    end
   end
 end

data/lib/chef/knife/ec2_server_create.rb

@@ -717,15 +717,11 @@ class Chef
           exit 1
         end
 
-        if winrm? && config_value(:connection_password).to_s.length > 14
-          ui.warn("The password provided is longer than 14 characters. Computers with Windows prior to Windows 2000 will not be able to use this account. Do you want to continue this operation? (Y/N):")
-          password_promt = STDIN.gets.chomp.upcase
-          if password_promt == "N"
-            raise "Exiting as operation with password greater than 14 characters not accepted"
-          elsif password_promt == "Y"
-            @allow_long_password = "/yes"
-          else
-            raise "The input provided is incorrect."
+        if winrm?
+          reg = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,40}$/
+          unless config_value(:connection_password) =~ reg
+            ui.error("Complexity requirements are not met. Password length should be 8-40 characters and include: 1 uppercase, 1 lowercase, 1 digit, and 1 special character")
+            exit 1
           end
         end
 
@@ -891,7 +887,6 @@ class Chef
         attributes[:placement][:tenancy] = "dedicated" if vpc_mode? && config_value(:dedicated_instance)
         attributes[:iam_instance_profile] = {}
         attributes[:iam_instance_profile][:name] = config_value(:iam_instance_profile)
-
         if config_value(:winrm_ssl)
           if config_value(:aws_user_data)
             begin
@@ -919,7 +914,6 @@ class Chef
             end
           end
         end
-
         attributes[:ebs_optimized] = !!config_value(:ebs_optimized)
 
         if ami.root_device_type == "ebs"

data/lib/knife-ec2/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Ec2
-    VERSION = "1.0.18".freeze
+    VERSION = "1.0.20".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec2
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.20
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2019-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef