tinycert 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69c0bb347db168ce7091c9cbdb6774f2b9c521dc
-  data.tar.gz: 47a6253aa174fb8cb030d06e62e9676e46b0aafd
+  metadata.gz: b36e0b5cca75f3a5db731ccad59d81fe3e92add1
+  data.tar.gz: ac1e66823bc92e5f381789e15e5e39e0fa924e2c
 SHA512:
-  metadata.gz: 565080a0835817068cc69cec2922c43ccb16453681193babf4c7e54300982f07f7ab224ffd0284271ae39297a703149fb462b746a3667133c5a5b357936f2006
-  data.tar.gz: 26bf62cf7926f9c677267117f2f7d3bc3d20771f8f66770de570ed84bf2237f009aaefc0a29b45ed0180355a599792514778302fa15aaa33332752f0bad78146
+  metadata.gz: 487d3c600a1a6f73a22b912cf92d1d5aaf84316c152cce7eb0333576c215cf4db142c3644d61e69881a38381739ba610afe47dab01a2c01fe53fc51a63e5c4aa
+  data.tar.gz: e7ffe3e3785c236a25fc1e07b6615c3d714c5b231e5e063eb01b34b2668a91916fc78f97f7629c98bbdc288bafc2beeb974c4921a45a4454148215a43542aecb

data/README.md

@@ -31,6 +31,18 @@ Note, your API key can be found [in the API documentation](https://www.tinycert.
 
 **Your passphrase is _not_ the same as your password**. You should have your passphrase stored in your browser or securely elsewhere. You can set your password on the [Tinycert profile page](https://www.tinycert.org/profile)
 
+### Connect with a block
+
+This will also call disconnect after the block
+
+```ruby
+t = TinyCert::Client.new '<your@email.address>', '<your passphrase>', '<your api key>'
+t.connect do |t|
+  a = t.authorities[5358]
+  cert = a.certs.create 'example.com', names: ['www.example.com', '*.example.com'], o: 'Development'
+end
+```
+
 ### List all CAs
 
 ```ruby

data/lib/tinycert/cert.rb

@@ -63,6 +63,7 @@ module Tinycert
 
     def parse_results results
       @id = results['id']
+      @id ||= results['cert_id']
       @status = results['status']
       @cn = results['CN']
       @cn ||= results['name']

data/lib/tinycert/certs.rb

@@ -38,23 +38,23 @@ module Tinycert
       Tinycert::Cert.new @tinycert, results
     end
 
-    def create name, c:'US', l:'', o:'', ou:'', st: '', names:[]
+    def create name, c:'US', l:nil, o:nil, ou:nil, st: nil, names:[]
       # Include the common name in the SANs too
       all_names = names << name
 
-      indexed_names = all_names.uniq.each_with_index.inject({}) { |names, (name, index)|
-        names["SANs[#{index}][DNS]"] = name
-        names
+      indexed_names = all_names.uniq.each_with_index.inject({}) { |all, (n, index)|
+        all["SANs[#{index}][DNS]"] = n
+        all
       }
-
-      request = @tinycert.session_request 'https://www.tinycert.org/api/v1/cert/new', {
+      request_params = {
         CN: name,
         C: c,
         O: o,
         OU: ou,
         ST: st,
         ca_id: ca.id
-       }.merge(indexed_names)
+       }.merge(indexed_names).reject { |k,v| v.nil? }
+      request = @tinycert.session_request 'https://www.tinycert.org/api/v1/cert/new', request_params
       Tinycert::Cert.new @tinycert, request.results
     end
   end

data/lib/tinycert/client.rb

@@ -9,16 +9,22 @@ module Tinycert
       @token = nil
     end
 
-    def connect
+    def connect &block
       request = request 'https://www.tinycert.org/api/v1/connect', { email: email, passphrase: passphrase }
       @token = request.results['token']
+      if block_given?
+        result = yield self
+        disconnect
+        return result
+      end
+      return self
     end
 
     def request url, params
       Tinycert::Request.new api_key, url, params
     end
 
-    def session_request url, params
+    def session_request url, params={}
       connect unless token
       Tinycert::Request.new api_key, url, params.merge({token: token})
     end
@@ -28,6 +34,9 @@ module Tinycert
     end
 
     def disconnect
+      request = session_request 'https://www.tinycert.org/api/v1/disconnect'
+      @token = nil
+      request.results
     end
   end
 end

data/lib/tinycert/request.rb

@@ -19,40 +19,42 @@ module Tinycert
     end
 
     # Sort the params consistently
-    def prepare_params params
+    def prepare_params p
       results = {}
       # Build a new hash with string keys
-      params.each { |k, v| results[k.to_s] = v }
+      p.each { |k, v| results[k.to_s] = v }
       # Sort nested structures
       results.sort.to_h
     end
 
     def digest
-      sorted_params = @params
-      sorted_params_string = URI.encode_www_form(sorted_params)
-      OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), @api_key, sorted_params_string)
+      OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), @api_key, params_string)
+    end
+
+    def params_string
+      # Replace * with %2A
+      URI.encode_www_form(@params).gsub(/\*/, '%2A')
     end
 
     # Create Request
     def build_request
       req = Net::HTTP::Post.new(@uri)
       req.add_field "Content-Type", "application/x-www-form-urlencoded; charset=utf-8"
-      req.body = URI.encode_www_form(params_with_digest)
+      req.body = params_string_with_digest
       # puts @uri
       # puts req.body
       req
     end
 
-    def params_with_digest
-      params = @params.dup
-      params['digest'] = digest
-      params
+    def params_string_with_digest
+      params_string << "&digest=#{digest}"
     end
 
     # Fetch Request
     def response
       res = @client.request(build_request)
       raise Tinycert::Error.new(res) if res.code != '200'
+      puts res.body
       res
     end
 

data/lib/tinycert/version.rb

@@ -1,3 +1,3 @@
 module Tinycert
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinycert
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jamie Lawrence
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler