autosign 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a408db14ff5f1ab3bdf26ff21c3807b88a5ac9bf
-  data.tar.gz: 79dcf642bc0965605a45594397e73872061d2159
+SHA256:
+  metadata.gz: 7cea4888327d41b345649b2eee66159c1bb0e7f5c72bc47181273c2288267c22
+  data.tar.gz: e955bcf5683d7a732e5a230809249757abc85b15b3d472a19d8d1bae15888e07
 SHA512:
-  metadata.gz: '08d0db1656abb18f7036a112c25a5abb25d813aba6edb250cd28e0e40f68566bbc77a2a37c1aabb910e9cc5193198d08cd40e960e6e438e6978b9c18389cccdc'
-  data.tar.gz: 86003a00b10e13440592a0c18fcb446d767a74fdd4827aabf3ead3ed8c5978bbdeefa54f87d9c9f56ae67d48e1f6b3e9ab82702ebd006e139a02ef2f34a7dd6a
+  metadata.gz: 51af9e930cf1348583e03bb824a43dc6a554064d3868aea5a29aafe47ba90680ab4f139b57f8371c269dfe20917d49fb6e4cabd60f3b4dc429aacea958e9175a
+  data.tar.gz: 32de31aabf2e38ea9ad43c9ec51d7f8fd8d3e1fd2a529f4ff504819b4f28ae7d83dcbe12e09495415c6a9fcab1d70c65e455ecbed5ef7f95c03b93db225ef49a

data/Gemfile.lock

@@ -1,122 +1,99 @@
 PATH
   remote: .
   specs:
-    autosign (0.1.3)
+    autosign (0.1.4)
       deep_merge (~> 1)
       gli (~> 2)
       iniparse (~> 1)
-      json (>= 1)
       jwt (~> 1)
       logging (~> 2)
+      multi_json (>= 1)
       require_all (~> 1)
-      yard (~> 0.9.11)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.2.8)
-    aruba (0.10.2)
-      childprocess (~> 0.5.6)
+    aruba (0.14.12)
+      childprocess (>= 0.6.3, < 4.0.0)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
-      ffi (~> 1.9.10)
+      ffi (~> 1.9)
       rspec-expectations (>= 2.99)
       thor (~> 0.19)
-    builder (3.2.2)
-    childprocess (0.5.9)
-      ffi (~> 1.0, >= 1.0.11)
-    coderay (1.1.0)
-    contracts (0.12.0)
-    coveralls (0.8.10)
-      json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.11.0)
+    builder (3.2.3)
+    childprocess (3.0.0)
+    coderay (1.1.2)
+    contracts (0.16.0)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (~> 1.6.0)
-    cucumber (2.2.0)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
+    cucumber (2.99.0)
       builder (>= 2.1.2)
-      cucumber-core (~> 1.3.0)
+      cucumber-core (~> 1.5.0)
       cucumber-wire (~> 0.0.1)
       diff-lcs (>= 1.1.3)
-      event-bus (~> 0.1.0)
-      gherkin3 (~> 3.1.0)
+      gherkin (~> 4.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (1.3.1)
-      gherkin3 (~> 3.1.0)
+    cucumber-core (1.5.0)
+      gherkin (~> 4.0)
     cucumber-wire (0.0.1)
     deep_merge (1.2.1)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)
-    event-bus (0.1.0)
-    facter (2.4.4)
-      CFPropertyList (~> 2.2.6)
-    ffi (1.9.10)
-    gherkin3 (3.1.2)
-    gli (2.17.1)
+    diff-lcs (1.3)
+    docile (1.3.2)
+    facter (2.5.6)
+    ffi (1.11.2)
+    gherkin (4.1.3)
+    gli (2.19.0)
     hiera (1.3.4)
       json_pure
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
     iniparse (1.4.4)
-    json (1.8.3)
-    json_pure (1.8.3)
+    json (2.2.0)
+    json_pure (2.2.0)
     jwt (1.5.6)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    method_source (0.8.2)
-    mime-types (2.99)
-    multi_json (1.11.2)
+    method_source (0.9.2)
+    multi_json (1.14.1)
     multi_test (0.1.2)
