certbot 0.0.1.pre.2 → 0.0.1.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffea510708e98db7b405b9bfbf8e545a22c4677e
-  data.tar.gz: 4c600b80462e4ee71b95a0ce84bfda86196417df
+  metadata.gz: 5d2f87da1860bd8451ba9a498f79bd78fa135011
+  data.tar.gz: ae6689ccdb9724ee9afb5ec44db769fa8b34b4ab
 SHA512:
-  metadata.gz: c7d27a37e005752550aaa571552b76fdcf75f2951e977bd85fced953c07d0a30c8e013af08c8cbd7d35a90f315948613ac98f3f0ecc295d61471ba8e1d0a8a50
-  data.tar.gz: bcc8efbcb798cdf7fce28957b18a05f6d2bd85f1c21376e46ddd34dd0df72d933f7eaae2422a74abf14b9c0cf0e69b9064cb3fee3646d1cdb2c0d50095dd5024
+  metadata.gz: 8137c6380c07bf6b3d75f9783c584698c6607d14223261818fbb29a03e02a49e583321481417c6069d1c8e5ba2ff06dcf6eda0b218cd16a69e7434492389e019
+  data.tar.gz: e9e919174b4f4f6bb18c0586874c32da2b08f46312f94eb63a2089190e448a0dff66f1e60206d1d82be4f7d7dc8ee6a91206413193007cf9bc5b9ad4d3c057b8

data/README.md

@@ -19,16 +19,21 @@ http://guides.rubyonrails.org/action_controller_overview.html#force-https-protoc
 
 ## Configuration
 
-By default, this library is configured via ENV variables.
+By default, this library is configured via pairs of ENV variables with the format:
 ```
-CERTBOT_TOKEN = Certbot challenge token
-CERTBOT_KEY_AUTHORIZATION = Certbot key authorization for valid request
+/CERTBOT_TOKEN_[0-9]+/
+/CERTBOT_KEY_AUTHORIZATION_[0-9]+/
+```
+
+for example:
+```
+CERTBOT_TOKEN_0=123123
+CERTBOT_KEY_AUTHORIZATION_0=123123
 ```
 
 The challenge and token can also be configured via Ruby API.
 ```ruby
 Certbot.configure do |config|
-  config.token = 'my_challenge_token'
-  config.key_authorization = 'my_key_authorization'
+  config.add_token('my_challenge_token', 'my_key_authorization')
 end
 ```

data/app/controllers/certbot_controller.rb

@@ -1,7 +1,8 @@
 class CertbotController < Certbot::ApplicationController
   def show
-    if params[:token] == certbot_config.token
-      render text: certbot_config.key_authorization
+    token = params[:token]
+    if certbot_config.valid_token?(token)
+      render text: certbot_config.key_authorization_for_token(token)
     else
       render nothing: true, status: 404
     end

data/lib/certbot/configuration.rb

@@ -1,13 +1,34 @@
 module Certbot
   class Configuration
-    # Default: ENV['CERTBOT_TOKEN']
-    attr_accessor :token
-    # Default: ENV['CERTBOT_KEY_AUTHORIZATION']
-    attr_accessor :key_authorization
-
     def initialize
-      @token = ENV['CERTBOT_TOKEN']
-      @key_authorization = ENV['CERTBOT_KEY_AUTHORIZATION']
+      @tokens = {}
+      add_tokens_from_env
+    end
+
+    def add_token(token, key_authorization)
+      @tokens[token] = key_authorization
+    end
+
+    def valid_token?(token)
+      @tokens.key?(token)
+    end
+
+    def key_authorization_for_token(token)
+      @tokens[token]
+    end
+
+    private
+
+    # TODO: raise error if missing matching authorization for token index
+    def add_tokens_from_env
+      ENV.each do |key, value|
+        match = key.match(/\A^CERTBOT_TOKEN_([0-9]+)\Z/)
+        next unless match
+        index = match[1]
+        token = value
+        key_authorization = ENV["CERTBOT_KEY_AUTHORIZATION_#{index}"]
+        add_token(token, key_authorization)
+      end
     end
   end
 end

data/lib/certbot/version.rb

@@ -1,3 +1,3 @@
 module Certbot
-  VERSION = "0.0.1.pre.2"
+  VERSION = "0.0.1.pre.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: certbot
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.2
+  version: 0.0.1.pre.3
 platform: ruby
 authors:
 - BetterUp Developers