autosign 0.0.10 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzA1MDhlMDIzMDk5ZmI5Yjg4Zjk0NjgyN2ViYmVlYTljMTAwZWQyOQ==
-  data.tar.gz: !binary |-
-    ODU1M2JjMDFmZjk2NWNmZDE4ZmQ0MWI3YjAzODM3NzM3NDQ1YzJjNA==
+SHA1:
+  metadata.gz: b6010183f4da71291508ea4f925737ae89c45169
+  data.tar.gz: 6169885297a1d91f0ff3dbe7ca14bf3c99515ae7
 SHA512:
-  metadata.gz: !binary |-
-    MTRkZTM3M2FmZTdjNGFiOGVlZTBmNmFhODYwNGQxY2NjZjlkMWEzNTljZTg3
-    ZTYxYmFiODhmMDVlMmM5ZjU3MjE0NDNkYjAzNGMzYzI4MzkwNDkzMmZkOWRj
-    ZjYxNzdkMmVkZTE5MGVkN2ZiN2RhMTU2MDEyNGM0NGU5Y2UzOTA=
-  data.tar.gz: !binary |-
-    MGQ3NWJjN2Q4MzJmMGJkODQwNzNhYzE3ZWNhNjBhMWY0ODFlNjRlNWVmNzZk
-    MmM5ZmE1MDVlOTUyYWY3MzQwNjA3NGQ4ZDJhY2ViNjBlN2M1Nzk0Y2NjYzYz
-    NTAyYTZhOTFiOWI5OTA4OTI2NzE2NmU4ZWYwMmNjMmM4YTczNjI=
+  metadata.gz: 4d9e3f72753419191df24ba15c143ccdc7b95329ffbc699a45feb7ee7b14b61b3d223ecf2a751e91f6dcf3c59ee59af3edd43227d9277e7d86df271969a46683
+  data.tar.gz: e33a42eacf745a1fd54b3a38d76f8d2cb68911e2e0e6793e2af26d79c84ae3b6430bed39d59cd8c37f530dbaa831d50810e4b2de39843c47f71342dd46e23019

data/.gitignore

@@ -1,5 +1,6 @@
 html
 doc
+.bundle
 .vagrant
 .yardoc
 autosign.conf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    autosign (0.0.10)
+    autosign (0.1.0)
       deep_merge (~> 1)
       gli (~> 2)
       iniparse (~> 1)
@@ -16,40 +16,42 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.2.8)
-    aruba (0.8.1)
-      childprocess (~> 0.5.6)
-      contracts (~> 0.9)
-      cucumber (>= 1.3.19)
-      rspec-expectations (>= 2.99)
+    aruba (0.6.2)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
     builder (3.2.2)
     childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
-    contracts (0.10.1)
+    coderay (1.1.0)
     coveralls (0.8.2)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-    cucumber (2.0.2)
+    cucumber (2.0.0)
       builder (>= 2.1.2)
