osp 0.1.0.pre.dev.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91fa1ed62524c4d5a625fc41b705e53ec07c1025
-  data.tar.gz: 4953a9cc50c9ae298912a8829ad040caa0a273e1
+  metadata.gz: 765b0bc1616f91a2da8a4ec9bb41e46146fe0e58
+  data.tar.gz: d7ea9546689038040a86571bd05c5d4be2da1f90
 SHA512:
-  metadata.gz: a3b038055e9eabb2b95739973349a846db72e4dab13fb75d02eac627284acd91e4d640804edc42158ddad3933cbe80f272d5a57e7308280a15cad09aa7edc188
-  data.tar.gz: 10ed0c220116da7cb8f1b4d72d5dcdd27e9eafb55a8a222032e82e22bc673c7ac3b66263215337dc37caf58c68dd19a63ed66025a015c082407c1b630d019fe9
+  metadata.gz: 9e6211266c619d2ebaa89907e1f6f8581f1d26c7bb58c2288a87106b91b836b66c80807e87fc5ae470810ed96601b12742c9d83bd0b804b9270957ba5e4ae3df
+  data.tar.gz: 0632221c03282e0a437a07fcb2333169ded00eea8a446f396a09330e0ae6656b8dbc263087b0d977974a83e8e3efba32561c0b751d91af65d51833de42208997

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    osp (0.1.0.pre.dev.1)
+    osp (0.1.0)
       highline (~> 1.7)
       msgpack (~> 0.7)
-      rainbow (~> 2.0)
       thefox-ext (~> 1.2)
 
 GEM
@@ -13,7 +12,6 @@ GEM
     highline (1.7.8)
     minitest (5.8.3)
     msgpack (0.7.1)
-    rainbow (2.0.0)
     thefox-ext (1.2.0)
 
 PLATFORMS

data/README.md

@@ -1,7 +1,19 @@
-# One Shall Pass for Command Line
+# One Shall Pass for Command-line
+
+## Install
+
+The preferred method of installation is via RubyGems.org:  
+<https://rubygems.org/gems/osp>
+
+	gem install osp
+
+or via `Gemfile`:
+
+	gem 'osp', '~>0.1'
 
 ## Project Links
 
