reedb 0.10.rc1 → 0.11

data/lib/reedb/daemon_wrapper.rb

@@ -18,7 +18,14 @@ require 'sinatra'
 require 'rack'
 
 # Reedb requirements
-require 'reedb'
+# This rescue block fixes the issue where reedbd could not be run without system integration
+begin
+	require 'reedb'
+rescue LoadError => e
+	require_relative '../reedb'
+end
+
+require_relative 'errors/exit_errors'
 
 # HTTP handler class that registers the functions
 # for the vault interface
@@ -32,15 +39,15 @@ class ReedbHandler < Sinatra::Base
 	# 	 PUT 	/vaults/scope 								Scope a vault that already exists
 
 	# 	 POST 	/vaults/*vault-id*/request_token			Auth for vault with ID
-# [AUTH] POST 	/vaults/*vault-id*/headers					Return vault headers
-# [AUTH] POST 	/vaults/*vault-id*/close					Close vault with ID
+	# [AUTH] POST 	/vaults/*vault-id*/headers					Return vault headers
+	# [AUTH] POST 	/vaults/*vault-id*/close					Close vault with ID
 
-# [AUTH] POST 	/vaults/*vault-id*/files/*file-id*			Returns body of a file
-# [AUTH] POST 	/vaults/*vault-id*/files/*file-id*/history	Returns history of a file (???)
+	# [AUTH] POST 	/vaults/*vault-id*/files/*file-id*			Returns body of a file
+	# [AUTH] POST 	/vaults/*vault-id*/files/*file-id*/history	Returns history of a file (???)
 
-# [AUTH] PUT 	/vaults/*vault-id*/files					Create file
-# [AUTH] POST 	/vaults/*vault-id*/files/*file-id*			Update file contents
-# [AUTH] POST 	/vaults/*vault-id*/files/*file-id*/remove	Removes a file
+	# [AUTH] PUT 	/vaults/*vault-id*/files					Create file
+	# [AUTH] POST 	/vaults/*vault-id*/files/*file-id*			Update file contents
+	# [AUTH] POST 	/vaults/*vault-id*/files/*file-id*/remove	Removes a file
 
 	configure :production, :development do
 		enable :logging
@@ -50,8 +57,8 @@ class ReedbHandler < Sinatra::Base
 		status status_code # Set http status code
 		content_type 'application/json'
 		response = { 'success' => (status_code >= 400 ? false : true),
-					 'message' => message,
-					 'payload' => payload }
+		             'message' => message,
+		             'payload' => payload }
 		return response.to_json
 	end
 
@@ -66,7 +73,7 @@ class ReedbHandler < Sinatra::Base
 
 		# If request was garbage
 		unless request.content_type == 'application/json'
-	   		return build_response(400, 'Data was malformed. Expects JSON!')
+			return build_response(400, 'Data was malformed. Expects JSON!')
 		end
 
 		# Check if the JSON data
@@ -74,7 +81,7 @@ class ReedbHandler < Sinatra::Base
 		begin
 			data = JSON.parse(request.body.read)
 		rescue
-			return build_response(400, 'JSON data was malformed!')	
+			return build_response(400, 'JSON data was malformed!')
 		end
 
 		name = data["name"] if data["name"]
@@ -83,8 +90,8 @@ class ReedbHandler < Sinatra::Base
 		encryption = :auto # TODO: Handle this better!
 
 		# This gets fired if not all neccesary information was provided.
-		if name == nil && path == nil && passphrase == nil
-			return build_response(400, 'Required data fields are missing from JSON data body!')	
+		if name == nil || path == nil || passphrase == nil
+			return build_response(400, 'Required data fields are missing from JSON data body!')
 		end
 
 		# Now deal with the actual stuff
@@ -92,25 +99,26 @@ class ReedbHandler < Sinatra::Base
 
 		# Catches ALL possible errors that can occur during this operation!
 		begin
-			token = Reedb::Vault::create_vault(name, path, passphrase, encryption)
+			token = Reedb::Vault::create_vault(name, path, passphrase)
 		rescue InsecureUserPasswordError => e
 			return build_response(400, e.message)
 
 		rescue VaultExistsAtLocationError => e
 			return build_response(409, e.message)
 
+				# Thank you descriptive exception messages
 		rescue VaultWritePermissionsError,