-    netrc (0.11.0)
-    pry (0.10.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    puppet (3.8.4)
+      method_source (~> 0.9.0)
+    puppet (3.8.7)
       facter (> 1.6, < 3)
       hiera (~> 1.0)
       json_pure
-    rake (10.4.2)
-    rdoc (4.2.1)
-      json (~> 1.4)
+    rake (10.5.0)
+    rdoc (4.3.0)
     require_all (1.5.0)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    simplecov (0.11.1)
-      docile (~> 1.1.0)
-      json (~> 1.8)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    term-ansicolor (1.3.2)
+    simplecov-html (0.10.2)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.19.1)
-    tins (1.6.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
-    yard (0.9.12)
+    thor (0.20.3)
+    tins (1.22.2)
+    yard (0.9.20)
 
 PLATFORMS
   ruby
@@ -131,6 +108,7 @@ DEPENDENCIES
   rake (~> 10)
   rdoc (~> 4)
   rspec (~> 3)
+  yard (~> 0.9.11)
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/autosign.gemspec

@@ -24,12 +24,12 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('rspec', '~> 3')
   s.add_development_dependency('coveralls')
   s.add_development_dependency('pry', '~> 0.10')
+  s.add_development_dependency('yard', '~> 0.9.11')
   s.add_runtime_dependency('gli','~> 2')
   s.add_runtime_dependency('jwt','~> 1')
   s.add_runtime_dependency('iniparse','~> 1')
   s.add_runtime_dependency('logging', '~> 2')
-  s.add_runtime_dependency('json', '>=1')
+  s.add_runtime_dependency('multi_json', '>=1')
   s.add_runtime_dependency('deep_merge', '~> 1')
   s.add_runtime_dependency('require_all', '~> 1')
-  s.add_runtime_dependency('yard', '~> 0.9.11')
 end

data/bin/autosign-validator

@@ -2,6 +2,8 @@
 require 'autosign'
 require 'logging'
 
+### Ensure stdin is read https://tickets.puppetlabs.com/browse/SERVER-1116
+raw_csr = $stdin.read
 
 ### Start logging
 @logger = Logging.logger['Autosign']
@@ -28,11 +30,10 @@ unless ARGV.count == 1
   exit 1
 end
 
-certname = ARGV[0]
+certname = ARGV.shift
 @logger.debug "certname is " + certname
 
 @logger.debug "reading CSR from stdin"
-raw_csr = $stdin.read
 csr = Autosign::Decoder.decode_csr(raw_csr)
 exit 1 unless csr.is_a?(Hash)
 

data/lib/autosign.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'json'
+require 'multi_json'
 require 'autosign/version.rb'
 require 'autosign/token.rb'
 require 'autosign/config.rb'

data/lib/autosign/token.rb

@@ -1,6 +1,6 @@
 module Autosign
   require 'jwt'
-  require 'json'
+  require 'multi_json'
   require 'securerandom'
 
   # Class modeling JSON Web Tokens as credentials for certificate auto signing.
@@ -62,7 +62,7 @@ module Autosign
       errors = []
       begin
         @log.debug "Decoding and parsing token"
-        data = JSON.parse(JWT.decode(token, hmac_secret)[0]["data"])
+        data = MultiJson.load(JWT.decode(token, hmac_secret)[0]["data"])
       rescue JWT::ExpiredSignature
         @log.warn "Token has an expired signature"
         errors << "Expired Signature"
@@ -142,7 +142,7 @@ module Autosign
       rescue
         raise Autosign::Token::Invalid
       end
-      cert_data = JSON.parse(decoded["data"])
+      cert_data = MultiJson.load(decoded["data"])
       new_token = self.new(cert_data["certname"], cert_data["reusable"], cert_data["validfor"],
                            cert_data["requester"], hmac_secret)
 
@@ -186,7 +186,7 @@ module Autosign
     end
 
     def to_json
-      JSON.generate to_hash
+      MultiJson.dump to_hash
     end
 
   end

data/lib/autosign/version.rb

@@ -1,3 +1,3 @@
 module Autosign
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autosign
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Daniel Dreier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2019-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -220,20 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.11
 description: 
 email: ddreier@thinkplango.com
 executables:
@@ -300,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Tooling to make puppet autosigning easy, secure, and extensible