onering-client 0.0.99 → 0.1.1

data/lib/onering.rb

@@ -2,7 +2,7 @@ $: << File.expand_path(File.dirname(__FILE__))
 
 module Onering
   module Client
-    VERSION = "0.0.99"
+    VERSION = "0.1.1"
 
     class Error < Exception; end
     class FatalError < Error; end

data/lib/onering/api.rb

@@ -212,14 +212,7 @@ module Onering
 # -----------------------------------------------------------------------------
     def _setup_auth()
       type = Onering::Config.get('authentication.type', :auto)
-
-      case type.to_sym
-      when :token
-        _setup_auth_token()
-
-      else
-        _setup_auth_ssl()
-      end
+      _setup_auth_token()
     end
 
 # -----------------------------------------------------------------------------
@@ -230,33 +223,19 @@ module Onering
     end
 
 # -----------------------------------------------------------------------------
-    def _setup_auth_ssl()
-      begin
-        Onering::Logger.info("Using SSL authentication mechanism", "Onering::API")
-
-      # get first keyfile found
-        key = (([Onering::Config.get('authentication.keyfile')] + DEFAULT_CLIENT_PEM).compact.select{|i|
-          rv = (File.readable?(File.expand_path(i)) rescue false)
-          Onering::Logger.debug("SSL keyfile found at #{File.expand_path(i)}", "Onering::API") if rv === true
-          rv
-        }).first
-
-      # SSL client key not found, attempt autoregistration...
-        if key.nil?
-          if Onering::Config.get('authentication.autoregister', true)
-            Onering::Logger.warn("SSL keyfile not found, attempting to autoregister client", "Onering::API")
-
-            validation_key = Onering::Config.get('authentication.validation_keyfile', DEFAULT_VALIDATION_PEM)
-            validation_key = (File.expand_path(validation_key) rescue validation_key)
+    def _setup_auth_token()
+      Onering::Logger.info("Using token authentication mechanism", "Onering::API")
 
-          # if validation key exists, autoregister
-            if File.size?(validation_key)
-              Onering::Logger.debug("Using validation key at #{validation_key}", "Onering::API")
+    # get first keyfile found
+      key = Onering::Config.get('authentication.key', Onering::Config.get('authentication.keyfile'))
 
-            # set the authentication PEM to validation.pem
-              Onering::API.pem(File.read(validation_key))
+      if key.nil?
+        if Onering::Config.get('authentication.bootstrap.enabled', true)
+          Onering::Logger.warn("Authentication token not found, attempting to autoregister client", "Onering::API")
 
