Use email.header for making a folder headerHEADmaster

Instead of implementing our own header folding, use Python's bundled
method. Reduces our own code and is likely to be more robust.

Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

1 files changed, 5 insertions, 24 deletions

diff --git a/main.py b/main.py
index 2e732e3..8d7e5a0 100755
--- a/main.py
+++ b/main.py
@@ -5,6 +5,7 @@ import sys
 import os
 import base64
 import email.utils
+import email.header
 import re
 import subprocess
 import hashlib
@@ -157,28 +158,6 @@ def splitter(longstr: bytes, limit: int = 78) -> bytes:
     return b' '.join(splitstr)
 
 
-def folder(longhdr: bytes, limit: int = 78) -> bytes:
-    lines = list()
-    line = b''
-    for chunk in longhdr.split(b' '):
-        if len(line + chunk) > limit:
-            lines.append(line)
-            line = b''
-            if len(chunk) > limit:
-                # the chunk itself is longer than limit, so append it as-is
-                lines.append(b' ' + chunk)
-                continue
-        if not len(lines) and not len(line):
-            # We're at the very start, so no need to prepend with ' '
-            line += chunk
-        else:
-            line += b' ' + chunk
-    if len(line):
-        lines.append(line)
-
-    return b'\r\n'.join(lines)
-
-
 def get_git_toplevel(gitdir: str = None) -> str:
     cmdargs = ['git']
     if gitdir:
@@ -400,7 +379,8 @@ def cmd_sign_ed25519(cmdargs) -> None:
         sys.exit(1)
 
     bdata = sk.sign(digest, encoder=Base64Encoder)
-    dshdr = folder(dshdr + splitter(bdata))
+    hhdr = email.header.make_header([(dshdr + splitter(bdata), 'us-ascii')], maxlinelen=78)
+    dshdr = hhdr.encode().encode()
     headers.append(dshdr)
     signed = b'\r\n'.join(headers) + b'\r\n\r\n' + payload
     logger.info('--- SIGNED MESSAGE STARTS ---')
@@ -430,7 +410,8 @@ def cmd_sign_pgp(cmdargs) -> None:
         logger.critical(err.decode())
         sys.exit(ecode)
     bdata = base64.b64encode(out)
-    dshdr = folder(dshdr + splitter(bdata))
+    hhdr = email.header.make_header([(dshdr + splitter(bdata), 'us-ascii')], maxlinelen=78)
+    dshdr = hhdr.encode().encode()
     headers.append(dshdr)
     signed = b'\r\n'.join(headers) + b'\r\n\r\n' + payload
     logger.info('--- SIGNED MESSAGE STARTS ---')