miam 0.2.4.beta6 → 0.2.4.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1c150b030553f7b4eefb432270b89335915eec8
-  data.tar.gz: 39f678345ea0954fa1cc1aa1b31a0d216a077daa
+  metadata.gz: a48f60383843d58e523391cf18996058900b0205
+  data.tar.gz: f05847ff927569a484ed599b9991074a064c8c23
 SHA512:
-  metadata.gz: f9afc6853fada3dd41deff6cbc304a339c56cc6e7b92b940ef69cac3e1a32b79910d9897a8b33c51d29f7c2674cb0809bc94808872ff3696aff70d518c4a207d
-  data.tar.gz: 2545494db13024cc827de64cc57a9f0addf14f8113567f967917ae0197a979e6067573b51614027c2ed269e960b43223829715fecee64cc98a20dcd39e5a17f3
+  metadata.gz: 9f4e17cf7fef45786c8a17bde2baa1d4617222ccaf426d804972d7c101ce671fbccfd99adb2234c6063dd0615a22f5eadff668aab045ea4bcd2499483273fdfb
+  data.tar.gz: e2fbcbb019ac76e637960bb758bc33600683e78810d066ef9f5f11369e0721185343ac2a0b44b5a37e67ed6ac9d8ed8aff89cc1bf523dd07187adf45714f2f75

data/README.md

@@ -22,6 +22,9 @@ It defines the state of IAM using DSL, and updates IAM according to DSL.
   * Sort policy array
 * `>= 0.2.3`
   * Support Custom Managed Policy
+* `>= 0.2.4`
+  * Fix for Password Policy ([RP#22](https://github.com/winebarrel/miam/pull/22))
+  * Fix `--target` option for Policies ([RP#21](https://github.com/winebarrel/miam/pull/21))
 
 ## Installation
 

data/lib/miam/client.rb

@@ -129,7 +129,7 @@ class Miam::Client
     end
 
     if expected_login_profile and not actual_login_profile
-      expected_login_profile[:password] ||= @password_manager.identify(user_name, :login_profile)
+      expected_login_profile[:password] ||= @password_manager.identify(user_name, :login_profile, @driver.password_policy)
       @driver.create_login_profile(user_name, expected_login_profile)
       updated = true
     elsif not expected_login_profile and actual_login_profile
@@ -445,6 +445,7 @@ class Miam::Client
     updated = false
 
     expected.each do |policy_name, expected_attrs|
+      next unless target_matched?(policy_name)
       actual_attrs = actual.delete(policy_name)
 
       if actual_attrs
@@ -479,6 +480,7 @@ class Miam::Client
     updated = false
 
     actual.each do |policy_name, actual_attrs|
+      next unless target_matched?(policy_name)
       @driver.delete_managed_policy(policy_name, actual_attrs[:path])
       updated = true
     end

data/lib/miam/driver.rb

@@ -438,6 +438,14 @@ class Miam::Driver
     end
   end
 
+  def password_policy
+    return @password_policy if instance_variable_defined?(:@password_policy)
+
+    @password_policy = @iam.get_account_password_policy.password_policy
+  rescue Aws::IAM::Errors::NoSuchEntity
+    @password_policy = nil
+  end
+
   private
 
   def encode_document(policy_document)

data/lib/miam/password_manager.rb

@@ -1,13 +1,19 @@
 class Miam::PasswordManager
   include Miam::Logger::Helper
 
+  LOWERCASES = ('a'..'z').to_a
+  UPPERCASES = ('A'..'Z').to_a
+  NUMBERS = ('0'..'9').to_a
+  SYMBOLS = "!@\#$%^&*()_+-=[]{}|'".split(//)
+
   def initialize(output, options = {})
     @output = output
     @options = options
   end
 
-  def identify(user, type)
-    password = mkpasswd
+  def identify(user, type, policy)
+    password = mkpasswd(policy)
+    log(:info, "mkpasswd: #{password}")
     puts_password(user, type, password)
     password
   end
@@ -22,8 +28,21 @@ class Miam::PasswordManager
 
   private
 
-  def mkpasswd(len = 8)
-    [*1..9, *'A'..'Z', *'a'..'z'].shuffle.slice(0, len).join
+  def mkpasswd(policy)
+    chars = []
+    len = 8
+
+    if policy
+      len = policy.minimum_password_length if policy.minimum_password_length > len
+      chars << LOWERCASES.shuffle.first if policy.require_lowercase_characters
+      chars << UPPERCASES.shuffle.first if policy.require_uppercase_characters
+      chars << NUMBERS.shuffle.first if policy.require_numbers
+      chars << SYMBOLS.shuffle.first if policy.require_symbols
+
+      len -= chars.length
+    end
+
+    (chars + [*1..9, *'A'..'Z', *'a'..'z'].shuffle.slice(0, len)).shuffle.join
   end
 
   def open_output

data/lib/miam/version.rb

@@ -1,3 +1,3 @@
 module Miam
-  VERSION = '0.2.4.beta6'
+  VERSION = '0.2.4.beta7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miam
 version: !ruby/object:Gem::Version
-  version: 0.2.4.beta6
+  version: 0.2.4.beta7
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core