Fix office-format handling by the GUI

3 files changed, 19 insertions, 6 deletions

diff --git a/MAT/archive.py b/MAT/archive.py
index 3c6a139..62f4ca7 100644
--- a/MAT/archive.py
+++ b/MAT/archive.py
@@ -39,7 +39,7 @@ class GenericArchiveStripper(parser.GenericParser):
                 mat.secure_remove(path_file)
         shutil.rmtree(self.tempdir)
 
-    def is_clean(self, list_unsupported):
+    def is_clean(self, list_unsupported=False):
         ''' Virtual method to check for harmul metadata
         '''
         raise NotImplementedError
@@ -312,6 +312,14 @@ class TarStripper(GenericArchiveStripper):
         return metadata
 
 
+class TerminalZipStripper(ZipStripper):
+    ''' Represent a terminal level archive.
+        This type of archive can not contain nested archives.
+        It is used for formats like docx, which are basically
+        ziped xml.
+    '''
+
+
 class GzipStripper(TarStripper):
     ''' Represent a tar.gz archive
     '''
diff --git a/MAT/office.py b/MAT/office.py
index 97405b3..e4b9567 100644
--- a/MAT/office.py
+++ b/MAT/office.py
@@ -1,4 +1,5 @@
 ''' Care about office's formats
+
 '''
 
 import logging
@@ -19,7 +20,7 @@ import parser
 import archive
 
 
-class OpenDocumentStripper(archive.ZipStripper):
+class OpenDocumentStripper(archive.TerminalZipStripper):
     ''' An open document file is a zip, with xml file into.
         The one that interest us is meta.xml
     '''
@@ -68,7 +69,7 @@ class OpenDocumentStripper(archive.ZipStripper):
         return False
 
 
-class OpenXmlStripper(archive.ZipStripper):
+class OpenXmlStripper(archive.TerminalZipStripper):
     ''' Represent an office openxml document, which is like
         an opendocument format, with some tricky stuff added.
         It contains mostly xml, but can have media blobs, crap, ...
diff --git a/mat-gui b/mat-gui
index d5c1815..4785d82 100755
--- a/mat-gui
+++ b/mat-gui
@@ -409,14 +409,18 @@ non-anonymised) file to output archive'))
             msg = _('Cleaning %s') % self.liststore[line][1].decode('utf-8', 'replace')
             logging.info(msg)
             self.statusbar.push(0, msg)
-            if isinstance(self.liststore[line][0].file, archive.GenericArchiveStripper):
-                list_to_add = []
+            is_archive = isinstance(self.liststore[line][0].file, archive.GenericArchiveStripper)
+            is_terminal = isinstance(self.liststore[line][0].file, archive.TerminalZipStripper)
+            list_to_add = []
+            if is_archive and not is_terminal:
                 unsupported_list = self.liststore[line][0].file.list_unsupported()
                 if type(unsupported_list) == list and unsupported_list:
                     logging.debug("Unsupported list: %s" % unsupported_list)
                     filename = os.path.basename(self.liststore[line][0].file.filename)
                     list_to_add = self.__popup_archive(filename, unsupported_list)
-            if self.liststore[line][0].file.remove_all(whitelist=list_to_add):
+                if self.liststore[line][0].file.remove_all(whitelist=list_to_add):
+                    self.liststore[line][2] = _('Clean')
+            elif self.liststore[line][0].file.remove_all():
                 self.liststore[line][2] = _('Clean')
             yield True
         self.statusbar.push(0, _('Ready'))