thieve 0.1.13 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2bcbee04bbe31d26b9bddb01c33fff3ebc94aaf
-  data.tar.gz: 654c3f571c69e4988ae7a0af9bb42e42198564e6
+  metadata.gz: 6669f9697e445d879fa6dfd8eabfaeb8ed3cc0f2
+  data.tar.gz: d9b817848851ea9b2ecce7402429b0b0076173ab
 SHA512:
-  metadata.gz: 317640992a981662dff126a9561b3c653b860a3328cacd5bfd735d8c0c29da19c9fbb505e60ebe6a8b99a00a4cb591cc2f091035821d56efefe4ebda39c27310
-  data.tar.gz: 3b07161b5cb1fecdf0a4b57c531aee1a863471043c6ead0585efbdeab7ad7e31a69dbdb585812a469a934daff180a7841e32b75e7607e8d798e5a6b164f356fd
+  metadata.gz: 8390e68bf3c9e2fad1ae9d36fe69a9c488477360a8d1135701e19c79b77b17ace32f821bc5efe0e79d20660c9cb6907b34c7254bf16d3c14feab2014646b04d2
+  data.tar.gz: 33b2ebc3b697b6739be459e78c794093fb8444511148b3be329763fd5f6dee58bad85d9ce87cf49f7329e0ba955e58353600c5e5f7c4419e87dd53a9f22c018a

data/bin/thieve

@@ -18,6 +18,7 @@ end
 def parse(args)
     options = Hash.new
     options["export"] = nil
+    options["ignore"] = Array.new
     options["verbose"] = false
 
     info = "Searches through provided directories, looking for " \
@@ -50,6 +51,14 @@ def parse(args)
             exit ThieveExit::GOOD
         end
 
+        opts.on(
+            "-i",
+            "--ignore=PATTERN",
+            "Ignore dirs/files matching PATTERN"
+        ) do |pattern|
+            options["ignore"].push(pattern)
+        end
+
         opts.on("--nocolor", "Disable colorized output") do
             Hilighter.disable
         end
@@ -98,7 +107,7 @@ options = parse(ARGV)
 begin
     thieve = Thieve.new(!Hilighter.disable?)
     options["dirs"].each do |dir|
-        thieve.steal_from(dir)
+        thieve.steal_from(dir, options["ignore"])
     end
     thieve.find_matches
 

data/lib/thieve/key_info.rb

@@ -48,15 +48,12 @@ class Thieve::KeyInfo
     def hilight_match(match = @match)
         return "" if (match.nil?)
         return "Matches #{match}" if (!Thieve.hilight?)
-        return [
-            "Matches".light_blue,
-            match.light_green
-        ].join(" ")
+        return ["Matches".light_blue, match.light_green].join(" ")
     end
     private :hilight_match
 
     def initialize(file, type, key)
-        @ext = type.gsub(/ +/, ".").downcase
+        @ext = type.gsub(/ +/, "_").downcase
         @file = file
         @key = key
         @match = nil
@@ -116,7 +113,6 @@ class Thieve::KeyInfo
             @openssl = nil
         when "PGP SIGNATURE"
             # Not really sure what to do with this
-            @ext = "asc"
             @fingerprint = Digest::SHA256.hexdigest(@file.to_s + @key)
             @openssl = nil
         when "PRIVATE KEY"
@@ -140,7 +136,6 @@ class Thieve::KeyInfo
                 @openssl.to_der
             ).to_s
         else
-            @ext = "unknown"
             @fingerprint = Digest::SHA256.hexdigest(@file.to_s + @key)
             @openssl = nil
         end

data/lib/thieve.rb

@@ -30,38 +30,59 @@ class Thieve
         key = ""
 
         File.open(file).each do |line|
-            if (line.include?("BEGIN"))
-                start = true
-            end
+            start = true if (line.include?("BEGIN"))
 
-            if (start)
-                key += line.unpack("C*").pack("U*").lstrip.rstrip
-                if (key.end_with?("\\n\\"))
-                    key = key[0..-4]
-                end
-                key += "\\n"
-            end
+            # Don't include newlines for now
+            key += line.unpack("C*").pack("U*").strip if (start)
 
             if (line.include?("END"))
-                key.scan(/(-----BEGIN(.*)[^-]+-----END\2)/) do |m, t|
-                    keydata = m.gsub(/\\+n/, "\n").chomp
-                    type = t.gsub(/-----.*/, "").strip
+                # Remove " + " or ' + '
+                key.gsub!(%r{["'] *\+ *["']}, "")
+
+                # Remove bad characters
+                key.gsub!(%r{[^-A-Za-z0-9+/= ]+}, "")
+
+                # Find base64 key (accept spaces as we'll remove those
+                # later)
+                key_regex = [
+                    "(",
+                    "-----BEGIN ([A-Za-z0-9 ]+)-----",
+                    "([A-Za-z0-9+/= ]+)",
+                    "-----END \\2-----",
+                    ")"
+                ].join
+
+                # Scan for valid key
+                key.scan(%r{#{key_regex}}) do |m, type, k|
+                    # Remove spaces from key
+                    k.gsub!(/ +/, "")
+
+                    # Format the keydata
+                    keydata = k.scan(/.{,64}/).keep_if do |l|
+                        !l.empty?
+                    end
+                    keydata.insert(0, "-----BEGIN #{type}-----")
+                    keydata.push("-----END #{type}-----")
 
                     @loot[type] ||= Array.new
                     begin
                         @loot[type].push(
-                            Thieve::KeyInfo.new(file, type, keydata)
+                            Thieve::KeyInfo.new(
+                                file,
+                                type,
+                                keydata.join("\n")
+                            )
                         )
                     rescue Exception => e
                         if (@@hilight)
                             $stderr.puts file.to_s.light_blue
-                            keydata.each_line do |line|
-                                $stderr.puts line.strip.light_yellow
+                            keydata.each do |l|
+                                $stderr.puts l.light_yellow
                             end
                             $stderr.puts e.message.white.on_red
                         else
                             $stderr.puts file
-                            $stderr.puts keydata
+                            $stderr.puts keydata.join("\n")
                             $stderr.puts e.message
                         end
                         $stderr.puts
@@ -116,15 +137,25 @@ class Thieve
         @loot = Hash.new
     end
 
-    def steal_from(filename)
+    def steal_from(filename, ignores = Array.new)
         file = Pathname.new(filename).expand_path
 
+        skip = ignores.any? do |ignore|
+            file.to_s.match(%r{#{ignore}})
+        end
+        return @loot if (skip)
+
         if (file.directory?)
             files = Dir[File.join(file, "**", "*")].reject do |f|
                 Pathname.new(f).directory? || Pathname.new(f).symlink?
             end
 
             files.each do |f|
+                skip = ignores.any? do |ignore|
+                    f.to_s.match(%r{#{ignore}})
+                end
+                next if (skip)
+
                 extract_from(Pathname.new(f).expand_path)
             end
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thieve
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.2.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: hilighter
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Steal keys/certs