classifieds 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7a28ed7dd95a4865ff0f44347b3bd6c569e7286
-  data.tar.gz: 228092b3aaca67a48753c77d59540cb093a7b455
+  metadata.gz: be21a9b90c90cb9033fb3d083fbdfe046f088214
+  data.tar.gz: 1105c72dbc850ae727fd72a8726fedd550e78f76
 SHA512:
-  metadata.gz: fd48a3b29771b3e2153e58a740e156b09a3943303f0b70677e5a99b0e1f8f531a86e50ecaef7c2f63e30dab6357a88e1452ba7ef15444b7e7da4a6991916017d
-  data.tar.gz: 487ec5bbc7a0a70350189cceb1fcc7d0d8fa5482fd47a8a67ddae34a6d3bcba186fdbe0ee981ada576c1215d0707d70649ac7f5010dacd038f9c3f4ad5ed3ec1
+  metadata.gz: 9fd490542826ca9d4ad8e8a72aff680b8b97f41a4c2cd05848fd8d8ce44ce786f2f885fd527289aae1aa312de29ae46da75fad8da9a267e6b9ef38c6a9ade351
+  data.tar.gz: dbe2f6c2de67696c56252d893c9b1445e1293e05ee767108af49a4a02f1cc3e8ba9321a21a9cf5899d34f49cbc80d92f0a9401772b2db79eec28b91c139bf6bd

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+vendor

data/README.md

@@ -16,28 +16,28 @@ $ gem install classifieds
 
 ## Usage
 
-Initialize classifieds.
+Generate identity files using by public key encryption.
 
 ```
-$ classifieds init
+$ classifieds keygen
 ```
 
-Encrypt files which were described in .classifieds.
+Show a status of the encryption of this repository.
 
 ```
-$ classifieds encrypt
+$ classifieds status
 ```
 
-Decrypt files which were described in .classifieds.
+Encrypt files which were described in .classifieds.
 
 ```
-$ classifieds decrypt
+$ classifieds encrypt
 ```
 
-Show a status of the encryption of this repository.
+Decrypt files which were described in .classifieds.
 
 ```
-$ classifieds status
+$ classifieds decrypt
 ```
 
 ## Example
@@ -60,8 +60,7 @@ In your repository:
 First, initialize classifieds.
 
 ```
-$ classifieds init
-.classifieds was created
+$ touch .classifieds
 
 $ ls -a
 .classifieds  bar/  foo  fuga/  hoge/
@@ -90,6 +89,8 @@ Unencrypted:
         /path/to/fuga/fuga2
 ```
 
+### Password Encryption
+
 Encrypt files.
 
 ```
@@ -116,7 +117,73 @@ Encrypted:
         /path/to/fuga/fuga2
 
 $ cat foo
-65c0ec273963aacc69af593b03d1710ff90f75da¢É™¸
+65c0ec273963aacc69af593b03d1710ff90f75daB5KyfrnkTXz/K6+SeNkapA==
+```
+
+Decrypt files.
+
+```
+$ classifieds decrypt
+Password:
+Decrypted:
+        /path/to/foo
+        /path/to/bar/bar2
+        /path/to/hoge/hoge1.rb
+        /path/to/fuga/fuga1
+        /path/to/fuga/fuga2
+```
+
+Check the status.
+
+```
+$ classifieds status
+Unencrypted:
+        /path/to/foo
+        /path/to/bar/bar2
+        /path/to/hoge/hoge1.rb
+        /path/to/fuga/fuga1
+        /path/to/fuga/fuga2
+
+$ cat foo
+foo
+```
+
+### Public Key Encryption
+
+Generate keys.
+
+```
+$ classifieds keygen > ~/classifieds_private_key
+$ ls .classifieds.d/*
+.classifieds.d/common_key
+.classifieds.d/public_key
+```
+
+Encrypt files.
+
+```
+$ classifieds encrypt -i ~/classifieds_private_key
+Encrypted:
+        /path/to/foo
+        /path/to/bar/bar2
+        /path/to/hoge/hoge1.rb
+        /path/to/fuga/fuga1
+        /path/to/fuga/fuga2
+```
+
+Check the status.
+
+```
+$ classifieds status
+Encrypted:
+        /path/to/foo
+        /path/to/bar/bar2
+        /path/to/hoge/hoge1.rb
+        /path/to/fuga/fuga1
+        /path/to/fuga/fuga2
+
+$ cat foo
+65c0ec273963aacc69af593b03d1710ff90f75daB5KyfrnkTXz/K6+SeNkapA==
 ```
 
 Decrypt files.

