config_server_agent 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76a3615bd2968fdf6a96cf2ec723df57b7c88f66aa559ac1517429b668903009
-  data.tar.gz: 1bbff77e71428bf4a7ab3bb6bdc567d4e0dc03c90af8b19720f0574a7b251a6c
+  metadata.gz: 4e3d6581bda6a587bc6628494ec47820bcf2e5670ba391e861e17fb689c8c0d7
+  data.tar.gz: 2969a8c10265b6dfef34051c8918bbabc1eda695d927b7ae56ff441002424545
 SHA512:
-  metadata.gz: 3ed40e76e65941e4a50e44d25d051fad0b2c0705dd3c3946ea1072e8a0ff28db985dce68b18bd6b276c941fcba0720a34fb1258380bc717c7da810914c3b2db4
-  data.tar.gz: a8980371e9cf8bea67a0ae43ab0548ac9759f349ba789b768bff4831dbad6c6e14511116e916a4a2b261f9b780a5aee364033773900de544f693e9d122478f10
+  metadata.gz: bfbeb9ac2b16410f4bfc1582f2a6ca76eb781f1653db46967ceef96939d74f851ffac2b37ea5df7ca57463d85e9314809e99a9ee4a5ab3a245ec72eaecc0ecc5
+  data.tar.gz: b12053703a2605979953cc311abcf53e6476ff4fab39e255360815047d860428659eb3b1c0153cb9a0b412464e6a6ff2905d8f4696cf713e38ed948bc9835c4b

data/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.4.0
+### Changed
+- Removed dependence on Auth0 M2M tokens
+
 ## 0.3.8
 ### Changed
 - More resiliant cache file permission handling

data/lib/config_server_agent.rb

@@ -10,22 +10,11 @@ class ConfigServerAgent
 	class Error < StandardError; end
 
 	def initialize(
-		auth0_client_id:        ENV['AUTH0_CLIENT_ID'],
-		auth0_client_secret:    ENV['AUTH0_CLIENT_SECRET'],
-		auth0_host:             ENV['AUTH0_HOST'],
-		config_server_audience: ENV['CONFIG_SERVER_AUDIENCE'],
 		config_server_api_key:  ENV['CONFIG_SERVER_API_KEY'],
 		config_server_host:     ENV['CONFIG_SERVER_HOST'],
 		user_agent:             "ConfigServerAgent/#{ConfigServerAgent::VERSION}",
-		user_agent_comment:     nil,
-		token_ttl:              nil,
-		use_cache:              false,
-		cache_file:             nil
+		user_agent_comment:     nil
 	)
-		@auth0_client_id        = auth0_client_id        or raise ArgumentError, 'Missing auth0_client_id parameter'
-		@auth0_client_secret    = auth0_client_secret    or raise ArgumentError, 'Missing auth0_client_secret parameter'
-		@auth0_host             = auth0_host             or raise ArgumentError, 'Missing auth0_host parameter'
-		@config_server_audience = config_server_audience or raise ArgumentError, 'Missing config_server_audience parameter'
 		@config_server_api_key  = config_server_api_key  or raise ArgumentError, 'Missing config_server_api_key parameter'
 		@config_server_host     = config_server_host     or raise ArgumentError, 'Missing config_server_host parameter'
 
@@ -33,14 +22,6 @@ class ConfigServerAgent
 		@mutex      = Mutex.new
 		@user_agent = user_agent
 		@user_agent += " (#{user_agent_comment})" if user_agent_comment
-
-		@token_expires = nil
-		@token         = nil
-		@token_ttl     = token_ttl
-		@token_buffer  = 10 # seconds
-
-		@use_cache     = use_cache
-		@cache_file    = cache_file || '/tmp/' + Digest::SHA1.hexdigest("#{auth0_client_id}/#{ConfigServerAgent::VERSION}") + '.json'
 	end
 
 	def get_config
@@ -104,13 +85,11 @@ class ConfigServerAgent
 
 		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)
@@ -127,74 +106,4 @@ class ConfigServerAgent
 		raise Error, "Invalid JSON received from #{@config_server_host}"
 	end
 
-	def get_token
-		if @token.nil? and @use_cache
-			read_token_cache
-		end
-
-		if @token.nil? or (@token_expires and @token_expires < Time.now.to_i)
-			request_new_token
-			write_token_cache if @use_cache
-		end
-
-		@token
-	end
-
-	def request_new_token
-		url  = URI "https://#{@auth0_host}/oauth/token"
-		http = Net::HTTP.new url.host, url.port
-		http.use_ssl = url.scheme == 'https'
-
-		request = Net::HTTP::Post.new url
-		request['user-agent'] = @user_agent
-		request['content-type'] = 'application/json'
-		request.body = {
-			client_id:     @auth0_client_id,
-			client_secret: @auth0_client_secret,
-			audience:      @config_server_audience,
-			grant_type:    'client_credentials',
-		}.to_json
-
-		response = JSON.parse http.request(request).read_body
-		@token = response['access_token'] or raise Error, "No token from #{@auth0_host}"
-		@token_expires = Time.now.to_i + (@token_ttl || response['expires_in']) - @token_buffer
-
-		@token
-
-	rescue JSON::ParserError
-		raise Error, "Invalid JSON received from #{@auth0_host}"
-	end
-
-	def read_token_cache
-		with_lock do
-			@token, @token_expires = JSON.parse(File.read @cache_file).values_at 'token', 'token_expires'
-		end if File.file? @cache_file
-	end
-
-	def write_token_cache
-		with_lock do
-			File.write(@cache_file, {
-				'token' => @token,
-				'token_expires' => @token_expires
-			}.to_json)
-
-			# Check if o+wr bits are set on the cache file
-			if File.stat(@cache_file).mode & 06 > 0
-				begin
-					# Attempt to remove them if they are...
-					File.chmod 0660, @cache_file
-				rescue Errno::EPERM => e
-					# But don't raise an error if it fails because the file may have been created by another user
-					warn "File permissions are too open: #{@cache_file} - #{e.message}"
-				end
-			end
-		end
-	end
-
-	def with_lock
-		Lockfile.new("/var/lock/config_server_agent.rb.lock", retries: 3, poll_retries: 3) do
-			yield
-		end
-	end
-
 end

data/lib/config_server_agent/version.rb

@@ -1,3 +1,3 @@
 class ConfigServerAgent
-	VERSION = '0.3.8'
+	VERSION = '0.4.0'
 end

metadata

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