+- [Blog Post about OSP](http://blog.fox21.at/2015/12/19/one-shall-pass-for-command-line.html)
 - [Gem](https://rubygems.org/gems/osp)
 - [Travis CI Repository](https://travis-ci.org/TheFox/osp)
 

data/bin/osp

@@ -5,22 +5,13 @@ raise 'Ruby >=2.1 required' unless RUBY_VERSION >= '2.1.0'
 
 require 'optparse'
 require 'fileutils'
-#require 'securerandom'
-#require 'openssl'
-#require 'base64'
-# require 'yaml/store'
 require 'pp'
 
 require 'bundler/setup'
-#require 'highline/import'
 require 'highline'
-require 'rainbow'
 require 'msgpack'
 require 'osp'
 
-#msg = [1,2,3].to_msgpack
-#MessagePack.unpack(msg)
-
 
 options = {
 	:database_path => "#{Dir.home}/.osp",
@@ -39,7 +30,6 @@ opts = OptionParser.new do |opts|
 		exit 3
 	end
 end
-#ARGV << '-h' if ARGV.count == 0
 args = opts.parse(ARGV)
 
 
@@ -50,22 +40,20 @@ puts TheFox::OSP::HOMEPAGE
 puts
 
 puts 'Master Login'
-
-# email    = @cli.ask('   Email: ')
-puts '   Email: xyz@example.com'
-# password = @cli.ask('Password: '){ |q| q.echo = '*' }
-puts 'Password: xyz'
+email    = @cli.ask('   Email: ')
+password = @cli.ask('Password: '){ |q| q.echo = '*' }
 
 Console.cursor_jump_to_column
 Console.cursor_up(2)
 Console.screen_clear_to_bottom
-
 puts '   Email: *****'
 puts 'Password: *****'
 puts
 
-email = 'xyz@example.com'
-password = 'xyz'
+printf "Calculating base hash: #{TheFox::OSP::HASHES_N} (#{TheFox::OSP::HASHES_EXP}-bit) - please wait ..."
+osp = TheFox::OSP::OSP.new(email, password, TheFox::OSP::HASHES_N)
+osp.key_derivation
+puts ' done'
 
 database = {
 	'meta' => {
@@ -78,28 +66,58 @@ database = {
 has_database = false
 has_database_changes = false
 if File.exist?(options[:database_path])
-	puts "Found database file: #{options[:database_path]}",
+	puts "Use database file: #{options[:database_path]}",
 		'Try to open it ...'
 	
 	begin
-		database = MessagePack.unpack(File.binread(options[:database_path]))
-		database['hosts'] = database['hosts'].map{ |name, host| [name, TheFox::OSP::Host.from_h(host)] }.to_h
+		puts "Read file '#{options[:database_path]}'."
+		db_meta = File.binread(options[:database_path])
+		
+		puts 'Process metadata.'
+		db_meta = Base64.strict_decode64(db_meta)
+		db_meta = MessagePack.unpack(db_meta)
+		
+		db_e = Base64.strict_decode64(db_meta['db'])
+		mac = OpenSSL::Digest::SHA256.digest(db_e)
+		if db_meta['mac'] == mac
+			puts 'Setup database encryption.'
+			dk_sha256 = OpenSSL::Digest::SHA256.digest(osp.dk)
+			iv = Base64.strict_decode64(db_meta['iv'])
+			
+			aes = OpenSSL::Cipher::Cipher.new('AES-256-CBC')
+			aes.decrypt
+			aes.key = dk_sha256
+			aes.iv = iv
+			
+			begin
+				puts 'Decrypt database.'
+				db_b64 = aes.update(db_e)
+				db_b64 << aes.final
+			rescue Exception => e
+				raise 'Incorrect email and password combination.'
+			end
+			
+			puts 'Build database.'
+			database = MessagePack.unpack(Base64.strict_decode64(db_b64))
+			
+			database['hosts'] = database['hosts'].map{ |name, host|
+				host_o = TheFox::OSP::Host.from_h(host)
+				host_o.osp = osp
+				[name, host_o]
+			}.to_h
+			
+			puts 'Startup done.'
+		else
+			raise 'Integrity check failed.'
+		end
 	rescue Exception => e
 		puts "FATAL ERROR: couldn't open database:"
-		puts "'#{e}'"
+		puts "#{e}"
 		
-		exit
+		exit 1
 	end
 end
 
-printf "Calculating base hash: #{TheFox::OSP::HASHES_N} (#{TheFox::OSP::HASHES_EXP}-bit) - please wait ..."
-
-osp = TheFox::OSP::OSP.new(email, password, TheFox::OSP::HASHES_N)
-osp.key_derivation
-puts ' done'
-
-database['hosts'].each{ |name, host| host.osp = osp }
-
 def password_callback_method(step, pw)
 	printf '.'
 end
@@ -125,16 +143,9 @@ def host_edit(osp, host = nil)
 	host = TheFox::OSP::Host.new(osp) if host.nil?
 	
 	tmp = @cli.ask('      Name: ' + (!host.name.nil? ? "[#{host.name}]" : '') + ' ').strip.to_s
-	# puts "name: '#{tmp}' #{tmp.class}"
-	
 	host.name = tmp if tmp != ''
-	# puts "name: '#{host.name}' #{host.name.class}"
-	
 	host.name = nil if host.name == ''
-	# puts "name: '#{host.name}' #{host.name.class}"
-	
 	if host.name.nil?
-		# puts "No host input."
 		return nil
 	end
 	
@@ -188,12 +199,9 @@ while true
 		hosts_n = database['hosts'].count
 		format = '%' + hosts_n.to_s.length.to_s + 'd'
 		
-		# puts "format: '#{format}'"
-		
 		n = 0
 		database['hosts'].values.each do |host|
 			n += 1
-			# pp host
 			printf "#{format}. %s\n", n, host.name
 		end
 	when 's'
@@ -273,7 +281,7 @@ while true
 					
 					if !selected_host.nil?
 						host_edit(osp, selected_host)
-						host_show(selected_host)
+						host_show(selected_host, true)
 						
 						database['hosts'][selected_host.name] = selected_host
 						
@@ -317,21 +325,51 @@ while true
 	when 'w'
 		if has_database_changes
 			tmp = "#{options[:database_path]}~"
-			backup = "#{options[:database_path]}~backup"
 			
 			database['meta']['updated_at'] = DateTime.now.to_s
 			
-			if File.exist?(options[:database_path])
-				puts "Backup old file to        '#{backup}'."
-				FileUtils.mv(options[:database_path], backup)
-			end
+			# http://stackoverflow.com/questions/9049789/aes-encryption-key-versus-iv
+			# http://keepass.info/help/base/security.html
+			# https://gist.github.com/byu/99651
 			
-			puts "Write temp file to        '#{tmp}'."
+			puts 'Make temp database.'
 			db_c = database.clone
 			db_c['hosts'] = db_c['hosts'].map{ |name, host| [name, host.to_h] }.to_h
-			File.binwrite(tmp, db_c.to_msgpack)
 			
-			puts "Finally move temp file to '#{options[:database_path]}'."
+			puts 'Setup database encryption.'
+			dk_sha256 = OpenSSL::Digest::SHA256.digest(osp.dk)
+			iv = OpenSSL::Cipher::Cipher.new('AES-256-CBC').random_iv
+			
+			aes = OpenSSL::Cipher::Cipher.new('AES-256-CBC')
+			aes.encrypt
+			aes.key = dk_sha256
+			aes.iv = iv
+			
+			puts 'Encrypt database.'
+			db_e = aes.update(Base64.strict_encode64(db_c.to_msgpack))
+			db_e << aes.final
+			
+			mac = OpenSSL::Digest::SHA256.digest(db_e)
+			
+			db_out = {
+				'version' => 1,
+				'iv' => Base64.strict_encode64(iv),
+				'db' => Base64.strict_encode64(db_e),
+				'mac' => mac,
+			}
+			db_out = db_out.to_msgpack
+			db_out = Base64.strict_encode64(db_out)
+			
+			puts "Write temp file to '#{tmp}'."
+			File.binwrite(tmp, db_out)
+			
+			backup_dts = Time.now.strftime('%Y%m%d-%H%M%S')
+			backup = "#{options[:database_path]}~backup_#{backup_dts}_" + Digest::SHA256.file(tmp).hexdigest[0..7]
+			
+			puts "Backup temp file to '#{backup}'."
+			FileUtils.cp(tmp, backup)
+			
+			puts "Finally, move temp file to '#{options[:database_path]}'."
 			FileUtils.mv(tmp, options[:database_path])
 			
 			has_database_changes = false

data/lib/osp/host.rb

@@ -4,16 +4,8 @@ module TheFox
 		
 		class Host
 			
-			# attr_accessor :osp
-			# attr_accessor :version
 			attr_accessor :created_at
 			attr_accessor :updated_at
-			# attr_accessor :name
-			# attr_accessor :generation
-			# attr_accessor :length
-			# attr_accessor :symbols
-			# attr_accessor :hashes
-			# attr_accessor :password
 			
 			def initialize(osp = nil)
 				@osp = osp
@@ -48,14 +40,6 @@ module TheFox
 				@version.to_i
 			end
 			
-			# def created_at=(v)
-			# 	@created_at = v
-			# end
-			
-			# def created_at
-			# 	@created_at
-			# end
-			
 			def name=(v)
 				v = nil if v == ''
 				@name = v
@@ -99,7 +83,6 @@ module TheFox
 			
 			def generate_password(regenerate = false)
 				if @password.nil? && !@osp.nil? || regenerate
-					# puts "host name: '#{@name}'"
 					@password = @osp.password(@name, @length, @generation, @symbols)
 				end
 			end
@@ -127,8 +110,6 @@ module TheFox
 					'length' => @length,
 					'symbols' => @symbols,
 					'hashes' => @hashes,
-					
-					#'password' => @password,
 				}
 			end
 			

data/lib/osp/osp.rb

@@ -18,6 +18,7 @@ module TheFox
 		
 		class OSP
 			
+			attr_accessor :dk
 			attr_accessor :hashes
 			
 			def initialize(email, password, hashes = HASHES_N)
@@ -29,14 +30,7 @@ module TheFox
 			end
 			
 			def key_derivation
-				# puts "password: #{@password}"
-				# puts "email: #{@email}"
-				# puts "hashes: #{@hashes}"
-				
 				@dk = OpenSSL::PKCS5.pbkdf2_hmac(@password, @email, @hashes, 64, OpenSSL::Digest::SHA512.new)
-				# pp @dk.length
-				# pp @dk.length * 8
-				# pp @dk.to_hex
 			end
 			
 			def password(host_name, length = 16, generation = 1, symbols = 1)
@@ -48,29 +42,23 @@ module TheFox
 				step = 0
 				while pw.nil?
 					raw = [ID, @email, host_name, generation, step]
-					# pp raw
 					data = raw.to_msgpack
 					hmac_p = OpenSSL::HMAC.digest(OpenSSL::Digest::SHA512.new, @dk, data)
 					hmac_b64 = Base64.strict_encode64(hmac_p)
 					pw = hmac_b64 if is_ok_pw(hmac_b64)
 					
-					# pp hmac_b64[0..16]
-					#sleep 0.1
-					
 					@password_callback_method.call(step, hmac_b64) if !@password_callback_method.nil?
 					step += 1
 				end
 				
 				if symbols > 0
 					sub_method = find_method_to_sub(pw)
-					#puts "sub_method = #{sub_method}"
 					
 					_b64map = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
 					
 					indices = []
 					(0..PASSWORD_MIN_SIZE).each do |n|
 						c = pw[n]
-						#puts "#{n} = #{c}"
 						if c.method(sub_method).call
 							indices << n
 							if indices.count >= symbols
@@ -79,8 +67,6 @@ module TheFox
 						end
 					end
 					
-					#pp indices
-					
 					_map = "`~!@#$%^&*()-_+={}[]|;:,<>.?/"
 					_map_len = _map.length
 					
@@ -93,15 +79,10 @@ module TheFox
 						x = _map[i % _map_len]
 						arr << x
 						last = index + 1
-						
-						#puts "#{index} = '#{c}' '#{i}' '#{x}'    #{last}"
 					end
 					arr << pw[last..-1]
-					#pp arr
 					pw = arr.join
 				end
-				
-				#puts "length: #{length}"
 				pw[0...length]
 			end
 			
@@ -119,8 +100,6 @@ module TheFox
 				(0...PASSWORD_MIN_SIZE).each do |n|
 					c = pw[n]
 					
-					# puts "#{n} = #{c}"
-					
 					if c.is_digit?
 						digits += 1
 					elsif c.is_upper?
@@ -135,7 +114,6 @@ module TheFox
 				bad = lambda { |x| x == 0 || x > 5 }
 				
 				if bad.call(caps) || bad.call(lowers) || bad.call(digits)
-					#puts 'return false'
 					return false
 				end
 				
@@ -162,8 +140,6 @@ module TheFox
 					elsif c.is_lower?
 						lowers += 1
 					end
-					
-					#puts "#{n} = #{c}   #{digits} #{caps} #{lowers}"
 				end
 				
 				rv = ''
@@ -174,7 +150,6 @@ module TheFox
 				else
 					rv = 'is_upper?'
 				end
-				#rv = 'is_upper?'
 				rv
 			end
 			

data/lib/osp/version.rb

@@ -2,8 +2,8 @@
 module TheFox
 	module OSP
 		RELEASE_ID = 0
-		VERSION = '0.1.0-dev.1'
-		DATE = '2015-12-17'
+		VERSION = '0.1.0'
+		DATE = '2015-12-19'
 		HOMEPAGE = 'https://github.com/TheFox/osp'
 	end
 end

data/osp.gemspec

@@ -13,23 +13,20 @@ Gem::Specification.new do |spec|
 	spec.email         = 'christian@fox21.at'
 	
 	spec.summary       = %q{One Shall Pass}
-	spec.description   = %q{One Shall Pass}
+	spec.description   = %q{One Shall Pass for Command Line.}
 	spec.homepage      = TheFox::OSP::HOMEPAGE
 	spec.license       = 'GPL-3.0'
 	
 	spec.files         = `git ls-files -z`.split("\x0").reject{ |f| f.match(%r{^(test|spec|features)/}) }
 	spec.bindir        = 'bin'
-	spec.executables   = ['osp', 'catmp']
+	spec.executables   = ['osp']
 	spec.require_paths = ['lib']
 	spec.required_ruby_version = '>=2.1.0'
 	
-	#spec.requirements  << ''
-	
 	spec.add_development_dependency 'bundler', '~>1.10'
 	spec.add_development_dependency 'minitest', '~>5.8'
 	
 	spec.add_dependency 'highline', '~>1.7'
-	spec.add_dependency 'rainbow', '~>2.0'
 	spec.add_dependency 'msgpack', '~>0.7'
 	
 	spec.add_dependency 'thefox-ext', '~>1.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osp
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.dev.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -94,11 +80,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-description: One Shall Pass
+description: One Shall Pass for Command Line.
 email: christian@fox21.at
 executables:
 - osp
-- catmp
 extensions: []
 extra_rdoc_files: []
 files:
@@ -109,7 +94,6 @@ files:
 - Makefile
 - Makefile.common
 - README.md
-- bin/catmp
 - bin/osp
 - lib/ext/string.rb
 - lib/osp.rb
@@ -136,9 +120,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.7

data/bin/catmp

@@ -1,56 +0,0 @@
-#!/usr/bin/env ruby
-# coding: UTF-8
-
-raise 'Ruby >=2.1 required' unless RUBY_VERSION >= '2.1.0'
-
-require 'optparse'
-require 'yaml'
-require 'pp'
-
-require 'bundler/setup'
-require 'msgpack'
-
-
-options = {
-	:path => nil,
-	:yaml => false,
-}
-opts = OptionParser.new do |opts|
-	opts.banner = 'Usage: catmp'
-	opts.separator('')
-	
-	# opts.on('-p', '--path <path>', 'Path msgpack file.') do |path|
-	# 	options[:path] = path
-	# end
-	
-	opts.on('-y', '--yaml', 'Output in YAML format.') do
-		options[:yaml] = true
-	end
-	
-	opts.on_tail('-h', '--help', 'Show this message.') do
-		puts opts
-		puts
-		exit 3
-	end
-end
-#ARGV << '-h' if ARGV.count == 0
-args = opts.parse(ARGV)
-
-if args.count > 0
-	options[:path] = args.shift
-
-	if !options[:path].nil?
-		ar = MessagePack.unpack(File.binread(options[:path]))
-		
-		if options[:yaml]
-			print YAML.dump(ar)
-		else
-			pp ar
-		end
-	else
-		raise 'FATAL ERROR: path invalid.'
-	end
-else
-	opts.parse(['-h'])
-end
-