data/lib/classifieds/main.rb

@@ -1,5 +1,6 @@
 require 'digest/sha1'
 require 'openssl'
+require 'base64'
 require 'fileutils'
 
 require 'safe_colorize'
@@ -11,24 +12,46 @@ module Classifieds
     using SafeColorize
 
     def initialize(*args)
+      unless File.exists?(SOURCE_FILE)
+        STDERR.puts "#{SOURCE_FILE} is not found".color(:red)
+        exit 1
+      end
+
+      FileUtils.mkdir_p(SOURCE_DIRECTORY) unless Dir.exists?(SOURCE_DIRECTORY)
       @prefix = Digest::SHA1.hexdigest('classifieds')
       super
     end
 
-    desc 'init', 'Initialize classifieds'
-    def init
-      if File.exists?(SOURCE_FILE)
-        puts 'Classifieds already initialized'.color(:red)
+    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))
+        STDERR.puts 'Already exists'.color(:red)
+        exit 1
       else
-        FileUtils.touch(SOURCE_FILE)
-        puts "#{SOURCE_FILE} was created".color(:green)
+        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|
+          f.puts pub.to_pem
+        end
+        File.open(COMMON_KEY_PATH, 'w') do |f|
+          f.puts pub.public_encrypt(OpenSSL::Random.random_bytes(16))
+        end
+        puts rsa
       end
     end
 
     desc 'encrypt', 'Encrypt files which were described in .classifieds'
+    option :identity_file, type: 'string', aliases: '-i'
     def encrypt
-      @password ||= ask_password
-      retype_password
+      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)
+      else
+        @password = ask_password
+        retype_password
+      end
 
       encrypted_files = classifieds.each_with_object([]) do |file_path, array|
         next if encrypted?(file_path)
@@ -56,8 +79,14 @@ module Classifieds
     end
 
     desc 'decrypt', 'Decrypt files which were described in .classifieds'
+    option :identity_file, type: 'string', aliases: '-i'
     def decrypt
-      @password ||= ask_password
+      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)
+      else
+        @password = ask_password
+      end
 
       decrypted_files = classifieds.each_with_object([]) do |file_path, array|
         next if decrypted?(file_path)
@@ -99,9 +128,9 @@ module Classifieds
         end
       end
       puts 'Encrypted:'.color(:green) unless encrypted_files.empty?
-      encrypted_files.each {|file| puts "\t" + file }
+      encrypted_files.each {|encrypted_file| puts "\t" + encrypted_file }
       puts 'Unencrypted:'.color(:red) unless unencrypted_files.empty?
-      unencrypted_files.each {|file| puts "\t" + file }
+      unencrypted_files.each {|unencrypted_file| puts "\t" + unencrypted_file }
     end
 
     private
@@ -127,26 +156,35 @@ module Classifieds
     end
 
     def classifieds
-      File.open(SOURCE_FILE) do |f|
-        Parser.parse(f.read)
-      end
-    rescue Errno::ENOENT
-      STDERR.puts "#{SOURCE_FILE} is not found".color(:red)
-      exit 1
+      Parser.parse(File.read(SOURCE_FILE).chomp)
     end
 
     def encrypt_data(data)
       cipher = OpenSSL::Cipher.new('AES-256-CBC')
       cipher.encrypt
-      cipher.pkcs5_keyivgen(@password)
-      cipher.update(data) + cipher.final
+      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)
     end
 
     def decrypt_data(data)
       cipher = OpenSSL::Cipher.new('AES-256-CBC')
       cipher.decrypt
-      cipher.pkcs5_keyivgen(@password)
-      cipher.update(data) + cipher.final
+      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
     end
 
     def encrypted?(file)

data/lib/classifieds/version.rb

@@ -1,3 +1,3 @@
 module Classifieds
-  VERSION = "0.1.0"
+  VERSION = '0.2.0'
 end

data/lib/classifieds.rb

@@ -4,4 +4,7 @@ require 'classifieds/main'
 
 module Classifieds
   SOURCE_FILE = '.classifieds'
+  SOURCE_DIRECTORY = '.classifieds.d'
+  PUBLIC_KEY_PATH = File.join(SOURCE_DIRECTORY, 'public_key')
+  COMMON_KEY_PATH = File.join(SOURCE_DIRECTORY, 'common_key')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: classifieds
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: File Encryption Manager