Update pyarchivefile.py

Author: Kazuki Suzuki Przyborowski

pyarchivefile.py

@@ -2089,9 +2089,17 @@ def ReadFileHeaderDataWithContent(fp, listonly=False, uncompress=True, skipcheck
     fjsoncontent = {}
     fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
     if(len(fjsoncontent) > 0):
-        fjsoncontent = json.loads(fprejsoncontent.decode("UTF-8"))
+        try:
+            fjsoncontent = json.loads(base64.b64decode(fprejsoncontent).decode("UTF-8"))
+        except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+            try:
+                fjsoncontent = json.loads(fprejsoncontent.decode("UTF-8"))
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                fprejsoncontent = ""
+                fjsoncontent = {}
     else:
         fprejsoncontent = ""
+        fjsoncontent = {}
     fp.seek(len(delimiter), 1)
     HeaderOut.append(fjsoncontent)
     newfcs = GetHeaderChecksum(
@@ -2220,9 +2228,17 @@ def ReadFileHeaderDataWithContentToArray(fp, listonly=False, contentasfile=True,
     fjsoncontent = {}
     fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
     if(len(fjsoncontent) > 0):
-        fjsoncontent = json.loads(fprejsoncontent.decode("UTF-8"))
+        try:
+            fjsoncontent = json.loads(base64.b64decode(fprejsoncontent).decode("UTF-8"))
+        except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+            try:
+                fjsoncontent = json.loads(fprejsoncontent.decode("UTF-8"))
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                fprejsoncontent = ""
+                fjsoncontent = {}
     else:
         fprejsoncontent = ""
+        fjsoncontent = {}
     fp.seek(len(delimiter), 1)
     fcs = HeaderOut[-2].lower()
     fccs = HeaderOut[-1].lower()
@@ -2293,7 +2309,7 @@ def ReadFileHeaderDataWithContentToArray(fp, listonly=False, contentasfile=True,
     if(not contentasfile):
         fcontents = fcontents.read()
     outlist = {'fheadersize': fheadsize, 'fhstart': fheaderstart, 'fhend': fhend, 'ftype': ftype, 'fencoding': fencoding, 'fcencoding': fcencoding, 'fname': fname, 'fbasedir': fbasedir, 'flinkname': flinkname, 'fsize': fsize, 'fatime': fatime, 'fmtime': fmtime, 'fctime': fctime, 'fbtime': fbtime, 'fmode': fmode, 'fchmode': fchmode, 'ftypemod': ftypemod, 'fwinattributes': fwinattributes, 'fcompression': fcompression, 'fcsize': fcsize, 'fuid': fuid, 'funame': funame, 'fgid': fgid, 'fgname': fgname, 'finode': finode, 'flinkcount': flinkcount,
-               'fdev': fdev, 'fminor': fdev_minor, 'fmajor': fdev_major, 'fseeknextfile': fseeknextfile, 'fheaderchecksumtype': HeaderOut[-4], 'fcontentchecksumtype': HeaderOut[-3], 'fnumfields': fnumfields + 2, 'frawheader': HeaderOut, 'fextrafields': fextrafields, 'fextrafieldsize': fextrasize, 'fextralist': fextrafieldslist, 'fheaderchecksum': fcs, 'fcontentchecksum': fccs, 'fhascontents': pyhascontents, 'fcontentstart': fcontentstart, 'fcontentend': fcontentend, 'fcontentasfile': contentasfile, 'fcontents': fcontents}
+               'fdev': fdev, 'fminor': fdev_minor, 'fmajor': fdev_major, 'fseeknextfile': fseeknextfile, 'fheaderchecksumtype': HeaderOut[-4], 'fcontentchecksumtype': HeaderOut[-3], 'fnumfields': fnumfields + 2, 'frawheader': HeaderOut, 'fextrafields': fextrafields, 'fextrafieldsize': fextrasize, 'fextralist': fextrafieldslist, 'jsondata': fjsoncontent, 'fheaderchecksum': fcs, 'fcontentchecksum': fccs, 'fhascontents': pyhascontents, 'fcontentstart': fcontentstart, 'fcontentend': fcontentend, 'fcontentasfile': contentasfile, 'fcontents': fcontents}
     return outlist
 
 
@@ -2362,9 +2378,17 @@ def ReadFileHeaderDataWithContentToList(fp, listonly=False, contentasfile=False,
     fjsoncontent = {}
     fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
     if(len(fjsoncontent) > 0):
-        fjsoncontent = json.loads(fprejsoncontent.decode("UTF-8"))
+        try:
+            fjsoncontent = json.loads(base64.b64decode(fprejsoncontent).decode("UTF-8"))
+        except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+            try:
+                fjsoncontent = json.loads(fprejsoncontent.decode("UTF-8"))
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                fprejsoncontent = ""
+                fjsoncontent = ""
     else:
         fprejsoncontent = ""
+        fjsoncontent = ""
     fp.seek(len(delimiter), 1)
     fcs = HeaderOut[-2].lower()
     fccs = HeaderOut[-1].lower()
@@ -3359,11 +3383,17 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], filecontent="",
     tmpoutlen = len(filevalues) + len(extradata) + 7
     tmpoutlenhex = format(tmpoutlen, 'x').lower()
     tmpoutlist = filevalues
-    fprejsoncontent = {}
+    fprejsoncontent = {'testing': "test"}
     if(len(fprejsoncontent) > 0):
-        fjsoncontent = json.dumps(fprejsoncontent, separators=(',', ':'))
+        try:
+            fjsoncontent = base64.b64encode(json.dumps(fprejsoncontent).encode("UTF-8"))
+        except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+            try:
+                fjsoncontent = json.dumps(fprejsoncontent.decode("UTF-8"))
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                fjsoncontent = "".encode("UTF-8")
     else:
-        fjsoncontent = ""
+        fjsoncontent = "".encode("UTF-8")
     fjsonsize = format(len(fjsoncontent), 'x').lower()
     tmpoutlist.insert(0, tmpoutlenhex)
     tmpoutlist.append(fjsonsize)
@@ -3383,7 +3413,7 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], filecontent="",
     nullstrecd = formatspecs['format_delimiter'].encode('UTF-8')
     print(outfileoutstr)
     outfileheadercshex = GetFileChecksum(
-        outfileoutstr + nullstrecd + fjsoncontent.encode('UTF-8'), checksumtype[0], True, formatspecs)
+        outfileoutstr + nullstrecd + fjsoncontent, checksumtype[0], True, formatspecs)
     if(len(filecontent) == 0):
         outfilecontentcshex = GetFileChecksum(
             filecontent, "none", False, formatspecs)
@@ -3402,7 +3432,7 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], filecontent="",
         AppendNullBytes([outfileheadercshex, outfilecontentcshex],
                         formatspecs['format_delimiter'])
     outfileoutstrecd = outfileoutstr
-    outfileout = outfileoutstrecd + fjsoncontent.encode('UTF-8') + nullstrecd +  filecontent + nullstrecd
+    outfileout = outfileoutstrecd + fjsoncontent + nullstrecd +  filecontent + nullstrecd
     try:
         fp.write(outfileout)
     except OSError: