amarillo 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dbdaceaf0eac001e1d7cb1ba63058ce2cee3e81be2c61d08378c3db7db562ae
-  data.tar.gz: b1afafa36c49e473a09bb56de32c354a668516e7fd71ec8770b38b681777c825
+  metadata.gz: c4e3236346294475f1a163d18a26c6802d203f7fb9d9feb47c24f90ef117e2fb
+  data.tar.gz: c02964b63238765fd4eacc43d61fb7c6aae1aa256374c447efa429d99d4816dd
 SHA512:
-  metadata.gz: d19987aa6a9c84b92411fc5f5fa99102e9bd0f3abb8fcfb3dcacd8f28bc39a7806a28e932d7e39463680ca1281b701ad30b9a44e54c786918795f12d909d4e10
-  data.tar.gz: 2eef894b6c9ed756249684f31f2b4392ef2a79bd5c281858b64c9615f19bdabe91a46f43cf480fe9e9ff429c1cacc173f6d98b89916ffc21bc82f633906a675f
+  metadata.gz: e8f1b4dbb46b7c28c3ba1f800e6b625351887e46212bd5dc34ea345ab993b9b4ddb58d664fd4a6504104f101a94cdf3a5e782d5100429e0c124efeaa277c7da7
+  data.tar.gz: 3905e62aae46c7238416fbd60ce58afca677b05b146a3391170dcd99610cc2d086eedfc1972c6355035db49a7193b16a87d8dbd87023ab659329c4b3fdd00012

data/bin/amarillo

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # 
-# Copyright 2021 iAchieved.it LLC
+# Copyright 2022 iAchieved.it LLC
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -55,6 +55,10 @@ OptionParser.new do |opts|
     options[:name] = n
   end
 
+  opts.on("-k", "--keytype KEYTYPE", "Valid key types:  ") do |k|
+    options[:keytype] = k
+  end
+
   opts.on("-a", "--amarillo-home AMARILLO_HOME", "Home directory for configuration, keys, and certificates") do |o|
     options[:amarillo_home] = a
   end
@@ -125,7 +129,7 @@ elsif options[:list] then
 elsif options[:delete] then
   y.deleteCertificate name
 else
-  y.requestCertificate zone, name, email, nil
+  y.requestCertificate zone, name, email, options[:keytype]
 end
 
 

data/lib/amarillo.rb

@@ -139,6 +139,11 @@ class Amarillo
 
     @route53.change_resource_record_sets(options)
 
+    at_exit do 
+      self.cleanup label, record_type, challengeValue
+    end
+
+
     nameservers = @environment.get_zone_nameservers
 
     @logger.info "Waiting for DNS record to propagate"
@@ -178,16 +183,22 @@ class Amarillo
     if type == 'ec' then
       certPrivateKey = OpenSSL::PKey::EC.new(args).generate_key
     elsif type == 'rsa' then
-      certPrivateKey = OpenSSL::PKey::RSA.new(args)
+      if args.to_i > 0
+        certPrivateKey = OpenSSL::PKey::RSA.new(args.to_i)
+      else
+        @logger.error("Invalid RSA key size:  #{args}")
+      end 
     end
 
     @logger.info "Requesting certificate..."  
     csr = Acme::Client::CertificateRequest.new private_key: certPrivateKey, 
                                                names: [commonName]
 
-    while order.status == 'processing'
+    while order.status != 'ready'
       sleep(1)
+      @logger.info "Order status:  #{order.status}"
       order.reload
+      raise if order.status == 'invalid'
     end
 
     @logger.info "Order status:  #{order.status}"
@@ -196,7 +207,7 @@ class Amarillo
       order.finalize(csr: csr)
     rescue
       @logger.error("Error finalizing certificate order")
-      self.cleanup label, record_type, challengeValue
+      raise 
     end
 
     keyOutputPath =  "#{@keyPath}/#{commonName}.key"
@@ -218,8 +229,6 @@ class Amarillo
     certConfigFile = "#{@configsPath}/#{commonName}.yml"
     File.write(certConfigFile, certConfig.to_yaml)
 
-    self.cleanup label, record_type, challengeValue
-
   end
 
   def cleanup(label, record_type, challengeValue)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amarillo
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - iAchieved.it LLC
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement