certmeister 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a1dc0d6cb9c023dff3eb527f546afbad9f7a5a8
-  data.tar.gz: aa70c68eaa079200a7c7e32aa61d7199da762e91
+  metadata.gz: 1a3a1d325b8d922702cdc4b1f6a7188e2c4cb8c0
+  data.tar.gz: 6aa00bbb80a4e13cfa652f664c2e0a56435c14d8
 SHA512:
-  metadata.gz: 72ff500fc3e710490fdb428b0d2691f98ed7f3d4ea67a39cb39b30af3639512d073f257bff2150615787ab6e062da4a61be2fefbc4c91fb66c6f0e04f308df53
-  data.tar.gz: d575f3badcad0e32659395b2446d5e4549e0e50299070512ed648bd186dccd9d1f60ee075027b8086499278ba31e670bd4f6b025ed279680d6b13451c5b230bc
+  metadata.gz: 3fae8dfbe3b3a6dc499551b127723ca41eb714d87482b42b88f81bcdff6e89903b8cb6ffde0847136f8b004cef88810c79397e383eac8c11aa9e388e44dfb4db
+  data.tar.gz: c2692563e1c2007e6a0ebee23d30efafd30eb57c09efd929e99b0e3503aba1dc5b95e3d8b437a2ba9cf568ca990fbffad6ec2d0677b39f3ee2420abe466870a9

data/.semver

@@ -1,6 +1,6 @@
 ---
 :major: 0
-:minor: 2
-:patch: 3
+:minor: 3
+:patch: 0
 :special: ''
 :metadata: ''

data/Gemfile.lock

@@ -1,15 +1,22 @@
 PATH
   remote: .
   specs:
-    certmeister (0.2.3)
-    certmeister-redis (0.2.3)
-      certmeister (= 0.2.3)
+    certmeister (0.3.0)
+      semver2 (~> 3.3)
+    certmeister-rack (0.3.0)
+      certmeister (= 0.3.0)
+      rack (~> 1.5)
+    certmeister-redis (0.3.0)
+      certmeister (= 0.3.0)
       redis-sentinel (~> 1.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.2.5)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
     rake (0.9.6)
     redis (3.0.7)
     redis-sentinel (1.4.2)
@@ -30,7 +37,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.5)
   certmeister!
+  certmeister-rack!
   certmeister-redis!
+  rack-test (~> 0.6)
   rake (~> 0)
   rspec (~> 2.14)
-  semver2 (~> 3.3)

data/Rakefile

@@ -14,20 +14,19 @@ end
 namespace :bump do
   bump_version = ->(component) do
     sh 'bundle', 'exec', 'semver', 'inc', component
-    sh 'bundle'
-    sh 'bundle', 'exec', 'semver', 'format', "New version: v%M.%m.%p%s"
+    puts "Remember to update Gemfile.lock with bundle install"
   end
 
   desc 'Bump version [major]'
-  task :major => :build do
+  task :major do
     bump_version.call('major')
   end
   desc 'Bump version [minor]'
-  task :minor => :build do
+  task :minor do
     bump_version.call('minor')
   end
   desc 'Bump version [patch]'
-  task :patch => :build do
+  task :patch do
     bump_version.call('patch')
   end
 end

data/certmeister-rack.gemspec