-      cucumber-core (~> 1.2.0)
+      cucumber-core (~> 1.1.3)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (1.2.0)
+    cucumber-core (1.1.3)
       gherkin (~> 2.12.0)
     deep_merge (1.0.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
-    facter (2.4.4)
+    facter (2.2.0)
       CFPropertyList (~> 2.2.6)
-    ffi (1.9.10)
+    ffi (1.9.9)
+    ffi (1.9.9-java)
     gherkin (2.12.2)
       multi_json (~> 1.3)
+    gherkin (2.12.2-java)
+      multi_json (~> 1.3)
     gli (2.13.1)
     hiera (1.3.4)
       json_pure
@@ -57,17 +59,28 @@ GEM
       domain_name (~> 0.5)
     iniparse (1.4.0)
     json (1.8.3)
-    json_pure (1.8.2)
+    json (1.8.3-java)
+    json_pure (1.8.1)
     jwt (1.5.1)
     little-plugger (1.1.3)
     logging (2.0.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
+    method_source (0.8.2)
     mime-types (2.6.1)
-    multi_json (1.11.2)
+    multi_json (1.11.1)
     multi_test (0.1.2)
     netrc (0.10.3)
-    puppet (3.8.1)
+    pry (0.10.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry (0.10.2-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
+    puppet (3.7.0)
       facter (> 1.6, < 3)
       hiera (~> 1.0)
       json_pure
@@ -83,12 +96,12 @@ GEM
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
       rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
+    rspec-core (3.3.1)
       rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec-expectations (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+    rspec-mocks (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
@@ -98,16 +111,21 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    slop (3.6.0)
+    spoon (0.0.4)
+      ffi
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
     tins (1.5.4)
     unf (0.1.4)
       unf_ext
+    unf (0.1.4-java)
     unf_ext (0.0.7.1)
     yard (0.8.7.6)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -115,6 +133,7 @@ DEPENDENCIES
   autosign!
   coveralls
   cucumber (~> 2)
+  pry (~> 0.10)
   puppet (~> 3)
   rake (~> 10)
   rdoc (~> 4)

data/autosign.gemspec

@@ -3,11 +3,11 @@ require File.join([File.dirname(__FILE__),'lib','autosign','version.rb'])
 spec = Gem::Specification.new do |s| 
   s.name = 'autosign'
   s.version = Autosign::VERSION
-  s.author = 'Your Name Here'
-  s.email = 'your@email.address.com'
-  s.homepage = 'http://your.website.com'
+  s.author = 'Daniel Dreier'
+  s.email = 'ddreier@thinkplango.com'
+  s.homepage = 'https://github.com/danieldreier/autosign'
   s.platform = Gem::Platform::RUBY
-  s.summary = 'A description of your project'
+  s.summary = 'Tooling to make puppet autosigning easy, secure, and extensible'
   s.files = `git ls-files`.split("
 ")
   s.require_paths << 'lib'
@@ -23,6 +23,7 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('puppet', '~> 3')
   s.add_development_dependency('rspec', '~> 3')
   s.add_development_dependency('coveralls')
+  s.add_development_dependency('pry', '~> 0.10')
   s.add_runtime_dependency('gli','~> 2')
   s.add_runtime_dependency('jwt','~> 1')
   s.add_runtime_dependency('iniparse','~> 1')

data/bin/autosign

@@ -42,6 +42,9 @@ command :generate do |c|
   c.desc 'Generate a reusable token; default is to generate one-time tokens'
   c.switch [:r, :reusable]
 
+  c.desc 'Output only a bare token without the surrounding csr_attributes template'
+  c.switch [:b, :bare]
+
   c.desc 'autosign token validity period'
   c.default_value '7200'
   c.arg_name 'seconds'
@@ -58,12 +61,17 @@ command :generate do |c|
 
     help_now!('validfor setting must be an positive integer number of seconds') if !/\A\d+\z/.match(options['validfor'].to_s)
     token = Autosign::Token.new(certname, options['reusable'], options['validfor'].to_i, Socket.gethostname.to_s, global_options['secret'])
-    @logger.info "generated token for: " + certname
-    puts "Autosign token for: " + token.certname + ", valid until: " + Time.at(token.validto).to_s
-    puts "To use the token, put the following in ${puppet_confdir}/csr_attributes.yaml prior to running puppet agent for the first time:"
-    puts ""
-    puts "custom_attributes:"
-    puts "  challengePassword: \"#{token.sign.to_s}\""
+
+    if options[:bare]
+      puts token.sign.to_s
+    else
+      @logger.info "generated token for: " + certname
+      puts "Autosign token for: " + token.certname + ", valid until: " + Time.at(token.validto).to_s
+      puts "To use the token, put the following in ${puppet_confdir}/csr_attributes.yaml prior to running puppet agent for the first time:"
+      puts ""
+      puts "custom_attributes:"
+      puts "  challengePassword: \"#{token.sign.to_s}\""
+    end
   end
 end
 

data/features/autosign.feature

@@ -19,6 +19,23 @@ Feature: Generate autosign key
      And the output should contain "valid until"
      And the exit status should be 0
 
+  Scenario: Generate new token using the --bare flag
+    Given a pre-shared key of "secret"
+      And a hostname of "foo.example.com"
+      And a file named "autosign.conf" with:
+      """
+      ---
+      jwt_token:
+        validity: '7200'
+        secret: 'secret'
+      """
+    When I run `chmod 600 autosign.conf`
+     And I run `autosign --config autosign.conf generate --bare foo.example.com`
+    Then the output should be a JSON web token
+     And the output should not contain "Autosign token for: foo.example.com"
+     And the output should not contain "valid until"
+     And the exit status should be 0
+
   Scenario: Generate new reusable token
     Given a pre-shared key of "secret"
       And a hostname of "foo.example.com"

data/lib/autosign/decoder.rb

@@ -23,7 +23,8 @@ module Autosign
       end
 
       # extract challenge password
-      challenge_password = csr.attributes.select { |a| a.oid == 'challengePassword' }.first.value.value.first.value.to_s
+
+      challenge_password = csr.attributes.find { |a| a.oid == 'challengePassword' }.value.value.first.value.to_s
 
       # extract common name
       common_name = /^\/CN=(\S*)$/.match(csr.subject.to_s)[1]

data/lib/autosign/token.rb

@@ -142,16 +142,14 @@ module Autosign
       rescue
         raise Autosign::Token::Invalid
       end
-      certname  = JSON.parse(decoded["data"])["certname"]
-      requester = JSON.parse(decoded["data"])["requester"]
-      reusable  = JSON.parse(decoded["data"])["reusable"]
-      validfor  = JSON.parse(decoded["data"])["validfor"]
+      cert_data = JSON.parse(decoded["data"])
+      new_token = self.new(cert_data["certname"], cert_data["reusable"], cert_data["validfor"],
+                           cert_data["requester"], hmac_secret)
 
-      new_token = self.new(certname, reusable, validfor, requester, hmac_secret)
       new_token.validto = self.token_validto(token, hmac_secret)
-      new_token.uuid = JSON.parse(decoded["data"])["uuid"]
+      new_token.uuid = cert_data["uuid"]
 
-      return new_token
+      new_token
     end
 
     # Extract the expiration time, in seconds since epoch, from a signed token. Uses HMAC secret to validate the expiration time.

data/lib/autosign/validators/multiplexer.rb

@@ -86,11 +86,7 @@ module Autosign
       # or an empty array if none are specified.
       # @return [Array] of policy executables.
       def policy_executables
-        return [] if settings['external_policy_executable'].nil?
-        exec_list = settings['external_policy_executable']
-        return [exec_list] if exec_list.is_a?(String)
-        return exec_list if exec_list.is_a?(Array)
-        return []
+	Array(settings['external_policy_executable'])      
       end
 
 

data/lib/autosign/validators/passwordlist.rb

@@ -32,11 +32,7 @@ module Autosign
       end
 
       def password_list
-        return [] if settings['password'].nil?
-        passwords = settings['password']
-        return [passwords] if passwords.is_a?(String)
-        return passwords if passwords.is_a?(Array)
-        return []
+	Array(settings['password'])      
       end
 
     def validate_settings(settings)

data/lib/autosign/version.rb

@@ -1,3 +1,3 @@
 module Autosign
-  VERSION = '0.0.10'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,250 +1,264 @@
 --- !ruby/object:Gem::Specification
 name: autosign
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
-- Your Name Here
+- Daniel Dreier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: iniparse
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 description: 
-email: your@email.address.com
+email: ddreier@thinkplango.com
 executables:
 - autosign
 - autosign-validator
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -274,33 +288,33 @@ files:
 - spec/specs/token_spec.rb
 - spec/specs/validators/jwt_spec.rb
 - spec/specs/validators/passwordlist_spec.rb
-homepage: http://your.website.com
+homepage: https://github.com/danieldreier/autosign
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - autosign
-- --main
+- "--main"
 - README.rdoc
-- -ri
+- "-ri"
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A description of your project
+summary: Tooling to make puppet autosigning easy, secure, and extensible
 test_files: []