-			   VaultMissingConfigurationError,
-			   VaultLoggerError,
-			   BadCacheError,
-			   EncryptionFailedError,
-			   DecryptionFailedError => e
+			 VaultMissingConfigurationError,
+			 VaultLoggerError,
+			 BadCacheError,
+			 EncryptionFailedError,
+			 DecryptionFailedError => e
 
 			# Bundled error return
 			return build_response(500, e.message)
 		end
 
-		return build_response(201, "Vault was successfully crated at location", token)
+		return build_response(201, 'Vault was successfully crated at location', token)
 	end
 
 	# Scope a new vault on the system.
@@ -125,14 +133,14 @@ class ReedbHandler < Sinatra::Base
 		begin
 			data = JSON.parse(request.body.read)
 		rescue
-			return build_response(400, 'JSON data was malformed!')	
+			return build_response(400, 'JSON data was malformed!')
 		end
 
-		name = data["name"] if data["name"]
-		path = data["path"] if data["path"]
+		name = data['name'] ? data['name'] : nil
+		path = data['path'] ? data['path'] : nil
 
-		if name == nil && path == nil
-			return build_response(400, 'Required data fields are missing from JSON data body!')	
+		if name == nil || path == nil
+			return build_response(400, 'Required data fields are missing from JSON data body!')
 		end
 
 		begin
@@ -142,7 +150,7 @@ class ReedbHandler < Sinatra::Base
 		end
 
 		# If everything went well
-		return build_response(200, "Vault successfully scoped. It is now available to load.")
+		return build_response(200, 'Vault successfully scoped. It is now available to load.')
 	end
 
 	put '/vaults/unscope' do
@@ -156,14 +164,14 @@ class ReedbHandler < Sinatra::Base
 		begin
 			data = JSON.parse(request.body.read)
 		rescue
-			return build_response(400, 'JSON data was malformed!')	
+			return build_response(400, 'JSON data was malformed!')
 		end
 
 		name = data["name"] if data["name"]
 		path = data["path"] if data["path"]
 
-		if name == nil && path == nil
-			return build_response(400, 'Required data fields are missing from JSON data body!')	
+		if name == nil || path == nil
+			return build_response(400, 'Required data fields are missing from JSON data body!')
 		end
 
 		begin
@@ -174,14 +182,12 @@ class ReedbHandler < Sinatra::Base
 
 		# If everything went well
 		return build_response(200, "Vault successfully unscoped and will not show up in vault lists anymore.")
-	end 
+	end
 
 	#  Request a token for a vault
 	post '/vaults/*/request_token' do
 		vault_uuid = params[:splat][0]
 
-		puts vault_uuid
-
 		if vault_uuid == nil
 			return build_response(400, 'Missing vault access id.')
 		end
@@ -196,14 +202,14 @@ class ReedbHandler < Sinatra::Base
 		begin
 			data = JSON.parse(request.body.read)
 		rescue
-			return build_response(400, 'JSON data was malformed!')	
+			return build_response(400, 'JSON data was malformed!')
 		end
 
-		passphrase = data["passphrase"] if data["passphrase"]
+		passphrase = data['passphrase'] if data['passphrase']
 		permanent = false # TODO: Implement this!
 
-		if passphrase == nil && permanent == nil
-			return build_response(400, 'Required data fields are missing from JSON data body!')	
+		if passphrase == nil || permanent == nil
+			return build_response(400, 'Required data fields are missing from JSON data body!')
 		end
 
 		token = nil
@@ -213,7 +219,7 @@ class ReedbHandler < Sinatra::Base
 			return build_response(404, e.message)
 
 		rescue WrongUserPasswordError => e
-			return build_response(401, e.message)			
+			return build_response(401, e.message)
 		end
 
 		return build_response(200, "Access successfully granted for vault", token)
@@ -222,7 +228,7 @@ class ReedbHandler < Sinatra::Base
 	post '/vaults/*/free_token' do
 		vault_uuid = params[:splat][0]
 
-		unless vault_uuid 
+		unless vault_uuid
 			return build_response(400, 'Missing vault access id.')
 		end
 
@@ -236,13 +242,13 @@ class ReedbHandler < Sinatra::Base
 		begin
 			data = JSON.parse(request.body.read)
 		rescue
-			return build_response(400, 'JSON data was malformed!')	
+			return build_response(400, 'JSON data was malformed!')
 		end
 
 		token = data["token"] if data["token"]
 
 		if token == nil
-			return build_response(400, 'Required data fields are missing from JSON data body!')	
+			return build_response(400, 'Required data fields are missing from JSON data body!')
 		end
 
 		begin
@@ -258,7 +264,7 @@ class ReedbHandler < Sinatra::Base
 	post '/vaults/*/close' do
 		vault_uuid = params[:splat][0]
 
-		unless vault_uuid 
+		unless vault_uuid
 			return build_response(400, 'Missing vault access id.')
 		end
 
@@ -272,18 +278,18 @@ class ReedbHandler < Sinatra::Base
 		begin
 			data = JSON.parse(request.body.read)
 		rescue
-			return build_response(400, 'JSON data was malformed!')	
+			return build_response(400, 'JSON data was malformed!')
 		end
 
-		token = data["token"] if data["token"]
-		
+		token = data['token'] if data['token']
+
 		unless token
-			return build_response(400, 'Required data fields are missing from JSON data body!')	
+			return build_response(400, 'Required data fields are missing from JSON data body!')
 		end
 
 		begin
 			Reedb::Vault::close_vault(vault_uuid, token)
-		
+
 		rescue VaultNotAvailableError => e
 			return build_response(404, e.message)
 
@@ -298,14 +304,13 @@ class ReedbHandler < Sinatra::Base
 		end
 
 		return build_response(200, "Vault #{vault_uuid} successfully closed.")
-
 	end
 
 	# [AUTH] Request headers for a vault with token/ id
 	post '/vaults/*/headers' do
 		vault_uuid = params[:splat][0]
 
-		if vault_uuid == nil 
+		if vault_uuid == nil
 			return build_response(400, 'Missing vault access id.')
 		end
 
@@ -319,20 +324,20 @@ class ReedbHandler < Sinatra::Base
 		begin
 			data = JSON.parse(request.body.read)
 		rescue
-			return build_response(400, 'JSON data was malformed!')	
+			return build_response(400, 'JSON data was malformed!')
 		end
 
 		token = data["token"] if data["token"]
 		search = data["search"] if data["search"]
 
 		if token == nil
-			return build_response(400, 'Required data fields are missing from JSON data body!')	
+			return build_response(400, 'Required data fields are missing from JSON data body!')
 		end
 
 		headers = nil
 		begin
 			headers = Reedb::Vault::access_headers(vault_uuid, token, search)
-		
+
 		rescue VaultNotAvailableError => e
 			return build_response(404, e.message)
 
@@ -350,11 +355,11 @@ class ReedbHandler < Sinatra::Base
 	end
 
 	# [AUTH] Return body of a file
-	post '/vaults/*/files/*' do
+	post '/vaults/*/files/*/body' do
 		vault_uuid = params[:splat][0]
 		file_id = params[:splat][1]
 
-		unless vault_uuid 
+		unless vault_uuid
 			return build_response(400, 'Missing vault access id.')
 		end
 
@@ -368,21 +373,16 @@ class ReedbHandler < Sinatra::Base
 		begin
 			data = JSON.parse(request.body.read)
 		rescue
-			return build_response(400, 'JSON data was malformed!')	
+			return build_response(400, 'JSON data was malformed!')
 		end
 
-		token = data["token"].delete!("\n") if data["token"]
+		token = data['token'] if data['token']
 
-		puts "#{token}\n"
-		puts "#{Reedb::Config::Master::dump_config}\n"
-
-		unless token
-			return build_response(400, 'Required data fields are missing from JSON data body!')	
-		end
+		return build_response(400, 'Required data fields are missing from JSON data body!') if token == nil
 
 		file = nil
 		begin
-			file = Reedb::Vault::access_file(vault_uuid, file_id, token, false)
+			file = Reedb::Vault::access_file(vault_uuid, token, file_id, false)
 		rescue FileNotFoundError => e
 			return build_response(404, e.message)
 
@@ -396,7 +396,7 @@ class ReedbHandler < Sinatra::Base
 			return build_response(403, e.message)
 
 		end
-		return build_response(200, "File read without version history", file)
+		return build_response(200, 'File read without version history', file)
 	end
 
 	# [AUTH] Return history of a file
@@ -404,7 +404,7 @@ class ReedbHandler < Sinatra::Base
 		vault_uuid = params[:splat][0]
 		file_id = params[:splat][1]
 
-		unless vault_uuid 
+		unless vault_uuid
 			return build_response(400, 'Missing vault access id.')
 		end
 
@@ -418,21 +418,18 @@ class ReedbHandler < Sinatra::Base
 		begin
 			data = JSON.parse(request.body.read)
 		rescue
