jerakia 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6df8996d25559af0bcf6ad225192a388220ef943
-  data.tar.gz: 74b262c70e3524dea135723ff97d662f0cba4834
+  metadata.gz: ea3f9b99ad3814fc4868f19d64d8f47adf16e940
+  data.tar.gz: 0ff66c99cdff190f8047dfce865cc01e749efa19
 SHA512:
-  metadata.gz: 580bf363db9ee210ad2f78a9b517d4e47ebbfdc24f5141d6d4cdae96eab10fcc8625a0f494c54cad693bb932dfd7b8773796d842af5fb4c71f6a3125a803a631
-  data.tar.gz: ed54de2458ad940e5cc581799d17d1b2391af6baa783670f51245f85c1049cecf78dd9446accf1625094f1e778c8f638736e19217255146f0fb7f1bb6286d926
+  metadata.gz: 1e291ef9b8af754741a04088d6782d1710d2194da4aedc73ddd6a447078e06ad119afca6c338080683300aa2e89be8adea381dba91468790acbcb5ccc97977d9
+  data.tar.gz: 1ffc73296862825e61e8e6eb5ec6c46d6b31b27ce9d47150783879bf4e15762692b9b42fbff07401dd4e15c87aefbb5d84c8c3e53a7bf997ad29af01292e41ff

data/bin/jerakia

@@ -4,5 +4,9 @@ lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'jerakia/cli'
-
-Jerakia::CLI.start(ARGV)
+begin
+  Jerakia::CLI.start(ARGV)
+rescue Jerakia::Error => e
+  STDERR.puts "Error(#{e.class}): #{e.message}"
+  exit 1
+end

data/lib/jerakia/cli.rb

@@ -16,7 +16,6 @@ class Jerakia
     include Jerakia::CLI::Secret
     include Jerakia::CLI::Config
 
-
     desc 'version', 'Version information'
     def version
       puts Jerakia::VERSION

data/lib/jerakia/log.rb

@@ -3,8 +3,9 @@ class Jerakia::Log < Jerakia
   def initialize(level = :info, file = '/var/log/jerakia.log')
     begin
       @@logger = Logger.new(file)
-    rescue Errno::EACCES => e
-      raise Jerakia::Error, "Error opening log file, #{e.message}"
+    rescue Errno::EACCES, Errno::ENOENT => e
+      @@logger = Logger.new(STDOUT)
+      info("Failed to open logfile: #{e.message}, logs will be directed to STDOUT")
     end
 
     @@level = level

data/lib/jerakia/server/auth/token.rb

@@ -26,8 +26,12 @@ class Jerakia
         property :last_seen, DateTime, :default => DateTime.now
       end
 
-      DataMapper.finalize
-      DataMapper.auto_upgrade!
+     begin
+        DataMapper.finalize
+        DataMapper.auto_upgrade!
+      rescue DataObjects::ConnectionError => e
+        raise Jerakia::Error, "Unable to open database file in #{Jerakia.config[:databasedir]}: #{e.message}"
+      end
     end
   end
 end

data/lib/jerakia/server/rest.rb

@@ -1,8 +1,9 @@
 require 'sinatra'
 require 'jerakia'
 require 'jerakia/server/auth'
-require 'json'
 require 'jerakia/scope/server'
+require 'json'
+require 'msgpack'
 
 class Jerakia
   class Server
@@ -44,20 +45,44 @@ class Jerakia
         @authorized_tokens[token] = Time.now
       end
 
+      def encode_result(data)
+        case @content_type
+        when :json
+          return data.to_json
+        when :msgpack
+          return data.to_msgpack
+        end
+      end
+
+      def determine_content_type!
+        if not env.key?('CONTENT_TYPE') or env['CONTENT_TYPE'] == "application/json"
+          content_type 'application/json'
+          @content_type = :json
+        elsif env['CONTENT_TYPE'] == "application/x-msgpack"
+          content_type 'application/x-msgpack'
+          @content_type = :msgpack
+        else
+          wrong_media_type("Content type #{env['CONTENT_TYPE']} not supported", 415)
+        end
+      end
+
       before do
         authenticate!
-        content_type 'application/json'
+        determine_content_type!
       end
 
       get '/' do
         auth_denied
       end
 
+      def wrong_media_type(message, status_code=415)
+        halt(status_code, {'Content-Type' => 'text/plain'}, message)
+      end
+
       def request_failed(message, status_code=501)
-        halt(status_code, {
-          :status => 'failed',
-          :message => message,
-        }.to_json)
+        halt(status_code, 
+             encode_result({ :status => 'failed', 
+                             :message => message }))
       end
 
       def mandatory_params(mandatory, params)
@@ -98,31 +123,27 @@ class Jerakia
         rescue Jerakia::Error => e
           request_failed(e.message, 501)
         end
-        {
-          :status => 'ok',
-          :payload => answer.payload
-        }.to_json
+        encode_result({ :status => 'ok', 
+                        :payload => answer.payload})
       end
 
       get '/v1/scope/:realm/:identifier' do
         resource = Jerakia::Scope::Server.find(params['realm'], params['identifier'])
         if resource.nil?
-          halt(404, { :status => 'failed', :message => "No scope data found" }.to_json)
+          halt(404, 
+               encode_result({:status => 'failed', 
+                              :message => "No scope data found"}))
         else
-          {
-            :status => 'ok',
-            :payload => resource.scope
-          }.to_json
+          encode_result({:status => 'ok',
+                         :payload => resource.scope})
         end
       end
 
       put '/v1/scope/:realm/:identifier' do
         scope = JSON.parse(request.body.read)
         uuid = Jerakia::Scope::Server.store(params['realm'], params['identifier'], scope)
-        {
-          :status => 'ok',
-          :uuid => uuid
-        }.to_json
+        encode_result({:status => 'ok',
+                       :uuid => uuid})
       end
 
       get '/v1/scope/:realm/:identifier/uuid' do
@@ -130,10 +151,8 @@ class Jerakia
         if resource.nil?
           request_failed('No scope data found', 404)
         else
-          {
-            :status => 'ok',
-            :uuid => resource.uuid
-          }.to_json
+          encode_result({:status => 'ok',
+                         :uuid => resource.uuid})
         end
       end
     end

data/lib/jerakia/version.rb

@@ -3,5 +3,5 @@ class Jerakia
   #
   # This should be updated when a new gem is released and it is read from the gemspec file
   #
-  VERSION = '2.3.0'.freeze
+  VERSION = '2.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jerakia
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: Extendable and flexible data lookup system
 email: 
 executables: