auth_keys_chain 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbca7c2bba6fee97c3ee654a5be86f1e410c8b0b
-  data.tar.gz: 4495921da91a3075b9f2b104600dbc8758cfc40a
+  metadata.gz: f89f5e6801c242316f8b792c37c170c7ff251a7b
+  data.tar.gz: bed86d758454aaf46c092b951e34741ee4053e83
 SHA512:
-  metadata.gz: 63676575777d41aa5278216a9772738f931f93c2aeaf7c0cc54cd17eec6d752a3b31962c325e4745c1458d2a339d1dfc773ac0cc007f646970bad6e5ea9160eb
-  data.tar.gz: 3630bc381733ffbe72069f926efc7e66dedb1c01549bf65450f0cd9bfb7019d7c26c72e74b5521ba7fc2b668f5981db711b6b5532cc6851af1c1162b4c60f883
+  metadata.gz: bdce5d6d0b5b12dbccfc3388b0bc07c66db37713f173791307cb7561164150c749603b042de50cab3a6febd04965e446f21a5841684a5c629e92c77ab2745c30
+  data.tar.gz: 34d0097f8cedb219eee91e99f1687531f3112e40ebf0627c2cd94b41488499e2882310e630519c21e92c13b77767858b3f4e6d363e7f7f584a44d79b33d26d50

data/lib/auth_keys.rb

@@ -16,13 +16,17 @@ class AuthKeys
         def encrypt()
             data = self.read
             return  if is_encrypted?(data)
-            data = encrypt_data(data, self.master_key)
+            #data = self.encrypt_data_by_pubkey(data)
+            data = self.encrypt_data(data,self.master_key_data)
             save(data)
         end
-        def master_key
-            path = File.expand_path(MASTER_KEY)
-            raise unless File.exists?(path)
-            open(path).read
+        def decrypt()
+            data = self.read
+            return unless is_encrypted?(data)
+            data = data.force_encoding("ASCII-8BIT")
+            #data = self.decrypt_data_by_privkey(data)
+            data = self.decrypt_data(data,self.master_key_data)
+            self.save(data)
         end
         def decrypt_data(data,pass)
             data = data.force_encoding("ASCII-8BIT")
@@ -33,16 +37,33 @@ class AuthKeys
             cipher.pkcs5_keyivgen(pass, salt)
             cipher.update(data) + cipher.final
         end
+        def rsautil
+            OpenSSL::PKey::RSA.new(self.master_key_data)
+        end
+        def encrypt_data_by_pubkey(data)
+            self.rsautil.public_encrypt(data)
+        end
+        def decrypt_data_by_privkey(data)
+            self.rsautil.private_decrypt(data)
+        end
 
-        def decrypt()
-            data = self.read
-            data = data.force_encoding("ASCII-8BIT")
-            return unless is_encrypted?(data)
-            data = self.decrypt_data(data,self.master_key)
-            self.save(data)
+        def is_salted?(str)
+            /Salted__/ === str[0,8] 
         end
         def is_encrypted?(str)
-            /Salted__/ === str[0,8] 
+            return true if self.is_salted?(str)
+            # check encrypt by trying to treat as  UTF-8 String
+            begin 
+                str.split("")
+                return false
+            rescue => e
+                return true
+            end
+        end
+        def master_key_data
+            path = File.expand_path(MASTER_KEY)
+            raise unless File.exists?(path)
+            open(path).read
         end
         def save(content)
             path = File.expand_path(KEY_PATH)
@@ -54,7 +75,7 @@ class AuthKeys
 
         def load()
             content = self.read
-            content = self.decrypt_data(content,self.master_key) if is_encrypted?(content)
+            content = self.decrypt_data(content,self.master_key_data) if is_encrypted?(content)
             array = content 
                         .split("\n")
                         .reject{|e| e.strip =~/^#/}
@@ -68,6 +89,10 @@ class AuthKeys
         end
         def get(key)
             hash = self.load
+            if key.class == Regexp then
+                key = self.keys.find{|e| e=~key}
+                return nil unless key
+            end
             hash.key?(key) ? hash[key] : nil ; 
         end
         def [](key)
@@ -82,9 +107,9 @@ end
 
 if $0 == __FILE__ then
     require 'pp'
-    pp AuthKeys.load
-    pp AuthKeys.keys
-    pp AuthKeys["softbank"]
-    pp AuthKeys.encrypt
+    #pp AuthKeys.load
+    #pp AuthKeys.keys
+    #pp AuthKeys["softbank"]
+    #pp AuthKeys.encrypt
 end
 

data/lib/auth_keys/version.rb

@@ -1,3 +1,3 @@
 module AuthKey
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auth_keys_chain
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - takuya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-09 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler