certflare 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 700b560e2dc6ecee92362359c3777e0543e262ad6302cbab9ac7ecfb59389d14
-  data.tar.gz: 2f36f0f114fc9cb89814b81f9d597aa8efe92022fe6a1f371c5837da1d4113b7
+  metadata.gz: d8bd0bae6dcc166c68c16b5cb0f63f2394018b6b523e23ec2007b5643228a937
+  data.tar.gz: f574de70db5f874b216ef4346bf04a5fa6f641e2fb7b26900c92ddfb10c745bc
 SHA512:
-  metadata.gz: cd7ba5e004e7587d8411919d5225f9f65156ec01e4d4dfe940f71ce83e22a9eac7d2e4db6c39e70142e63bc3441239064dd90467050449e003ae6539c50dbab7
-  data.tar.gz: af7e4d345e1ab8ac0274e3358a8f2c7d5a9202ee1410f5c207ae4455b2a000485b92660bf0c47fd09e35ee77298b4f2e6ae4fb8b4057de7ff1fbc181c9621acc
+  metadata.gz: 5bf9fc9649e103766648468e987bff1340146e745a54c34a4114ad40a7842eb38bbe29392e7db7260fe8c0925fa0eb9b6f27dd2d1023469d942d7609e657292f
+  data.tar.gz: ce62099481ef2831c6827219cec12afe50c8a413e929848efb18c02844bc03c5eac394f4032ee547995601732d54fb3940566a70d5ea39730bb5806246605cab

data/README.md

@@ -1,5 +1,7 @@
 # Certflare
 