-			return build_response(400, 'JSON data was malformed!')	
+			return build_response(400, 'JSON data was malformed!')
 		end
 
-		token = data["token"].delete!("\n") if data["token"]
-
-		puts "#{token}\n"
-		puts "#{Reedb::Config::Master::dump_config}\n"
+		token = data['token'] if data['token']
 
 		unless token
-			return build_response(400, 'Required data fields are missing from JSON data body!')	
+			return build_response(400, 'Required data fields are missing from JSON data body!')
 		end
 
 		file = nil
 		begin
-			file = Reedb::Vault::access_file(vault_uuid, file_id, token, true)
+			file = Reedb::Vault::access_file(vault_uuid, token, file_id, true)
 		rescue FileNotFoundError => e
 			return build_response(404, e.message)
 
@@ -453,7 +450,7 @@ class ReedbHandler < Sinatra::Base
 	put '/vaults/*/files' do
 		vault_uuid = params[:splat][0]
 
-		unless vault_uuid 
+		unless vault_uuid
 			return build_response(400, 'Missing vault access id.')
 		end
 
@@ -467,39 +464,39 @@ class ReedbHandler < Sinatra::Base
 		begin
 			data = JSON.parse(request.body.read)
 		rescue
-			return build_response(400, 'JSON data was malformed!')	
+			return build_response(400, 'JSON data was malformed!')
 		end
 
-		token = data["token"] if data["token"]
-		name = data["name"] if data["name"]
-		file_data = data["data"] if data["data"]
+		token = data['token'] if data['token']
+		name = data['name'] if data['name']
+		file_data = data['data'] if data['data']
 
-		unless token && name && file_data
-			return build_response(400, 'Required data fields are missing from JSON data body!')	
+		if token == nil || name == nil || file_data == nil
+			return build_response(400, 'Required data fields are missing from JSON data body!')
 		end
 
 		headers = Reedb::Vault::access_headers(vault_uuid, token, nil)
-		unless headers.include?(name)
-			return build_response(400, "File already exists. Use update POST instead.")
-		end
+		return build_response(400, 'File already exists. Use update POST instead.') if headers.include?(name)
 
-		response = nil
 		begin
-			response = Reedb::Vault::insert(vault_uuid, token, name, file_data)
+			Reedb::Vault::insert(vault_uuid, token, name, file_data)
 		rescue VaultNotAvailableError => e
 			return build_response(404, e.message)
-			
+
 		rescue UnknownTokenError => e
 			return build_response(401, e.message)
-			
+
 		rescue UnautherisedTokenError => e
 			return build_response(403, e.message)
-			
+
 		rescue FileBusyError => e
 			return build_response(418, "Dont take this error code too seriously: #{e.message}")
 		end
 
-		return build_response(200, "File successfully created!")
+		headers = Reedb::Vault::access_headers(vault_uuid, token, nil)
+
+		# Adds the file name as a handle to the payload so that it can be referenced in a future request
+		return build_response(200, 'File successfully created!', { 'file_handle' => headers[name]['name'] })
 	end
 
 	# [AUTH] Update file contents
@@ -507,7 +504,7 @@ class ReedbHandler < Sinatra::Base
 		vault_uuid = params[:splat][0]
 		file_name = params[:splat][1]
 
-		unless vault_uuid 
+		unless vault_uuid
 			return build_response(400, 'Missing vault access id.')
 		end
 
@@ -521,14 +518,14 @@ class ReedbHandler < Sinatra::Base
 		begin
 			data = JSON.parse(request.body.read)
 		rescue
-			return build_response(400, 'JSON data was malformed!')	
+			return build_response(400, 'JSON data was malformed!')
 		end
 
-		token = data["token"] if data["token"]
-		file_data = data["data"] if data["data"]
+		token = data['token'] if data['token']
+		file_data = data['data'] if data['data']
 
-		unless token && file_data
-			return build_response(400, 'Required data fields are missing from JSON data body!')	
+		if token == nil || file_data == nil
+			return build_response(400, 'Required data fields are missing from JSON data body!')
 		end
 
 		begin
@@ -536,18 +533,18 @@ class ReedbHandler < Sinatra::Base
 
 		rescue VaultNotAvailableError => e
 			return build_response(404, e.message)
-			
+
 		rescue UnknownTokenError => e
 			return build_response(401, e.message)
-			
+
 		rescue UnautherisedTokenError => e
 			return build_response(403, e.message)