-            # attempt to create client.pem from least-specific to most, first writable path wins
+          if not (bootstrap = Onering::Config.get('authentication.bootstrap.key')).nil?
+            if bootstrap.to_s =~ /[0-9a-f]{32,64}/
+            # attempt to create key.yml from least-specific to most, first writable path wins
               clients = [{
                 :path       => "/etc/onering",
                 :name       => fact('hardwareid'),
@@ -273,54 +252,54 @@ module Onering
               clients.each do |client|
               # expand and assemble path
                 client[:path] = (File.expand_path(client[:path]) rescue client[:path])
-                keyfile = File.join(client[:path], 'client.pem')
+                keyfile = File.join(client[:path], 'key.yml')
 
               # skip this if we can't write to the parent directory
                 next unless File.writable?(client[:path])
                 Dir.mkdir(client[:path]) unless File.directory?(client[:path])
                 next if File.exists?(keyfile)
 
+                self.class.headers({
+                  'X-Auth-Bootstrap-Token' => bootstrap
+                })
+
               # attempt to create/download the keyfile
-                Onering::Logger.debug("Requesting SSL keyfile as client #{client[:name].strip}, key #{client[:keyname]}", "Onering::API")
-                response = self.class.get("/api/users/#{client[:name].strip}/keys/#{client[:keyname]}")
+                Onering::Logger.debug("Requesting authentication token for #{client[:name].strip}; #{bootstrap}", "Onering::API")
+                response = self.class.get("/api/users/#{client[:name].strip}/tokens/#{client[:keyname]}")
 
               # if successful, write the file
                 if response.code < 400 and response.body
-                  File.open(keyfile, 'w').puts(response.body)
-                  raise Actions::Retry.new
+                  File.open(keyfile, 'w').puts(YAML.dump({
+                    'authentication' => {
+                      'key' => response.body.strip.chomp
+                    }
+                  }))
+
+                  key = response.body.strip.chomp
+
                 else
               # all errors are fatal at this stage
                   Onering::Logger.fatal!("Cannot autoregister client: HTTP #{response.code} - #{(response.parsed_response || {}).get('error.message', 'Unknown error')}", "Onering::API")
                 end
-              end
 
-            # it is an error to not have created a client.pem by now
-              raise Errors::AuthenticationMissing.new("Cannot autoregister client: keyfile not created")
+                self.class.headers({})
 
+              # we're done here...
+                break
+              end
             else
-            # cannot autoregister without a validation.pem
-              raise Errors::AuthenticationMissing.new("Cannot autoregister client: validation keyfile is missing")
+              raise Errors::AuthenticationMissing.new("Autoregistration failed: invalid bootstrap token specified")
             end
+         
           else
-            raise Errors::AuthenticationMissing.new("Cannot find SSL key and autoregistration is disabled")
+            raise Errors::AuthenticationMissing.new("Autoregistration failed: no bootstrap token specified")
           end
+
         else
-          Onering::API.pem(File.read((File.expand_path(key) rescue key)))
-          Onering::Logger.debug("Using SSL keyfile #{File.expand_path(key) rescue key}", "Onering::API")
+          raise Errors::AuthenticationMissing.new("Authentication token not found, and autoregistration disabled")
         end
-
-      rescue Actions::Retry
-        retry
       end
-    end
-
 
-# -----------------------------------------------------------------------------
-    def _setup_auth_token()
-      Onering::Logger.info("Using token authentication mechanism", "Onering::API")
-
-    # get first keyfile found
-      key = Onering::Config.get('authentication.key', Onering::Config.get('authentication.keyfile'))
       raise Errors::AuthenticationMissing.new("Token authentication specified, but cannot find a token config or as a command line argument") if key.nil?
 
     # set auth mechanism
@@ -332,4 +311,4 @@ module Onering
       _default_param(:token, key)
     end
   end
-end
+end

data/lib/onering/config.rb

@@ -5,7 +5,7 @@ module Onering
   class Config
     class<<self
       DEFAULT_CONFIG={}
-      DEFAULT_OPTIONS_FILE=["~/.onering/cli.yml", "/etc/onering/cli.yml"]
+      DEFAULT_OPTIONS_FILE=["~/.onering/cli.yml", "~/.onering/key.yml", "/etc/onering/cli.yml", "/etc/onering/key.yml"]
 
       def load(configfile=nil, config={})
         if configfile.nil?
@@ -56,4 +56,4 @@ module Onering
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-client
 version: !ruby/object:Gem::Version
-  version: 0.0.99
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &20444300 !ruby/object:Gem::Requirement
+  requirement: &24589080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *20444300
+  version_requirements: *24589080
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &20443800 !ruby/object:Gem::Requirement
+  requirement: &24588580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *20443800
+  version_requirements: *24588580
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &20442380 !ruby/object:Gem::Requirement
+  requirement: &24588080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *20442380
+  version_requirements: *24588080
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &20457580 !ruby/object:Gem::Requirement
+  requirement: &24587560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *20457580
+  version_requirements: *24587560
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: &20456440 !ruby/object:Gem::Requirement
+  requirement: &24587060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.0.35
   type: :runtime
   prerelease: false
-  version_requirements: *20456440
+  version_requirements: *24587060
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &20454860 !ruby/object:Gem::Requirement
+  requirement: &24586560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 1.7.9
   type: :runtime
   prerelease: false
-  version_requirements: *20454860
+  version_requirements: *24586560
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &20453980 !ruby/object:Gem::Requirement
+  requirement: &24586080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -87,10 +87,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *20453980
+  version_requirements: *24586080
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &20452860 !ruby/object:Gem::Requirement
+  requirement: &24606560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *20452860
+  version_requirements: *24606560
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &20451600 !ruby/object:Gem::Requirement
+  requirement: &24606100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,7 +109,7 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *20451600
+  version_requirements: *24606100
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
 executables:
@@ -117,22 +117,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/onering.rb
+- lib/onering/config.rb
 - lib/onering/logger.rb
 - lib/onering/cli.rb
-- lib/onering/config.rb
-- lib/onering/api.rb
-- lib/onering/util.rb
-- lib/onering/plugins/authentication.rb
-- lib/onering/plugins/reporter.rb
 - lib/onering/plugins/devices.rb
+- lib/onering/plugins/reporter.rb
+- lib/onering/plugins/authentication.rb
 - lib/onering/plugins/automation.rb
-- lib/onering/cli/reporter.rb
 - lib/onering/cli/devices.rb
+- lib/onering/cli/reporter.rb
 - lib/onering/cli/config.rb
-- lib/onering/cli/automation.rb
 - lib/onering/cli/fact.rb
+- lib/onering/cli/automation.rb
 - lib/onering/cli/call.rb
+- lib/onering/api.rb
+- lib/onering/util.rb
+- lib/onering.rb
 - bin/onering
 homepage: https://github.com/outbrain/onering-ruby
 licenses: []