miam 0.2.3 → 0.2.4.beta13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb232253b3506a0387caa0817c099a76b0d5ec5f
-  data.tar.gz: e10d873066aef538049bb703bf2977064c1ab586
+  metadata.gz: fe395ae5401dc9c0d6b887223e4b429b8986a2d6
+  data.tar.gz: 216469fe12254fcb6b20e9056671264108dcc8ca
 SHA512:
-  metadata.gz: d07415f6abcf2efa6d0572bf61302ee6d5334cc76f2a7739dbde62cf8b3b0cc0ceece4cf9613bbcc66776e0ad3758bfb5cf75196a286cfe47d95de467f02fa33
-  data.tar.gz: eb2ecd520a5d43173249082dfdb29dd0b31fa36acc254cb356a57b04d9dd2befc4caaae70f4a7376189ffda32395b425195f7f014c0f223501dc1ac96d324f9b
+  metadata.gz: 99da60b8cc85a0dcf2dd33f3cc0b46126ee194e4b9971c1d04b1c22318810756b3aa086c70d8bb690d6e6a75ae6938bd5618e75f46ee22ace4c5dd32389e7565
+  data.tar.gz: 1eb6f151d7f25ef4a3e31245d4909b788525f8e6ddd816ad346461398a4618e6295334a71bc11260217599049e8003a7adca09d1456e32477cc747f03b9c0f99

data/.rspec

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

data/.travis.yml

@@ -1,12 +1,14 @@
 sudo: false
 language: ruby
+cache: bundler
 rvm:
-- 2.0.0
+- 2.3.4
 script:
 - bundle install
-- bundle exec rake
+- travis_wait 60 bundle exec rake
 env:
   global:
-  - secure: "Ec8bwSfp06anSzLJpGhkKjPz9EocMwl7H8t2LKoI3bKV/cz9JU0GhhUdUUmg3mCFH9+8/YGLzcbFKcxZIqnDK7ukdgTGsnGDevnctis0QwM7/nKHdkaK8JWhCx41TUXOqoiCKkNEnm1EbDtrILt4rJwb0BGXGnPjv6nLAyvdE2Y="
-  - secure: "Ky5Dpxc7SIqbQ4Y10m/jik/rVdeGMeh1439m3KB+tiV/Bz1hhWv4+If150ajLjbmWCZBPMLhxrTL0EePoyqYXpOGHvINvYM+/XCPcpP4iYkaTzr1MVIOMpa8A8aAOOgQWoGOwfyWoxfrYzv/TRvtMietnm+dZwVcbbkQ4ut7oa4="
+  - secure: c5kyaYSGrKMg3bsVMCnIYe2w/3jJ4rxkoIwM06YGLmw5lPW0twWgpwpuBsGf6WKvDLv0eQjGq3B0I1DqHmdYHq4dQ+PdsvWg0kQUpzWpKD2ccVXevyPeDs5pC1UcLtDUpRk0Rv1Hpo4v5kiT2zsmLx29Z6F4n7agtzqK5Q2vdPs=
+  - secure: ipdvAzZ5EwTQui8CyINqRYLFNNe4ZyZP617xEmUS3YalhRMOEZ+NSq7BlqliE4IJPg8YlQjT5q35xFtREIr/KYS1tmU1/nFA68GC/9T+uJAsc3LSmUoYMn8Ot3654u1SjlZ86benyToZ2MgHglmHigS46SOoxBpqHrKMUW9RUz0=
   - AWS_REGION=ap-northeast-1
+  - APPLY_WAIT=10

data/README.md

