amarillo 0.2.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b53b0e0803cc4bd89185cbfc67aeb3d468ab7f34988073d7c405f6e88f38e6fe
-  data.tar.gz: ef2b8ec288bae0acd3924aa61ded5ccde2f9915bb15ec664316693641d4391e8
+  metadata.gz: 2dbdaceaf0eac001e1d7cb1ba63058ce2cee3e81be2c61d08378c3db7db562ae
+  data.tar.gz: b1afafa36c49e473a09bb56de32c354a668516e7fd71ec8770b38b681777c825
 SHA512:
-  metadata.gz: 16eb56677f677b3b752de0af6e1b67dc6495b01a494e84e8c935ea19db84f3b16a2bf71cbc67893025388b4289b39d9ebf84f86b2e81b0abf0742c7707bd2e33
-  data.tar.gz: 94af28ad358c6313fa4a43c00b0b31fc9f01d577556c90e8bf49c9396c06946c7d689abdd6fcd826b558fbcf74b3767b93c183055c2db7514510369033a8c1f6
+  metadata.gz: d19987aa6a9c84b92411fc5f5fa99102e9bd0f3abb8fcfb3dcacd8f28bc39a7806a28e932d7e39463680ca1281b701ad30b9a44e54c786918795f12d909d4e10
+  data.tar.gz: 2eef894b6c9ed756249684f31f2b4392ef2a79bd5c281858b64c9615f19bdabe91a46f43cf480fe9e9ff429c1cacc173f6d98b89916ffc21bc82f633906a675f

data/bin/amarillo

@@ -29,7 +29,15 @@ options = {}
 OptionParser.new do |opts|
   opts.on("-i", "--initialize", "Initialize amarillo defaults") do |i|
     options[:initialize] = i
-  end 
+  end
+
+  opts.on("-l", "--list", "List certificates") do |l|
+    options[:list] = l
+  end
+
+  opts.on("-d", "--delete", "Delete certificate") do |d|
+    options[:delete] = d
+  end
 
   opts.on("-r", "--renew", "Renew certificates") do |r|
     options[:renew] = r
@@ -95,9 +103,9 @@ else
   email = options[:email]
 end
 
-if options[:name].nil? and options[:renew].nil? then
-   puts "Usage:  amarillo --name COMMONNAME [--zone ZONE] [--email EMAIL] [--amarillo-home AMARILLO_HOME]"
-   exit -1
+if options[:name].nil? and options[:renew].nil? and options[:list].nil? then
+  puts "Usage:  amarillo --name COMMONNAME [--zone ZONE] [--email EMAIL] [--amarillo-home AMARILLO_HOME]"
+  exit -1
 else
   name = options[:name]
 end
@@ -112,6 +120,10 @@ y = Amarillo.new amarillo_home
 
 if options[:renew] then
   y.renewCertificates
+elsif options[:list] then
+  y.listCertificates
+elsif options[:delete] then
+  y.deleteCertificate name
 else
   y.requestCertificate zone, name, email, nil
 end

data/lib/amarillo.rb

@@ -30,6 +30,7 @@ require 'aws-sdk-core'    # Credentials
 require 'aws-sdk-route53' # Route 53
 require 'resolv'          # DNS Resolvers
 require 'yaml'            # YAML
+require 'terminal-table'  # Tablular output
 
 class Amarillo
 
@@ -184,15 +185,20 @@ class Amarillo
     csr = Acme::Client::CertificateRequest.new private_key: certPrivateKey, 
                                                names: [commonName]
 
+    while order.status == 'processing'
+      sleep(1)
+      order.reload
+    end
+
+    @logger.info "Order status:  #{order.status}"
+
     begin                                               
       order.finalize(csr: csr)
     rescue
-      @logger.error("ERROR")
+      @logger.error("Error finalizing certificate order")
       self.cleanup label, record_type, challengeValue
     end
 
-    sleep(1) while order.status == 'processing'
-
     keyOutputPath =  "#{@keyPath}/#{commonName}.key"
     certOutputPath = "#{@certificatePath}/#{commonName}.crt"
 
@@ -245,6 +251,39 @@ class Amarillo
 
   end
 
+  def listCertificates
+
+    rows = []
+
+    Dir["#{@configsPath}/*.yml"].each do |c|
+      config = YAML.load(File.read(c))
+
+      cn = config["commonName"]
+
+      certificatePath = "#{@certificatePath}/#{cn}.crt"
+      raw = File.read certificatePath
+      certificate = OpenSSL::X509::Certificate.new raw      
+
+      rows <<  [config["commonName"], config["email"],
+                config["zone"], config["key_type"], certificate.not_after]
+
+    end
+
+    t = Terminal::Table.new :headings => ['commonName','email','zone','keytype','expiration'], :rows => rows
+    puts t
+  end
+
+  def deleteCertificate(commonName)
+    @logger.info "Deleting certificate #{commonName}"
+
+    certConfigFile = @configsPath + "/#{commonName}.yml"
+    certificatePath = @certificatePath + "/#{commonName}.crt"
+    keyPath         = @keyPath         + "/#{commonName}.key"
+
+    `rm -f #{certConfigFile} #{certificatePath} #{keyPath}`
+
+  end
+
   def renewCertificates
     t = Time.now
     @logger.info "Renewing certificates"
@@ -273,4 +312,4 @@ class Amarillo
 end
 
 
-require 'amarillo/environment'
+require 'amarillo/environment'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amarillo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.2
 platform: ruby
 authors:
 - iAchieved.it LLC
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-02 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.48'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: A tool for managing Let's Encrypt dns-01 certificates
 email: joe@iachieved.it
 executables:
@@ -95,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Amarillo