-			
+
 		rescue FileBusyError => e
 			return build_response(418, "Dont take this error code too seriously: #{e.message}")
 		end
 
-		return build_response(200, "File successfully updated!")
+		return build_response(200, 'File successfully updated!')
 	end
 
 	# [AUTH] Removes a file
@@ -555,7 +552,7 @@ class ReedbHandler < Sinatra::Base
 		vault_uuid = params[:splat][0]
 		file_name = params[:splat][1]
 
-		unless vault_uuid 
+		unless vault_uuid
 			return build_response(400, 'Missing vault access id.')
 		end
 
@@ -569,14 +566,14 @@ class ReedbHandler < Sinatra::Base
 		begin
 			data = JSON.parse(request.body.read)
 		rescue
-			return build_response(400, 'JSON data was malformed!')	
+			return build_response(400, 'JSON data was malformed!')
 		end
 
-		token = data["token"] if data["token"]
+		token = data['token'] if data['token']
 
 		begin
 			Reedb::Vault::remove(vault_uuid, token, file_name)
-			
+
 		rescue FileNotFoundError, VaultNotAvailableError => e
 			return build_response(404, e.message)
 
@@ -587,31 +584,51 @@ class ReedbHandler < Sinatra::Base
 			return build_response(403, e.message)
 		end
 
-		return build_response(200, "File successfully deleted.")
+		return build_response(200, 'File successfully deleted.')
 	end
 end
 
-options = {}
+@options = {}
 
 # Setting default options
-options[:pw_length] = 12
-options[:verbose] = false
-options[:daemon] = true
-options[:port] = Reedb::NET_PORT
-options[:os] = Reedb::Utilities::parse_os
-options[:path] = Reedb::DEF_MASTER_PATH
-
-#create parsers
+@options[:pw_length] = 12
+@options[:verbose] = false
+@options[:daemon] = true
+@options[:port] = Reedb::NET_PORT
+@options[:os] = Reedb::Utilities::parse_os
+@options[:path] = Reedb::DEFAULT_PATH
+@options[:dave] = false
+@options[:force] = false
+
+# Create argument parsers and handle them
 opts = OptionParser.new
-opts.on('-l', '--pw-length INTEGER') { |o| options[:pw_length] = o }
-opts.on('-p', '--port INTEGER') { |o| options[:port] = o }
-opts.on('-v', '--verbose') { options[:verbose] = true }
-opts.on('-d', '--no-daemon') { options[:daemon] = false }
-opts.on('-a', '--app-path STRING') { |o| options[:path] = o }
+opts.on('-l', '--pw-length INTEGER') { |o| @options[:pw_length] = o }
+opts.on('-p', '--port INTEGER') { |o| @options[:port] = o }
+opts.on('-v', '--verbose') { @options[:verbose] = true }
+opts.on('-f', '--force') { @options[:force] = true }
+opts.on('--dave') { @options[:dave] = true }
+opts.on('-d', '--no-daemon') { @options[:daemon] = false }
+opts.on('-a', '--app-path STRING') { |o| @options[:path] = o }
 opts.parse! unless ARGV == []
 
-# This creates the Reedb module and binds it to a variable to be interacted with in the future
-Reedb::Core::init({:os => options[:os], :pw_length => options[:pw_length], 
-	:daemon => options[:daemon], :verbose => options[:verbose], :path => options[:path]})
+# Define what to do when that evil SIGTERM comes
+at_exit { Reedb::Core::terminate('root', true) }
+
 # Next up we start the HTTP server and that's that. We're up and running :)
-Rack::Handler::WEBrick.run(ReedbHandler.new, {:Port => options[:port], :BindAddress => "localhost"})
+def http_server
+	Rack::Handler::WEBrick.run(ReedbHandler.new, { :Port => @options[:port], :BindAddress => 'localhost' })
+end
+
+# This creates the Reedb module and binds it to a variable to be interacted with in the future
+# Gives more information to the core classes than they need
+
+begin
+	Reedb::Core::init(@options) { http_server }
+rescue Interrupt => e
+	puts e.message
+	puts 'User interrupt fired! Abandon ship...abandon ship!\n'
+	puts 'Waiting for background threads to die...'
+	Reedb::Core::terminate('user', true)
+	puts "Exit code #{Reedb::EXIT_PANIC_INTERUPT}"
+	exit(Reedb::EXIT_PANIC_INTERUPT)
+end