+[![Join the chat at https://gitter.im/Certflare/community](https://badges.gitter.im/Certflare/community.svg)](https://gitter.im/Certflare/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 Certflare is an easier and quicker way to your certs from certbot/letsencrypt/ietf.
 Why make your own script when something does it better and easier, especially if you don't know ruby.
 

data/lib/certflare/cli.rb

@@ -1,6 +1,8 @@
 require 'thor'
 require 'certflare/version'
 require 'certflare/commands'
+require 'certflare/common/authenticator'
+require 'certflare/common/cleanup'
 module Certflare
   class CLI < Thor
     desc '--version, -v', 'returns version and exits'
@@ -18,14 +20,21 @@ module Certflare
     end
     map ['-v', '--version'] => :__version
 
-    desc 'auth [options]', ''
+    desc 'auth [options]', 'Authenticate with cloudflare and create records for verfication'
     def auth
-      # Stub
+      auther = Certflare::Authenticator.new
+      auther.create_txt_record
+      auther.create_cleanup
     end
 
-    desc 'clean [options]', ''
+    desc 'clean [options]', 'Cleanup cloudflare records and files'
     def clean
-      # Stub
+      cleanup = Certflare::CleanUp.new
+      cleanup.get_certbot_vars
+      cleanup.get_domain
+      cleanup.remove_zone_id
+      cleanup.remove_record_id
+      cleanup.remove_txt_record
     end
   end
 end

data/lib/certflare/common/authenticator.rb

@@ -24,7 +24,7 @@ module Certflare
       @zone_id = zone[:result][0][:id]
 
     end
-    def create_txt_record()
+    def create_txt_record
       domain_with_prefix = "_acme-challenge.#{@domain}"
       # puts "record name: #{domain_with_prefix}"
       dns_records = CloudflareClient::Zone::DNS.new(zone_id: @zone_id, auth_key: @api_key, email: @email)
@@ -34,7 +34,7 @@ module Certflare
     end
 
     def create_cleanup
-      domain_dir = Pathname.new("/sites/tmp/CERTBOT_#{@domain}")
+      domain_dir = Pathname.new("/etc/").join("tmp", "CERTBOT_#{@domain}")
       # puts "domain dir: #{domain_dir}"
       unless domain_dir.exist?
         Dir.mkdir(domain_dir, 0700)

data/lib/certflare/common/cleanup.rb

@@ -13,38 +13,40 @@ require 'public_suffix'
 
 module Certflare
   class CleanUp
-    @@configs_dir = Pathname.new('/sites/configs/dns-cloudflare-credentials/')
-    @@cfg = ConfigParser.new(@@configs_dir.join('cloudflare.ini'))
-    @@api_key = @@cfg['dns_cloudflare_api_key']
-    @@email = @@cfg['dns_cloudflare_email']
-    @@client = CloudflareClient::Zone.new(auth_key: @@api_key, email: @@email)
-    def self.get_certbot_vars
-      @@domain = ENV['CERTBOT_DOMAIN']
-      @@validation = ENV['CERTBOT_VALIDATION']
+    def initialize
+    @configs_dir = Pathname.new('/etc/')
+    @cfg = ConfigParser.new(@configs_dir.join('certflare'))
+    @api_key = @cfg['dns_cloudflare_api_key']
+    @email = @cfg['dns_cloudflare_email']
+    @client = CloudflareClient::Zone.new(auth_key: @api_key, email: @email)
     end
-    def self.get_domain
+    def get_certbot_vars
+      @domain = ENV['CERTBOT_DOMAIN']
+      @validation = ENV['CERTBOT_VALIDATION']
+    end
+    def get_domain
       domain = ENV['CERTBOT_DOMAIN']
-      @@full_domain = domain
-      @@main_domain = PublicSuffix.domain(domain)
+      @full_domain = domain
+      @main_domain = PublicSuffix.domain(domain)
     end
-    def self.remove_zone_id
-      @@domain_dir = Pathname.new("/sites/tmp/CERTBOT_#{@@domain}")
-      if @@domain_dir.join('ZONE_ID').exist?
-        @@zone_id = File.read(@@domain_dir.join('ZONE_ID').to_s)
-        File.delete(@@domain_dir.join('ZONE_ID').to_s)
+    def remove_zone_id
+      @domain_dir = Pathname.new("/sites/tmp/CERTBOT_#{@domain}")
+      if @domain_dir.join('ZONE_ID').exist?
+        @zone_id = File.read(@domain_dir.join('ZONE_ID').to_s)
+        File.delete(@domain_dir.join('ZONE_ID').to_s)
       end
     end
-    def self.remove_record_id
-      if @@domain_dir.join('RECORD_ID').exist?
-        @@record_id = File.read(@@domain_dir.join('RECORD_ID').to_s)
-        File.delete(@@domain_dir.join('RECORD_ID').to_s)
+    def remove_record_id
+      if @domain_dir.join('RECORD_ID').exist?
+        @record_id = File.read(@domain_dir.join('RECORD_ID').to_s)
+        File.delete(@domain_dir.join('RECORD_ID').to_s)
       end
     end
-    def self.remove_txt_record
-      unless (defined?(@@zone_id)).nil?
-        unless (defined?(@@record_id)).nil?
-          zone = CloudflareClient::Zone::DNS.new(auth_key: @@api_key, email: @@email, zone_id: @@zone_id)
-          zone.delete(id: @@record_id)
+    def remove_txt_record
+      unless (defined?(@zone_id)).nil?
+        unless (defined?(@record_id)).nil?
+          zone = CloudflareClient::Zone::DNS.new(auth_key: @api_key, email: @email, zone_id: @zone_id)
+          zone.delete(id: @record_id)
         end
       end
     end
@@ -54,5 +56,4 @@ module Certflare
   CleanUp.remove_zone_id
   CleanUp.remove_record_id
   CleanUp.remove_txt_record
-
 end

data/lib/certflare/version.rb

@@ -1,4 +1,4 @@
 module Certflare
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: certflare
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ken Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-24 00:00:00.000000000 Z
+date: 2019-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client
@@ -241,7 +241,6 @@ files:
 - bin/certflare_hook
 - certflare.gemspec
 - lib/certflare.rb
-- lib/certflare/cleanup.rb
 - lib/certflare/cli.rb
 - lib/certflare/commands.rb
 - lib/certflare/commands/cert.rb

data/lib/certflare/cleanup.rb

@@ -1,58 +0,0 @@
-# 
-# Copyright 2019 Ken Spencer / IotaSpencer
-#
-# 
-# File: ${FILENAME}
-# Created: 3/14/19
-#
-# License is in project root, MIT License is in use.
-require 'cloudflare_client'
-require 'configparser'
-require 'pathname'
-require 'public_suffix'
-
-module Certflare
-  class CleanUp
-    @@configs_dir = Pathname.new('/sites/configs/dns-cloudflare-credentials/')
-    @@cfg = ConfigParser.new(@@configs_dir.join('cloudflare.ini'))
-    @@api_key = @@cfg['dns_cloudflare_api_key']
-    @@email = @@cfg['dns_cloudflare_email']
-    @@client = CloudflareClient::Zone.new(auth_key: @@api_key, email: @@email)
-    def self.get_certbot_vars
-      @@domain = ENV['CERTBOT_DOMAIN']
-      @@validation = ENV['CERTBOT_VALIDATION']
-    end
-    def self.get_domain
-      domain = ENV['CERTBOT_DOMAIN']
-      @@full_domain = domain
-      @@main_domain = PublicSuffix.domain(domain)
-    end
-    def self.remove_zone_id
-      @@domain_dir = Pathname.new("/sites/tmp/CERTBOT_#{@@domain}")
-      if @@domain_dir.join('ZONE_ID').exist?
-        @@zone_id = File.read(@@domain_dir.join('ZONE_ID').to_s)
-        File.delete(@@domain_dir.join('ZONE_ID').to_s)
-      end
-    end
-    def self.remove_record_id
-      if @@domain_dir.join('RECORD_ID').exist?
-        @@record_id = File.read(@@domain_dir.join('RECORD_ID').to_s)
-        File.delete(@@domain_dir.join('RECORD_ID').to_s)
-      end
-    end
-    def self.remove_txt_record
-      unless (defined?(@@zone_id)).nil?
-        unless (defined?(@@record_id)).nil?
-          zone = CloudflareClient::Zone::DNS.new(auth_key: @@api_key, email: @@email, zone_id: @@zone_id)
-          zone.delete(id: @@record_id)
-        end
-      end
-    end
-  end
-  CleanUp.get_certbot_vars
-  CleanUp.get_domain
-  CleanUp.remove_zone_id
-  CleanUp.remove_record_id
-  CleanUp.remove_txt_record
-
-end