miam 0.2.3 → 0.2.4.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb232253b3506a0387caa0817c099a76b0d5ec5f
-  data.tar.gz: e10d873066aef538049bb703bf2977064c1ab586
+  metadata.gz: db416d15e77789e9842a5961c0fd9a0ddf37520c
+  data.tar.gz: 8518f5af7bfd066ffb3c50099efeac19ec93871a
 SHA512:
-  metadata.gz: d07415f6abcf2efa6d0572bf61302ee6d5334cc76f2a7739dbde62cf8b3b0cc0ceece4cf9613bbcc66776e0ad3758bfb5cf75196a286cfe47d95de467f02fa33
-  data.tar.gz: eb2ecd520a5d43173249082dfdb29dd0b31fa36acc254cb356a57b04d9dd2befc4caaae70f4a7376189ffda32395b425195f7f014c0f223501dc1ac96d324f9b
+  metadata.gz: c308c609a2498a1f7e3c9d4ff231d9a419864c791d2c4aae0d7d98f5273e7c43c23522de2ec5b2bf70e66b905c4ed6ab60af0b15a13ec24632b630c47f14ae06
+  data.tar.gz: 09e1f6e04a5edb027e443dde184e4c77f8ad16772afc867bbf74ca143cd02c479e43f99c1a0fc9d8fe43f9a6e83ee63cbd813d38e63b6c2086829577427904b8

data/.rspec

@@ -1,4 +1,5 @@
 --require rspec/instafail
---format RSpec::Instafail
+--format documentation
+#RSpec::Instafail
 --colour
 --require spec_helper

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
 - 2.0.0
 script:
 - bundle install
-- bundle exec rake
+- travis_wait bundle exec rake
 env:
   global:
   - secure: "Ec8bwSfp06anSzLJpGhkKjPz9EocMwl7H8t2LKoI3bKV/cz9JU0GhhUdUUmg3mCFH9+8/YGLzcbFKcxZIqnDK7ukdgTGsnGDevnctis0QwM7/nKHdkaK8JWhCx41TUXOqoiCKkNEnm1EbDtrILt4rJwb0BGXGnPjv6nLAyvdE2Y="

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
@@ -452,7 +453,7 @@ class Miam::Client
           log(:warn, "ManagedPolicy `#{policy_name}`: 'path' cannot be updated", :color => :yellow)
         end
 
-        updated = walk_managed_policy(policy_name, expected_attrs[:document], actual_attrs[:document]) || updated
+        updated = walk_managed_policy(policy_name, actual_attrs[:path], expected_attrs[:document], actual_attrs[:document]) || updated
       else
         @driver.create_managed_policy(policy_name, expected_attrs)
         updated = true
@@ -462,13 +463,13 @@ class Miam::Client
     updated
   end
 
-  def walk_managed_policy(policy_name, expected_document, actual_document)
+  def walk_managed_policy(policy_name, policy_path, expected_document, actual_document)
     updated = false
     expected_document.sort_array!
     actual_document.sort_array!
 
     if expected_document != actual_document
-      @driver.update_managed_policy(policy_name, expected_document, actual_document)
+      @driver.update_managed_policy(policy_name, policy_path, expected_document, actual_document)
       updated = true
     end
 
@@ -479,7 +480,8 @@ class Miam::Client
     updated = false
 
     actual.each do |policy_name, actual_attrs|
-      @driver.delete_managed_policy(policy_name)
+      next unless target_matched?(policy_name)
+      @driver.delete_managed_policy(policy_name, actual_attrs[:path])
       updated = true
     end
 

data/lib/miam/driver.rb

@@ -67,6 +67,14 @@ class Miam::Driver
         @iam.delete_signing_certificate(:user_name => user_name, :certificate_id => certificate_id)
       end
 
+      mfa_devices = @iam.list_mfa_devices(:user_name => user_name).map {|resp|
+        resp.mfa_devices
+      }.flatten
+
+      mfa_devices.each do |md|
+        @iam.deactivate_mfa_device(:user_name => user_name, :serial_number => md.serial_number)
+      end
+
       @iam.delete_user(:user_name => user_name)
     end
   end
@@ -377,12 +385,12 @@ class Miam::Driver
     end
   end
 
