certman 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fb0672b4747cfec0f8607cd81af9f9bdb06b50b
-  data.tar.gz: 1ac80795546083e8f5f1250016a0e4b0c33e8d6a
+  metadata.gz: de87e6045fb8c57ca1901d8a4873bc98f9708f47
+  data.tar.gz: 996d68620862ad5dcefeba152bf1a951869289a1
 SHA512:
-  metadata.gz: c52b0049736f4d17baf9e678eb08b5d14c4d3e6d8a007f5178fa5b296b8040c51c02ec5d5475de981795e51b155290333e47eec25ebe295e0be272ff8d0dbaeb
-  data.tar.gz: d23a89e90b39181aa0561e460ff1e45cfa018fe7826ac036361a97538436e1a37e4afb73deee0c2a3f793cc36bd41d954802a733e35f84907e7dadea2bbc113b
+  metadata.gz: 783c5f0b05da2cf4abaaa8019a4a0cca53a3431eb52b7b1d1439c26cef96089510045c77c758855b2f02187456ebddc581f4b4f37e93963a0f812348c3147b83
+  data.tar.gz: 848c27576f51f0757aea1f374a722206dac7d059145288f8966aadfeabab872c7cfaf7d34d9a68b53fb82f891bf67278d2f9495e73a4692c00bdd185e52d75c0

data/lib/certman/cli.rb

@@ -1,21 +1,23 @@
 module Certman
   class CLI < Thor
     desc 'request [DOMAIN]', 'Request ACM Certificate with only AWS managed services'
-    option :remain_resources, type: :boolean
+    option :remain_resources, type: :boolean, default: false
+    option :hosted_zone, type: :string
     def request(domain)
       pastel = Pastel.new
       prompt = TTY::Prompt.new
       return unless prompt.yes?(pastel.red("NOTICE! Your selected region is *#{Aws.config[:region]}*. \
 Certman create certificate on *#{Aws.config[:region]}*. OK?"))
-      client = Certman::Client.new(domain)
+      client = Certman::Client.new(domain, options)
       return unless prompt.yes?(pastel.red("NOTICE! Certman use *#{client.region_by_hash}* S3/SES. OK?"))
-      return unless prompt.yes?(pastel.red('NOTICE! When requesting, Certman replace Active Receipt Rule Set. OK?'))
+      return unless prompt.yes?(pastel.red("NOTICE! When requesting, Certman apend Receipt Rule to current Active \
+Receipt Rule Set. OK?"))
       Signal.trap(:INT) do
         puts ''
         puts pastel.red('Rollback start.')
         client.rollback
       end
-      cert_arn = client.request(options[:remain_resources])
+      cert_arn = client.request
       puts 'Done.'
       puts ''
       puts "certificate_arn: #{pastel.cyan(cert_arn)}"

data/lib/certman/client.rb

@@ -6,15 +6,18 @@ module Certman
     include Certman::Resource::Route53
     include Certman::Resource::ACM
 
-    def initialize(domain)
+    def initialize(domain, options)
       @do_rollback = false
       @cname_exists = false
       @domain = domain
       @cert_arn = nil
       @savepoint = []
+      @remain_resources = options[:remain_resources]
+      @hosted_zone_domain = options[:hosted_zone]
+      @hosted_zone_domain.sub(/\.\z/, '') unless @hosted_zone_domain.nil?
     end
 
-    def request(remain_resources = false)
+    def request
       check_resource
 
       enforce_region_by_hash do
@@ -60,7 +63,7 @@ module Certman
         end
       end
 
-      cleanup_resources if !remain_resources || @do_rollback
+      cleanup_resources if !@remain_resources || @do_rollback
 
       @cert_arn
     end
@@ -79,7 +82,7 @@ module Certman
       s.success
 
       s = spinner('[Route53] Check Hosted Zone')
-      raise "Hosted Zone #{root_domain} does not exist" unless hosted_zone_exist?
+      raise "Hosted Zone #{hosted_zone_domain} does not exist" unless hosted_zone_exist?
       s.success
 
       s = spinner('[Route53] Check TXT Record')
@@ -90,7 +93,7 @@ module Certman
         s = spinner('[Route53] Check MX Record')
         raise "#{email_domain} MX already exist" if mx_rset_exist?
         if cname_rset_exist?
-          puts pastel.cyan("\n#{email_domain} CNAME already exist. Use #{root_domain}")
+          puts pastel.cyan("\n#{email_domain} CNAME already exist. Use #{hosted_zone_domain}")
           @cname_exists = true
           check_resource
         end
@@ -197,17 +200,22 @@ module Certman
                        end
     end
 
+    def hosted_zone_domain
+      return @hosted_zone_domain if @hosted_zone_domain
+      root_domain
+    end
+
     def root_domain
       PublicSuffix.domain(@domain)
     end
 
     def email_domain
-      return root_domain if @cname_exists
+      return hosted_zone_domain if @cname_exists
       @domain.sub(/\A(www|\*)\./, '')
     end
 
     def validation_domain
-      return root_domain if @cname_exists
+      return hosted_zone_domain if @cname_exists
       @domain
     end
 

data/lib/certman/resource/route53.rb

@@ -4,7 +4,7 @@ module Certman
     module Route53
       def create_txt_rset
         @hosted_zone = route53.list_hosted_zones.hosted_zones.find do |zone|
-          PublicSuffix.domain(zone.name) == root_domain
+          zone.name == "#{hosted_zone_domain}."
         end
         route53.change_resource_record_sets(
           change_batch: {
@@ -104,7 +104,7 @@ module Certman
       def hosted_zone_exist?
         @hosted_zone_id = nil
         hosted_zone = route53.list_hosted_zones.hosted_zones.find do |zone|
-          if PublicSuffix.domain(zone.name) == root_domain
+          if zone.name == "#{hosted_zone_domain}."
             @hosted_zone_id = zone.id
             next true
           end

data/lib/certman/resource/s3.rb

@@ -45,7 +45,7 @@ EOF
           sleep 60
           s3.list_objects(bucket: bucket_name).contents.map do |object|
             res = s3.get_object(bucket: bucket_name, key: object.key)
-            res.body.read.match(%r{https://certificates\.amazon\.com/approvals[^\s]+}) do |md|
+            res.body.read.match(%r{https://[^\s]*certificates\.amazon\.com/approvals[^\s]+}) do |md|
               cert_uri = md[0]
               handle = open(cert_uri)
               document = Oga.parse_html(handle)
@@ -53,7 +53,8 @@ EOF
               document.css('form input').each do |input|
                 data[input.get('name')] = input.get('value')
               end
-              res = Net::HTTP.post_form(URI.parse('https://certificates.amazon.com/approvals'), data)
+              post_uri = cert_uri.sub(/\?.*/, '')
+              res = Net::HTTP.post_form(URI.parse(post_uri), data)
               raise 'Can not approve' unless res.body =~ /Success/
               # success
               is_break = true

data/lib/certman/version.rb

@@ -1,3 +1,3 @@
 module Certman
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: certman
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk