aboutsummaryrefslogtreecommitdiffstats
path: root/PolyglotFile
diff options
context:
space:
mode:
Diffstat (limited to 'PolyglotFile')
-rw-r--r--PolyglotFile/__init__.py1
-rw-r--r--PolyglotFile/polyglotpdfany.py2
-rw-r--r--PolyglotFile/polyglotzipany.py42
3 files changed, 43 insertions, 2 deletions
diff --git a/PolyglotFile/__init__.py b/PolyglotFile/__init__.py
index e6f6416..4ece820 100644
--- a/PolyglotFile/__init__.py
+++ b/PolyglotFile/__init__.py
@@ -5,4 +5,5 @@ from .polyglotpdfzip import PolyglotPdfZip
from .polyglotpdfany import PolyglotPdfAny
from .polyglotzippdf import PolyglotZipPdf
from .polyglotszippdf import PolyglotSZipPdf
+from .polyglotzipany import PolyglotZipAny
diff --git a/PolyglotFile/polyglotpdfany.py b/PolyglotFile/polyglotpdfany.py
index 8b7289f..a441f2c 100644
--- a/PolyglotFile/polyglotpdfany.py
+++ b/PolyglotFile/polyglotpdfany.py
@@ -34,8 +34,6 @@ class PolyglotPdfAny():
with open(payload2filename, "rb") as f:
self.payload2 = f.read()
- self.buffer = bytearray()
-
def generate(self):
k2stream = self.payload1
if len(k2stream) > 0:
diff --git a/PolyglotFile/polyglotzipany.py b/PolyglotFile/polyglotzipany.py
new file mode 100644
index 0000000..133db4a
--- /dev/null
+++ b/PolyglotFile/polyglotzipany.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+
+import logging
+
+'''
+ |-------------------------------| -
+ |---------- Payload 1 ----------K1 | J1
+ |-------------------------------| -
+ |---- ZIP Local File Header ----K2 |
+ |-------------------------------| -
+ |---------- Payload 2-----------K3 | J2
+ |-------------------------------| -
+ |---- ZIP Central Directory ----K4 |
+ |-------------------------------| |
+ |--- End of Central Directory --K5 |
+ |-------------------------------| |
+'''
+
+
+class PolyglotZipAny():
+ from ZipFileTransformer import Zip
+
+ def __init__(self, Zip, payload1filename, payload2filename):
+ self.buffer = bytearray()
+ self.zip = Zip
+ self.payload1 = bytearray()
+ if payload1filename is not None:
+ with open(payload1filename, "rb") as f:
+ self.payload1 = f.read()
+ self.payload2 = bytearray()
+ if payload2filename is not None:
+ with open(payload2filename, "rb") as f:
+ self.payload2 = f.read()
+
+ def generate(self):
+ self.zip.add_data_to_file(self.payload1, self.payload2, True)
+ self.buffer = self.zip.buffer
+
+ def write(self, filename):
+ fd = open(filename, "wb")
+ fd.write(self.buffer)
+ fd.close()