-  def delete_managed_policy(policy_name)
+  def delete_managed_policy(policy_name, policy_path)
     log(:info, "Delete ManagedPolicy `#{policy_name}`", :color => :red)
 
     unless_dry_run do
       policy_versions = @iam.list_policy_versions(
-        :policy_arn => policy_arn(policy_name),
+        :policy_arn => policy_arn(policy_name, policy_path),
         :max_items => MAX_POLICY_VERSIONS
       )
 
@@ -390,24 +398,24 @@ class Miam::Driver
         pv.is_default_version
       }.each {|pv|
         @iam.delete_policy_version(
-          :policy_arn => policy_arn(policy_name),
+          :policy_arn => policy_arn(policy_name, policy_path),
           :version_id => pv.version_id
         )
       }
 
       @iam.delete_policy(
-        :policy_arn => policy_arn(policy_name)
+        :policy_arn => policy_arn(policy_name, policy_path)
       )
     end
   end
 
-  def update_managed_policy(policy_name, policy_document, old_policy_document)
+  def update_managed_policy(policy_name, policy_path, policy_document, old_policy_document)
     log(:info, "Update ManagedPolicy `#{policy_name}`", :color => :green)
     log(:info, Miam::Utils.diff(old_policy_document, policy_document, :color => @options[:color]), :color => false)
 
     unless_dry_run do
       policy_versions = @iam.list_policy_versions(
-        :policy_arn => policy_arn(policy_name),
+        :policy_arn => policy_arn(policy_name, policy_path),
         :max_items => MAX_POLICY_VERSIONS
       )
 
@@ -417,19 +425,27 @@ class Miam::Driver
         }.sort_by {|pv| pv.version_id[1..-1].to_i }.first
 
         @iam.delete_policy_version(
-          :policy_arn => policy_arn(policy_name),
+          :policy_arn => policy_arn(policy_name, policy_path),
           :version_id => delete_policy_version.version_id
         )
       end
 
       @iam.create_policy_version(
-        :policy_arn => policy_arn(policy_name),
+        :policy_arn => policy_arn(policy_name, policy_path),
         :policy_document => encode_document(policy_document),
         set_as_default: true
       )
     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)
@@ -455,11 +471,12 @@ class Miam::Driver
     yield unless @options[:dry_run]
   end
 
-  def user_id
-    @user_id ||= @iam.get_user.user.user_id
+  def account_id
+    # https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html
+    @account_id ||= @iam.get_user.user.arn.split(':').fetch(4)
   end
 
-  def policy_arn(policy_name)
-    "arn:aws:iam::#{user_id}:policy/#{policy_name}"
+  def policy_arn(policy_name, policy_path)
+    File.join("arn:aws:iam::#{account_id}:policy", policy_path, policy_name)
   end
 end

data/lib/miam/exporter.rb

@@ -262,10 +262,10 @@ class Miam::Exporter
     @iam.get_account_authorization_details.each do |resp|
       keys.each do |key|
         account_authorization_details[key].concat(resp[key])
+      end
 
-        unless @options[:no_progress]
-          progressbar.increment
-        end
+      unless @options[:no_progress]
+        progressbar.increment
       end
     end
 

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.3'
+  VERSION = '0.2.4.beta8'
 end

data/miam.gemspec

@@ -8,8 +8,6 @@ Gem::Specification.new do |spec|
   spec.version       = Miam::VERSION
   spec.authors       = ['Genki Sugawara']
   spec.email         = ['sgwr_dts@yahoo.co.jp']
-  spec.summary       = %q{TODO: Write a short summary. Required.}
-  spec.description   = %q{TODO: Write a longer description. Optional.}
   spec.summary       = %q{Miam is a tool to manage IAM.}
   spec.description   = %q{Miam is a tool to manage IAM. It defines the state of IAM using DSL, and updates IAM according to DSL.}
   spec.homepage      = 'http://miam.codenize.tools/'
@@ -31,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'rspec-instafail'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'nokogiri'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miam
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4.beta8
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Miam is a tool to manage IAM. It defines the state of IAM using DSL,
   and updates IAM according to DSL.
 email:
@@ -224,12 +238,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Miam is a tool to manage IAM.