thieve 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '094636f7b335bf92cec3926a8e5f6bf21d8a4543'
-  data.tar.gz: 0b5cb2263bdabc7684dffc68d7d85cc7022ca1d6
+  metadata.gz: c3ce17721ffd5395450d38f1aaa0bdf0859c0a23
+  data.tar.gz: 77079a0a8f8dad30201d31016b4eb9f0e3a1f35d
 SHA512:
-  metadata.gz: f4606fa31e50eae55fa8dac6dfaff58541529a7b03f4e41491e199515f770bfb2d07a7affcc44083d96ba95c455285db1394406b658af68ca6d4030133a542f2
-  data.tar.gz: 3f89f76ffe014825ab1b59ee19343833fd7512092592fa22fa46912986ce0f0e7100b234e1b0305eb71e640432de3b32723a9e2e5df4e7bd9aebaab81a1a83eb
+  metadata.gz: d6e6f0ff52ff6b598d951448492f66e9570ff3d9e412c6c6d5bf6fe88250f6c77a23a074c2c0ac51da640c26d546c2dce35f48bc0155454b440908bf84f4c5ac
+  data.tar.gz: 977c35f9138c99eb9bf8704dfef8f9f0f695549f4e327423f0dac5efb1520d2546b603056c734ba792c9311eb2d68c69ee27b2107b91f2ae373e3acb88e93018

data/bin/thieve

@@ -19,6 +19,7 @@ def parse(args)
     options = Hash.new
     options["export"] = nil
     options["ignore"] = Array.new
+    options["private"] = false
     options["verbose"] = false
 
     info = "Searches through provided directories, looking for " \
@@ -53,16 +54,31 @@ def parse(args)
 
         opts.on(
             "-i",
-            "--ignore=PATTERN",
-            "Ignore dirs/files matching PATTERN"
-        ) do |pattern|
-            options["ignore"].push(pattern)
+            "--ignore=REGEX",
+            "Ignore dirs/files matching REGEX"
+        ) do |regex|
+            options["ignore"].push(regex)
         end
 
         opts.on("--nocolor", "Disable colorized output") do
             Hilighter.disable
         end
 
+        opts.on(
+            "-p",
+            "--private-only",
+            "Only export/show private keys and matching certificates"
+        ) do
+            options["private"] = true
+        end
+
+        opts.on("--version", "Show version") do
+            __FILE__.match(/thieve-(\d+\.\d+\.\d+)/) do |m|
+                puts m[1]
+            end
+            exit ThieveExit::GOOD
+        end
+
         opts.on(
             "-v",
             "--verbose",
@@ -111,6 +127,8 @@ begin
     end
     thieve.find_matches
 
+    thieve.only_private(options["private"])
+
     export_thread = nil
     if (options["export"])
         export_thread = Thread.new do

data/lib/thieve/key_info.rb

@@ -89,7 +89,9 @@ class Thieve::KeyInfo
         when "PKCS12"
             @openssl = OpenSSL::PKCS12.new(@key)
         when "PRIVATE KEY", "PUBLIC KEY", "RSA PRIVATE KEY"
-            @openssl = OpenSSL::PKey::RSA.new(@key)
+            if (!@key.match(/ENCRYPTED/))
+                @openssl = OpenSSL::PKey::RSA.new(@key)
+            end
         when "X509 CRL"
             @openssl = OpenSSL::X509::CRL.new(@key)
         else

data/lib/thieve.rb

@@ -25,13 +25,19 @@ class Thieve
     end
     private :display_exception
 
-    def export_loot(dir)
+    def export_loot(dir, priv_only = @private)
         exported = Hash.new
         @loot.each do |type, keys|
+            next if (priv_only && !type.match(/CERTIFICATE|PRIVATE/))
+
             keys.each do |key|
+                if (priv_only && type.match(/CERTIFICATE/))
+                    next if (key.match.nil?)
+                end
+
                 key.export(dir)
-                exported[key.type] ||= Hash.new
-                exported[key.type]["#{key.fingerprint}.#{key.ext}"] =
+                exported[type] ||= Hash.new
+                exported[type]["#{key.fingerprint}.#{key.ext}"] =
                     key.to_json
             end
         end
@@ -43,17 +49,32 @@ class Thieve
     end
 
     def extract_from(file)
-        start = false
+        footer = ""
+        headers = Array.new
         key = ""
+        start = false
 
         File.open(file).each do |line|
             if (line.include?("-----BEGIN"))
-                start = true
+                footer = ""
+                headers.clear
                 key = ""
+                start = true
             end
 
-            # Don't include newlines for now
-            key += line.unpack("C*").pack("U*").strip if (start)
+            if (start)
+                # Don't include newlines for now
+                line = line.unpack("C*").pack("U*").strip
+
+                case line
+                when /^=[^=]+$/
+                    footer = line
+                when /^.+:.+$/
+                    headers.push(line)
+                else
+                    key += line
+                end
+            end
 
             if (line.include?("-----END"))
                 # Remove " + " or ' + '
@@ -84,7 +105,20 @@ class Thieve
                     keydata = k.scan(/.{,64}/).keep_if do |l|
                         !l.empty?
                     end
+
+                    # Prepend headers
+                    if (headers.any?)
+                        keydata.insert(0, "")
+                        keydata.insert(0, headers.join("\n"))
+                    end
+
+                    # Append footer
+                    keydata.push(footer) if (!footer.empty?)
+
+                    # Prepend BEGIN
                     keydata.insert(0, "-----BEGIN #{type}-----")
+
+                    # Append END
                     keydata.push("-----END #{type}-----")
 
                     begin
@@ -149,6 +183,11 @@ class Thieve
 
         @@hilight = hilight
         @loot = Hash.new
+        @private = false
+    end
+
+    def only_private(priv)
+        @private = priv
     end
 
     def steal_from(filename, ignores = Array.new)
@@ -179,11 +218,17 @@ class Thieve
         return @loot
     end
 
-    def summarize_loot
+    def summarize_loot(priv_only = @private)
         ret = Array.new
         @loot.each do |type, keys|
+            next if (priv_only && !type.match(/CERTIFICATE|PRIVATE/))
+
             ret.push(hilight_type(type))
             keys.each do |key|
+                if (priv_only && type.match(/CERTIFICATE/))
+                    next if (key.match.nil?)
+                end
+
                 ret.push("#{key.to_s}\n")
             end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thieve
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Steal keys/certs