classifieds 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cabedbd14c81b9a85f94de1dfd63dee58310e433
-  data.tar.gz: 440f0c7aa0f547f02ca14b5b78ed95636ef67c89
+  metadata.gz: d6d409658285a51984fa62c9c70833593f6ec516
+  data.tar.gz: 3245625b00c570c2e0f5532b49d453bcc44cdad6
 SHA512:
-  metadata.gz: 20f7942d408a41df7407938fa1b881c12f061f4bc886519ea2d58c9aa87a95dc3e5a56c6dff094c54e80f4c3eb108ed8084cc57db37c6985f5235e5bcdc8c4ed
-  data.tar.gz: c48e8c98405cf4ebda709f2b95dbcfb6e3bc927885f2d23a98602500d9db66bcd5d70e956fcb27025cda86f192046f1305ca4ab2d3498e43ee3a7f2bc460cc51
+  metadata.gz: 47fb6152fb475e202712ed4dda885c0c334134680ea3d9e6ced9f481453d858e43622b58ed967772c4e2bf87bb48644ee9dc6369a93b32880316cd20954e3847
+  data.tar.gz: 5df1af17642507a30ecad363ae0fe4d39e4a8a7b88ea9e5fabdfff7f5ebcc279f17b1878af3afb1f296fa5221a54eca65469a1a4a8e8f2080bb00de7cbb401fd

data/lib/classifieds.rb

@@ -1,5 +1,6 @@
 require 'classifieds/exception'
 require 'classifieds/parser'
+require 'classifieds/encryptor'
 require 'classifieds/main'
 
 module Classifieds

data/lib/classifieds/encryptor.rb

@@ -0,0 +1,35 @@
+module Classifieds
+  class Encryptor
+    def initialize(password, salt)
+      @cipher = OpenSSL::Cipher.new('AES-256-CBC')
+      @password = password
+      @salt = salt
+    end
+
+    def encrypt(data)
+      @cipher.encrypt
+      key_iv = OpenSSL::PKCS5.pbkdf2_hmac_sha1(
+        @password,
+        @salt,
+        1000,
+        @cipher.key_len + @cipher.iv_len
+      )
+      @cipher.key = key_iv[0, @cipher.key_len]
+      @cipher.iv = key_iv[@cipher.key_len, @cipher.iv_len]
+      Base64.encode64(@cipher.update(data) + @cipher.final)
+    end
+
+    def decrypt(data)
+      @cipher.decrypt
+      key_iv = OpenSSL::PKCS5.pbkdf2_hmac_sha1(
+        @password,
+        @salt,
+        1000,
+        @cipher.key_len + @cipher.iv_len
+      )
+      @cipher.key = key_iv[0, @cipher.key_len]
+      @cipher.iv = key_iv[@cipher.key_len, @cipher.iv_len]
+      @cipher.update(Base64.decode64(data)) + @cipher.final
+    end
+  end
+end

data/lib/classifieds/main.rb

@@ -2,6 +2,7 @@ require 'digest/sha1'
 require 'openssl'
 require 'base64'
 require 'fileutils'
+require 'find'
 
 require 'safe_colorize'
 
@@ -12,12 +13,13 @@ module Classifieds
     using SafeColorize
 
     def initialize(*args)
-      unless File.exists?(SOURCE_FILE)
+      unless classifieds?
         STDERR.puts "#{SOURCE_FILE} is not found in this repository".color(:red)
         exit 1
       end
 
-      FileUtils.mkdir_p(SOURCE_DIRECTORY) unless Dir.exists?(SOURCE_DIRECTORY)
+      source_directory = File.join(root_directory, SOURCE_DIRECTORY)
+      FileUtils.mkdir_p(source_directory) unless Dir.exists?(source_directory)
       @prefix = Digest::SHA1.hexdigest('classifieds')
       super
     end
@@ -25,17 +27,17 @@ module Classifieds
     desc 'keygen', 'Generate identity files using by public key encryption'
     option :force, type: :boolean, aliases: '-f'
     def keygen
-      if !options[:force] && (File.exists?(PUBLIC_KEY_PATH) && File.exists?(COMMON_KEY_PATH))
+      if !options[:force] && keygenerated?
         STDERR.puts 'Already generated in this repository'.color(:red)
         exit 1
       else
         OpenSSL::Random.seed(File.read('/dev/random', 16))
         rsa = OpenSSL::PKey::RSA.new(2048)
         pub = rsa.public_key
-        File.open(PUBLIC_KEY_PATH, 'w') do |f|
+        File.open(File.join(root_directory, PUBLIC_KEY_PATH), 'w') do |f|
           f.puts pub.to_pem
         end
