Added gzip and lzma extractor plugins

src/binwalk/config/extract.conf

@@ -15,7 +15,12 @@
 #   o cpio
 #   o jffs2
 #   o Raw LZMA/deflate streams
-#   
+#
+# There are also alternative extractors for the following file formats, implemented as plugins:
+#
+#   o gzip
+#   o lzma
+#
 #################################################################################################################
 
 # Assumes these utilities are installed in $PATH.

src/binwalk/plugins/gzipextract.py

+import os
+import gzip
+import binwalk.core.plugin
+
+class GzipExtractPlugin(binwalk.core.plugin.Plugin):
+    '''
+    Gzip extractor plugin.
+    '''
+    MODULES = ['Signature']
+    BLOCK_SIZE = 10 * 1024
+
+    def init(self):
+        # If the extractor is enabled for the module we're currently loaded
+        # into, then register self.extractor as a zlib extraction rule.
+        if self.module.extractor.enabled:
+            self.module.extractor.add_rule(txtrule=None,
+                                           regex="^gzip compressed data",
+                                           extension="gz",
+                                           cmd=self.extractor)
+
+    def extractor(self, fname):
+        fname = os.path.abspath(fname)
+        outfile = os.path.splitext(fname)[0]
+
+        try:
+            fpout = open(outfile, "wb")
+            gz = gzip.GzipFile(fname, "rb")
+
+            while True:
+                data = gz.read(self.BLOCK_SIZE)
+                if data:
+                    fpout.write(data)
+                else:
+                    break
+
+            gz.close()
+            fpout.close()
+        except KeyboardInterrupt as e:
+            raise e
+        except Exception as e:
+            return False
+
+        return True

src/binwalk/plugins/lzmaextract.py

+import os
+import lzma
+import binwalk.core.plugin
+
+class LZMAExtractPlugin(binwalk.core.plugin.Plugin):
+    '''
+    Gzip extractor plugin.
+    '''
+    MODULES = ['Signature']
+
+    def init(self):
+        # If the extractor is enabled for the module we're currently loaded
+        # into, then register self.extractor as a zlib extraction rule.
+        if self.module.extractor.enabled:
+            self.module.extractor.add_rule(txtrule=None,
+                                           regex="^lzma compressed data",
+                                           extension="7z",
+                                           cmd=self.extractor)
+
+    def extractor(self, fname):
+        fname = os.path.abspath(fname)
+        outfile = os.path.splitext(fname)[0]
+
+        try:
+            fpin = open(fname, "rb")
+            compressed = fpin.read()
+            fpin.close()
+
+            decompressed = lzma.decompress(compressed)
+            print ("Decompressed %d bytes" % len(decompressed))
+
+            fpout = open(outfile, "wb")
+            fpout.write(decompressed)
+            fpout.close()
+        except KeyboardInterrupt as e:
+            raise e
+        except Exception as e:
+            return False
+
+        return True

src/binwalk/plugins/zlibextract.py

@@ -31,6 +31,8 @@ class ZLIBExtractPlugin(binwalk.core.plugin.Plugin):
 
             fpin.close()
             fpout.close()
+        except KeyboardInterrupt as e:
+            raise e
         except Exception as e:
             return False