@@ -0,0 +1,24 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'certmeister/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "certmeister-rack"
+  spec.version       = Certmeister::VERSION
+  spec.authors       = ["Sheldon Hearn"]
+  spec.email         = ["sheldonh@starjuice.net"]
+  spec.summary       = %q{Rack application for certmeister}
+  spec.description   = %q{This gem provides a rack application to offer an HTTP service around certmeister, the conditional autosigning certificate authority.}
+  spec.homepage      = "https://github.com/sheldonh/certmeister"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z lib/certmeister spec/certmeister`.split("\x0").grep(/rack/)
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "certmeister", Certmeister::VERSION
+  spec.add_dependency "rack", "~> 1.5"
+
+  spec.add_development_dependency "rack-test", "~> 0.6"
+end

data/certmeister.gemspec

@@ -22,10 +22,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "semver2", "~> 3.3"
+
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 0"
   spec.add_development_dependency "rspec", "~> 2.14"
-  spec.add_development_dependency "semver2", "~> 3.3"
 end
-
-

data/contrib/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: ..
   specs:
-    certmeister (0.0.2)
-    certmeister-redis (0.0.2)
-      certmeister (= 0.0.2)
+    certmeister (0.2.3)
+      semver2 (~> 3.3)
+    certmeister-redis (0.2.3)
+      certmeister (= 0.2.3)
       redis-sentinel (~> 1.4)
 
 GEM
@@ -13,6 +14,7 @@ GEM
     redis (3.0.7)
     redis-sentinel (1.4.2)
       redis
+    semver2 (3.3.3)
 
 PLATFORMS
   ruby

data/contrib/config.ru

@@ -3,6 +3,7 @@ require 'rack'
 
 require 'certmeister'
 require 'certmeister/redis/store'
+require 'certmeister/rack/app'
 require 'redis'
 
 allow = Certmeister::Policy::Noop.new
@@ -17,61 +18,12 @@ ca = Certmeister.new(
     ca_key: File.read("../fixtures/ca.key"),
   )
 )
+certmeister = Certmeister::Rack::App.new(ca)
 
-sign_action = ->(params) do
-  response = ca.sign(params)
-  if response.error?
-    [500, {'Content-Type' => 'text/plain'}, ["500 Internal Server Error (#{response.error})"]]
-  elsif response.denied?
-    [403, {'Content-Type' => 'text/plain'}, ["403 Forbidden (#{response.error})"]]
-  else
-    [303, {'Content-Type' => 'text/plain',
-           'Location' => "/certificate/#{params[:cn]}"}, ["303 See Other"]]
+app = Rack::Builder.new do
+  map "/ca" do
+    run certmeister
   end
 end
 
-fetch_action = ->(params) do
-  response = ca.fetch(params)
-  if response.error?
-    [500, {'Content-Type' => 'text/plain'}, ["500 Internal Server Error (#{response.error})"]]
-  elsif response.denied?
-    [403, {'Content-Type' => 'text/plain'}, ["403 Forbidden (#{response.error})"]]
-  elsif response.miss?
-    [404, {'Content-Type' => 'text/plain'}, ["404 Not Found"]]
-  else
-    [200, {'Content-Type' => 'application/x-pem-file'}, [response.pem]]
-  end
-end
-
-remove_action = ->(params) do
-  response = ca.remove(params)
-  if response.error?
-    [500, {'Content-Type' => 'text/plain'}, ["500 Internal Server Error (#{response.error})"]]
-  elsif response.denied?
-    [403, {'Content-Type' => 'text/plain'}, ["403 Forbidden (#{response.error})"]]
-  elsif response.miss?
-    [404, {'Content-Type' => 'text/plain'}, ["404 Not Found"]]
-  else
-    [200, {'Content-Type' => 'text/plain'}, ["200 OK"]]
-  end
-end
-
-router = ->(env) do
-  req = Rack::Request.new(env)
-  if req.path_info =~ /^\/certificate\/(.+)/
-    params = req.params.tap do |p|
-      p[:cn] = $1
-      p[:ip] = req.ip
-    end
-    case req.request_method
-      when 'POST' then sign_action.call(params)
-      when 'GET' then fetch_action.call(params)
-      when 'DELETE' then remove_action.call(params)
-      else [405, {'Content-Type' => 'text-plain'}, ["405 Method Not Allowed"]]
-    end
-  else
-    [501, {'Content-Type' => 'text-plain'}, ["501 Not Implemented"]]
-  end
-end
-
-run router
+run app

data/lib/certmeister/version.rb

@@ -1,7 +1,24 @@
-require 'semver'
+begin
 
-module Certmeister
+  require 'semver'
+
+  module Certmeister
+
+    VERSION = SemVer.find.format("%M.%m.%p%s") unless defined?(VERSION)
+    
+  end
+
+rescue LoadError
+
+  $stderr.puts "warning: ignoring missing semver gem for initial bundle"
+  $stderr.puts "warning: please run bundle again to fix certmeister version number"
+
+  module Certmeister
+
+    VERSION = '0'
+
+  end
 
-  VERSION = SemVer.find.format("%M.%m.%p%s") unless defined?(VERSION)
-  
 end
+
+    

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: certmeister
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Sheldon Hearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: semver2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: '3.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: semver2
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '2.14'
 description: Certificate authority that can be configured to make decisions about
   whether to autosign certificate signing requests for clients. This gem provides
   the protocol-agnostic library, which is expected to be used within something like
@@ -86,6 +86,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- certmeister-rack.gemspec
 - certmeister-redis.gemspec
 - certmeister.gemspec
 - contrib/.ruby-gemset