@@ -5,7 +5,7 @@ Miam is a tool to manage IAM.
 It defines the state of IAM using DSL, and updates IAM according to DSL.
 
 [![Gem Version](https://badge.fury.io/rb/miam.svg)](http://badge.fury.io/rb/miam)
-[![Build Status](https://travis-ci.org/winebarrel/miam.svg?branch=master)](https://travis-ci.org/winebarrel/miam)
+[![Build Status](https://travis-ci.org/codenize-tools/miam.svg?branch=master)](https://travis-ci.org/codenize-tools/miam)
 [![Coverage Status](https://coveralls.io/repos/winebarrel/miam/badge.svg?branch=master&service=github)](https://coveralls.io/github/winebarrel/miam?branch=master)
 
 **Notice**
@@ -22,6 +22,12 @@ 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))
+  * Fix for `Rate exceeded` ([PR#23](https://github.com/winebarrel/miam/pull/23))
+  * Fix for non-User credentials  ([PR#17](https://github.com/winebarrel/miam/pull/17))
+  * Add `--exclude` option
 
 ## Installation
 
@@ -71,6 +77,7 @@ Usage: miam [options]
         --format=FORMAT
         --export-concurrency N
         --target REGEXP
+        --exclude REGEXP
         --ignore-login-profile
         --no-color
         --no-progress

data/bin/miam

@@ -52,6 +52,7 @@ ARGV.options do |opt|
     opt.on('',   '--format=FORMAT', [:ruby, :json]) {|v| format_passed = true; options[:format] = v                             }
     opt.on(''  , '--export-concurrency N', Integer) {|v| options[:export_concurrency]   = v                                     }
     opt.on(''  , '--target REGEXP')                 {|v| options[:target]               = Regexp.new(v)                         }
+    opt.on(''  , '--exclude REGEXP')                {|v| options[:exclude]              = Regexp.new(v)                         }
     opt.on(''  , '--ignore-login-profile')          {    options[:ignore_login_profile] = true                                  }
     opt.on(''  , '--no-color')                      {    options[:color]                = false                                 }
     opt.on(''  , '--no-progress')                   {    options[:no_progress]          = true                                  }

data/lib/miam/client.rb

@@ -5,7 +5,8 @@ class Miam::Client
     @options = {:format => :ruby}.merge(options)
     aws_config = options.delete(:aws_config) || {}
     @iam = Aws::IAM::Client.new(aws_config)
-    @driver = Miam::Driver.new(@iam, options)
+    @sts = Aws::STS::Client.new(aws_config)
+    @driver = Miam::Driver.new(@iam, @sts, options)
     @password_manager = options[:password_manager] || Miam::PasswordManager.new('-', options)
   end
 
@@ -129,7 +130,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
@@ -137,7 +138,7 @@ class Miam::Client
       updated = true
     elsif expected_login_profile != actual_login_profile
       if @options[:ignore_login_profile]
-        log(:warn, "User `#{user_name}`: difference of loging profile has been ignored: expected=#{expected_login_profile.inspect}, actual=#{actual_login_profile.inspect}", :color => :yellow)
+        log(:warn, "User `#{user_name}`: difference of login profile has been ignored: expected=#{expected_login_profile.inspect}, actual=#{actual_login_profile.inspect}", :color => :yellow)
       else
         @driver.update_login_profile(user_name, expected_login_profile, actual_login_profile)
         updated = true
@@ -265,6 +266,22 @@ class Miam::Client
     expected_assume_role_policy.sort_array!
     actual_assume_role_policy.sort_array!
 
+    # With only one entity granted
+    # On IAM
+    #   (1) Statement => [ { Principal => AWS => arn } ]
+    # Should be able to specify like:
+    #   (2) Statement => [ { Principal => AWS => [arn] } ]
+    # Actually (1) is reflected when config (2) is applied
+    expected_arp_stmt = expected_assume_role_policy.fetch('Statement', [])
+    expected_arp_stmt = expected_arp_stmt.select {|i| i.key?('Principal') }
+
+    expected_arp_stmt.each do |stmt|
+      stmt['Principal'].each do |k, v|
+        entities = Array(v)
+        stmt['Principal'][k] = entities.first if entities.length < 2
+      end
+    end
+
     if expected_assume_role_policy != actual_assume_role_policy
       @driver.update_assume_role_policy(role_name, expected_assume_role_policy, actual_assume_role_policy)
       updated = true
@@ -445,6 +462,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 +470,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 +480,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 +497,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
 
@@ -505,11 +524,17 @@ class Miam::Client
   end
 
   def target_matched?(name)
+    result = true
+
+    if @options[:exclude]
+      result &&= name !~ @options[:exclude]
+    end
+
     if @options[:target]
-      name =~ @options[:target]
-    else
-      true
+      result &&= name =~ @options[:target]
     end
+
+    result
   end
 
   def exec_by_format(proc_by_format)

data/lib/miam/driver.rb

@@ -4,9 +4,11 @@ class Miam::Driver
   MAX_POLICY_SIZE = 2048
   MAX_POLICY_VERSIONS = 5
 
-  def initialize(iam, options = {})
+  def initialize(iam, sts, options = {})
     @iam = iam
+    @sts = sts
     @options = options
+    @account_id = nil
   end
 
   def create_user(user_name, attrs)
@@ -67,6 +69,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 +387,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 +400,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 +427,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 +473,13 @@ 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
+    # http://docs.aws.amazon.com/STS/latest/APIReference/API_GetCallerIdentity.html
+    @account_id ||= @sts.get_caller_identity.account
   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/dsl/converter.rb

@@ -193,10 +193,16 @@ end
   end
 
   def target_matched?(name)
+    result = true
+
+    if @options[:exclude]
+      result &&= name !~ @options[:exclude]
+    end
+
     if @options[:target]
-      name =~ @options[:target]
-    else
-      true
+      result &&= name =~ @options[:target]
     end
+
+    result
   end
 end

data/lib/miam/exporter.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 class Miam::Exporter
   AWS_MANAGED_POLICY_PREFIX = 'arn:aws:iam::aws:'
+  AWS_CN_MANAGED_POLICY_PREFIX = 'arn:aws-cn:iam::aws:'
 
   def self.export(iam, options = {})
     self.new(iam, options).export
@@ -200,7 +201,7 @@ class Miam::Exporter
     result = {}
 
     Parallel.each(policies, :in_threads => @concurrency) do |policy|
-      if policy.arn.start_with?(AWS_MANAGED_POLICY_PREFIX)
+      if policy.arn.start_with?(AWS_MANAGED_POLICY_PREFIX) or policy.arn.start_with?(AWS_CN_MANAGED_POLICY_PREFIX)
         next
       end
 
@@ -262,10 +263,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(:debug, "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.beta13'
 end

data/miam.gemspec

@@ -8,11 +8,9 @@ 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/'
+  spec.homepage      = 'https://github.com/codenize-tools/miam'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -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

data/spec/spec_helper.rb

@@ -70,11 +70,13 @@ def apply(cli = client)
   tempfile(yield) do |f|
     begin
       cli.apply(f.path)
-    rescue Aws::IAM::Errors::EntityTemporarilyUnmodifiable
+    rescue Aws::IAM::Errors::EntityTemporarilyUnmodifiable, Aws::IAM::Errors::Throttling, Aws::IAM::Errors::NoSuchEntity
       sleep 3
       retry
     end
   end
+
+  sleep ENV['APPLY_WAIT'].to_i
 end
 
 def export(options = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miam
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4.beta13
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2017-07-18 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:
@@ -209,7 +223,7 @@ files:
 - spec/miam/rename_spec.rb
 - spec/miam/update_spec.rb
 - spec/spec_helper.rb
-homepage: http://miam.codenize.tools/
+homepage: https://github.com/codenize-tools/miam
 licenses:
 - MIT
 metadata: {}
@@ -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.6.12
 signing_key: 
 specification_version: 4
 summary: Miam is a tool to manage IAM.