-        File.open(COMMON_KEY_PATH, 'w') do |f|
+        File.open(File.join(root_directory, COMMON_KEY_PATH), 'w') do |f|
           f.puts pub.public_encrypt(OpenSSL::Random.random_bytes(16))
         end
         puts rsa
@@ -47,7 +49,7 @@ module Classifieds
     def encrypt
       if identity_file = options[:identity_file]
         rsa = OpenSSL::PKey::RSA.new(File.read(identity_file).chomp)
-        @password = rsa.private_decrypt(File.read(COMMON_KEY_PATH).chomp)
+        @password = rsa.private_decrypt(File.read(File.join(root_directory, COMMON_KEY_PATH)).chomp)
       else
         @password = ask_password
         retype_password
@@ -58,7 +60,6 @@ module Classifieds
 
         file = File.open(file_path, 'r+')
         file.flock(File::LOCK_EX)
-
         data = file.read.chomp
 
         begin
@@ -83,7 +84,7 @@ module Classifieds
     def decrypt
       if identity_file = options[:identity_file]
         rsa = OpenSSL::PKey::RSA.new(File.read(identity_file).chomp)
-        @password = rsa.private_decrypt(File.read(COMMON_KEY_PATH).chomp)
+        @password = rsa.private_decrypt(File.read(File.join(root_directory, COMMON_KEY_PATH)).chomp)
       else
         @password = ask_password
       end
@@ -94,7 +95,6 @@ module Classifieds
 
         file = File.open(file_path, 'r+')
         file.flock(File::LOCK_EX)
-
         file.read(@prefix.size)
         data = file.read.chomp
 
@@ -159,35 +159,41 @@ module Classifieds
     end
 
     def classifieds
-      Parser.parse(File.read(SOURCE_FILE).chomp)
+      Parser.parse(File.read(File.join(root_directory, SOURCE_FILE)).chomp)
     end
 
     def encrypt_data(data)
-      cipher = OpenSSL::Cipher.new('AES-256-CBC')
-      cipher.encrypt
-      key_iv = OpenSSL::PKCS5.pbkdf2_hmac_sha1(
-        @password,
-        File.expand_path(File.dirname(__FILE__)).split('/').pop,
-        1000,
-        cipher.key_len + cipher.iv_len
-      )
-      cipher.key = key_iv[0, cipher.key_len]
-      cipher.iv = key_iv[cipher.key_len, cipher.iv_len]
-      Base64.encode64(cipher.update(data) + cipher.final)
+      encryptor = Encryptor.new(@password, root_directory.split('/').pop)
+      encryptor.encrypt(data)
     end
 
     def decrypt_data(data)
-      cipher = OpenSSL::Cipher.new('AES-256-CBC')
-      cipher.decrypt
-      key_iv = OpenSSL::PKCS5.pbkdf2_hmac_sha1(
-        @password,
-        File.expand_path(File.dirname(__FILE__)).split('/').pop,
-        1000,
-        cipher.key_len + cipher.iv_len
-      )
-      cipher.key = key_iv[0, cipher.key_len]
-      cipher.iv = key_iv[cipher.key_len, cipher.iv_len]
-      cipher.update(Base64.decode64(data)) + cipher.final
+      encryptor = Encryptor.new(@password, root_directory.split('/').pop)
+      encryptor.decrypt(data)
+    end
+
+    def root_directory
+      @root_directory ||=
+        begin
+          target_directory = File.expand_path(Dir.pwd)
+          until target_directory == '/' do
+            Find.find(target_directory) do |path|
+              Find.prune if path =~ %r|^#{target_directory}/|
+              return target_directory if path =~ /#{SOURCE_FILE}$/
+            end
+            target_directory = File.expand_path('..', target_directory)
+          end
+
+          nil
+        end
+    end
+
+    def classifieds?
+      !!root_directory
+    end
+
+    def keygenerated?
+      File.exists?(File.join(root_directory, PUBLIC_KEY_PATH)) && File.exists?(File.join(root_directory, COMMON_KEY_PATH))
     end
 
     def encrypted?(file)

data/lib/classifieds/version.rb

@@ -1,3 +1,3 @@
 module Classifieds
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: classifieds
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -84,6 +84,7 @@ files:
 - classifieds.gemspec
 - exe/classifieds
 - lib/classifieds.rb
+- lib/classifieds/encryptor.rb
 - lib/classifieds/exception.rb
 - lib/classifieds/main.rb
 - lib/classifieds/parser.rb