config_server_agent 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14de15ba41b3745d5e2bb54a29534d0a47aa58af4d5c029b2b9b611eec62865f
-  data.tar.gz: 9f45eb09fa4ee9d0b3b4c9d12e374b42e65350502cf5d4c27cbcbe95fff92cdd
+  metadata.gz: 6c19545cad82df1e4454c662b5df2903dc657ce7fba1fe434beb5f5a8bc3465e
+  data.tar.gz: 9370374949fd090acaf8b7b1e1eb6b14131b563084b3a6bf393b9b70839b6036
 SHA512:
-  metadata.gz: d5c12f02a2b353c43b38a62823c08b9f94ad138346544b660d127d5ec5bb1b40024c0e2e1ba8b9d942ff0ad95da85992605847cd1ed0a8ca73581dccccb56327
-  data.tar.gz: 9d47199e4a9df1f295bfd29c598cd9fc8c5f4d8b701251378744198107e6dbd4a34a12d47406bc37142c7415b97659413e5afae2762172ad7ae7fdb9a5165dd2
+  metadata.gz: 64afbc8473f29730780fadad2f5dfa18c1c8c219b0892f943cdb0b775dfed6c2ac1481ce2faefec19325d34d725f6e7b5616c795e738065bc91ee1bb15523bff
+  data.tar.gz: ce866d94120d96437d2746d83cb6888c85fda5e7d310b7e5fdaf27e03110fe21b7ca05114c8e9eaa3f2934c8443f73d8484ad2443101417df22eeb9ba71992df

data/.travis.yml

@@ -3,5 +3,11 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.5.1
-before_install: gem install bundler -v 1.17.1
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - jruby
+script:
+  - bundle exec rake
+  - bundle exec bundle-audit check --update

data/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.3.6
+### Changed
+- Better error handling
+- Tidier and more comprehensive unit tests
+
+## 0.3.5
+### Changed
+- Set better cache file permissions
+
 ## 0.3.4 - 2019-06-12
 ### Changed
 - Added optional token caching

data/config_server_agent.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
 
 	spec.required_ruby_version = '>= 2.3.0'
 
-	spec.add_dependency 'lockfile', '~> 2.1'
+	spec.add_runtime_dependency 'lockfile', '~> 2.1'
 
 	spec.add_development_dependency 'bundler', '~> 1.17'
 	spec.add_development_dependency 'rake', '~> 10.0'

data/lib/config_server_agent/version.rb

@@ -1,3 +1,3 @@
 class ConfigServerAgent
-	VERSION = '0.3.4'
+	VERSION = '0.3.6'
 end

data/lib/config_server_agent.rb

@@ -37,7 +37,7 @@ class ConfigServerAgent
 		@token_expires = nil
 		@token         = nil
 		@token_ttl     = token_ttl
-		@token_buffer  = 10
+		@token_buffer  = 10 # seconds
 
 		@use_cache     = use_cache
 		@cache_file    = cache_file || '/tmp/' + Digest::SHA1.hexdigest("#{auth0_client_id}/#{ConfigServerAgent::VERSION}") + '.json'
@@ -83,35 +83,45 @@ class ConfigServerAgent
 	private
 
 	def post_request(endpoint, data={})
-		url          = URI "#{@config_server_host}/api/#{endpoint}"
-		http         = Net::HTTP.new url.host, url.port
-		http.use_ssl = url.scheme == 'https'
-
-		request = Net::HTTP::Post.new url
-		configure_request request
-		request.body = data.to_json
-
-		JSON.parse http.request(request).read_body
+		dispatch_request(endpoint) do |url|
+			request = Net::HTTP::Post.new url
+			request.body = data.to_json
+			request
+		end
 	end
 
 	def get_request(endpoint, data={})
+		dispatch_request(endpoint) do |url|
+			url.query = URI.encode_www_form data
+			Net::HTTP::Get.new url
+		end
+	end
+
+	def dispatch_request(endpoint)
 		url          = URI "#{@config_server_host}/api/#{endpoint}"
-		url.query    = URI.encode_www_form data
 		http         = Net::HTTP.new url.host, url.port
 		http.use_ssl = url.scheme == 'https'
 
-		request = Net::HTTP::Get.new url
-		configure_request request
-
-		JSON.parse http.request(request).read_body
-	end
-
-	def configure_request(request)
+		request = yield url
 		request['user-agent']    = @user_agent
 		request['authorization'] = "Bearer #{get_token}"
 		request['content-type']  = 'application/json'
 		request['accept']        = 'application/json'
 		request['api-key']       = @config_server_api_key
+
+		process_response http.request(request)
+
+	end
+
+	def process_response(response)
+		raise Error, "Unexpected content-type from server: #{response['content-type']}" unless response['content-type'] == 'application/json'
+		data = JSON.parse response.read_body
+
+		raise Error, "Config Server error: #{data['error']}" unless Net::HTTPSuccess === response
+		data
+
+	rescue JSON::ParserError
+		raise Error, "Invalid JSON received from #{@config_server_host}"
 	end
 
 	def get_token
@@ -149,7 +159,7 @@ class ConfigServerAgent
 		@token
 
 	rescue JSON::ParserError
-		raise Error, "Invalid response from #{@auth0_host}"
+		raise Error, "Invalid JSON received from #{@auth0_host}"
 	end
 
 	def read_token_cache
@@ -164,6 +174,7 @@ class ConfigServerAgent
 				'token' => @token,
 				'token_expires' => @token_expires
 			}.to_json)
+			FileUtils.chmod 'ug=rw,o=', @cache_file
 		end
 	end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_server_agent
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Aidan Samuel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lockfile