acme-client 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c389451aba873b133d61324af15bb4c4d8fd7ac0
-  data.tar.gz: 803eb577b2e2d4ede9d7c5f1ccabf89a6b9c36b7
+  metadata.gz: db4de0115967af2794cdf73fbc564ba3207d07bb
+  data.tar.gz: a6e4dbafa02042fa3ebdf0c171a5f700770d000c
 SHA512:
-  metadata.gz: dd04dd1c2bcebb94d8fd336d151797ba7262c41faef0b521cb92c9b00122a29ef6f68639c532951c40474347ca49faff0d92c9678e42dda89ca0adbb2ae877c4
-  data.tar.gz: 15d1539125077753c8a8e68e7bd380daa0bcfb616d91424ba2ac640f4737b679b9aaae6585aeaf40c622cb6c0b9a2cf697fac2eddebcff35af0743cd75d360aa
+  metadata.gz: e54827c5a1b93c079476b4ee7061d42d8a69c668063afd571887a040b063c362fc68f279fff2ebc9260b0bde0dd3d4af6b86b8f950385419f715bb6bb5f74f42
+  data.tar.gz: 368afee114cd978a13f764869f84c74fbd7df1177bed9ed8a25c3e675b2bb8e4f0de80c97bc3f3f6d061e4bd9c6d0c4a938f78cd1f16789e48907f721499a0a7

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "acme/client"
+require "acme-client"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/acme/client.rb

@@ -17,7 +17,7 @@ class Acme::Client
 
   def register(contact:)
     payload = {
-      resource: 'new-reg', contact: Array.wrap(contact)
+      resource: 'new-reg', contact: Array(contact)
     }
 
     response = connection.post(@operation_endpoints.fetch('new-reg'), payload)

data/lib/acme/crypto.rb

@@ -30,7 +30,11 @@ class Acme::Crypto
   end
 
   def jwk
-    JSON::JWK.new(public_key).to_hash
+    JSON::JWK.new(public_key)
+  end
+
+  def thumbprint
+    jwk.thumbprint
   end
 
   def public_key

data/lib/acme/resources/authorization.rb

@@ -1,7 +1,7 @@
 class Acme::Resources::Authorization
-  SimpleHttp = Acme::Resources::Challenges::SimpleHttp
+  HTTP01 = Acme::Resources::Challenges::HTTP01
 
-  attr_reader :domain, :status, :simple_http
+  attr_reader :domain, :status, :http01
 
   def initialize(client, response)
     @client = client
@@ -14,7 +14,7 @@ class Acme::Resources::Authorization
   def assign_challenges(challenges)
     challenges.each do |attributes|
       case attributes.fetch('type')
-      when 'simpleHttp' then @simple_http = SimpleHttp.new(@client, attributes)
+      when 'http-01' then @http01 = HTTP01.new(@client, attributes)
       else
         # no supported
       end

data/lib/acme/resources/challenges.rb

@@ -1,2 +1,3 @@
 module Acme::Resources::Challenges; end
-require 'acme/resources/challenges/simple_http'
+require 'acme/resources/challenges/base'
+require 'acme/resources/challenges/http01'

data/lib/acme/resources/challenges/base.rb

@@ -0,0 +1,33 @@
+class Acme::Resources::Challenges::Base
+
+  attr_reader :client, :status, :uri, :token, :error
+
+  def initialize(client, attributes)
+    @client = client
+    assign_attributes(attributes)
+  end
+
+  def verify_status
+    response = @client.connection.get(@uri)
+
+    assign_attributes(response.body)
+    @error = response.body['error']
+    status
+  end
+
+  private
+
+  def authorization_key
+    "#{token}.#{crypto.thumbprint}"
+  end
+
+  def assign_attributes(attributes)
+    @status = attributes.fetch('status', 'pending')
+    @uri = attributes.fetch('uri')
+    @token = attributes.fetch('token')
+  end
+
+  def crypto
+    @crypto ||= Acme::Crypto.new(@client.private_key)
+  end
+end

data/lib/acme/resources/challenges/http01.rb

@@ -0,0 +1,20 @@
+class Acme::Resources::Challenges::HTTP01 < Acme::Resources::Challenges::Base
+  CONTENT_TYPE = 'text/plain'
+
+  def content_type
+    CONTENT_TYPE
+  end
+
+  def file_content
+    authorization_key
+  end
+
+  def filename
+    ".well-known/acme-challenge/#{token}"
+  end
+
+  def request_verification
+    response = client.connection.post(@uri, { resource: 'challenge', type: 'http-01', keyAuthorization: authorization_key })
+    response.success?
+  end
+end

data/lib/acme/version.rb

@@ -1,5 +1,5 @@
 module Acme
   class Client
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acme-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Charles Barbier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -183,7 +183,8 @@ files:
 - lib/acme/resources.rb
 - lib/acme/resources/authorization.rb
 - lib/acme/resources/challenges.rb
-- lib/acme/resources/challenges/simple_http.rb
+- lib/acme/resources/challenges/base.rb
+- lib/acme/resources/challenges/http01.rb
 - lib/acme/resources/registration.rb
 - lib/acme/version.rb
 homepage: http://github.com/unixcharles/acme-client

data/lib/acme/resources/challenges/simple_http.rb

@@ -1,50 +0,0 @@
-class Acme::Resources::Challenges::SimpleHttp
-  CONTENT_TYPE = 'application/jose+json'
-
-  attr_reader :status, :uri, :token, :error
-  attr_accessor :tls
-
-  def initialize(client, attributes)
-    @client = client
-    assign_attributes(attributes)
-  end
-
-  def content_type
-    CONTENT_TYPE
-  end
-
-  def file_content
-    message = { 'type' => 'simpleHttp', 'token' => token, 'tls' => tls }
-    crypto.generate_signed_jws(header: {}, payload: message)
-  end
-
-  def filename
-    ".well-known/acme-challenge/#{token}"
-  end
-
-  def request_verification
-    response = @client.connection.post(@uri, { resource: 'challenge', type: 'simpleHttp', tls: tls })
-    response.success?
-  end
-
-  def verify_status
-    response = @client.connection.get(@uri)
-
-    assign_attributes(response.body)
-    @error = response.body['error']
-    status
-  end
-
-  private
-
-  def assign_attributes(attributes)
-    @status = attributes.fetch('status', 'pending')
-    @uri = attributes.fetch('uri')
-    @token = attributes.fetch('token')
-    @tls = attributes.fetch('tls')
-  end
-
-  def crypto
-    @crypto ||= Acme::Crypto.new(@client.private_key)
-  end
-end