From c1034b21d14f02b450d5f2c0ef27273d15da9da4 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 26 Dec 2021 15:32:00 +0000 Subject: [PATCH] Snake case --- content.py | 4 ++-- daemon.py | 8 ++++---- httpsig.py | 18 +++++++++--------- session.py | 34 +++++++++++++++++----------------- tests.py | 28 ++++++++++++++-------------- utils.py | 4 ++-- 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/content.py b/content.py index 1cf26bc63..8ccf9f51d 100644 --- a/content.py +++ b/content.py @@ -1069,8 +1069,8 @@ def saveMediaInFormPOST(mediaBytes, debug: bool, 'zip': 'application/zip' } detectedExtension = None - for extension, contentType in extensionList.items(): - searchStr = b'Content-Type: ' + contentType.encode('utf8', 'ignore') + for extension, content_type in extensionList.items(): + searchStr = b'Content-Type: ' + content_type.encode('utf8', 'ignore') mediaLocation = mediaBytes.find(searchStr) if mediaLocation > -1: # image/video/audio binaries diff --git a/daemon.py b/daemon.py index fe3439952..81fccc3aa 100644 --- a/daemon.py +++ b/daemon.py @@ -18135,10 +18135,10 @@ class PubServer(BaseHTTPRequestHandler): return # refuse to receive non-json content - contentTypeStr = self.headers['Content-type'] - if not contentTypeStr.startswith('application/json') and \ - not contentTypeStr.startswith('application/activity+json') and \ - not contentTypeStr.startswith('application/ld+json'): + content_typeStr = self.headers['Content-type'] + if not content_typeStr.startswith('application/json') and \ + not content_typeStr.startswith('application/activity+json') and \ + not content_typeStr.startswith('application/ld+json'): print("POST is not json: " + self.headers['Content-type']) if self.server.debug: print(str(self.headers)) diff --git a/httpsig.py b/httpsig.py index 9408a2c4e..8cd19ec44 100644 --- a/httpsig.py +++ b/httpsig.py @@ -70,7 +70,7 @@ def signPostHeaders(dateStr: str, privateKeyPem: str, path: str, http_prefix: str, messageBodyJsonStr: str, - contentType: str, + content_type: str, algorithm: str, digestAlgorithm: str) -> str: """Returns a raw signature string that can be plugged into a header and @@ -93,7 +93,7 @@ def signPostHeaders(dateStr: str, privateKeyPem: str, '(request-target)': f'get {path}', 'host': toDomain, 'date': dateStr, - 'accept': contentType + 'accept': content_type } else: bodyDigest = \ @@ -242,7 +242,7 @@ def createSignedHeader(dateStr: str, privateKeyPem: str, nickname: str, toDomain: str, toPort: int, path: str, http_prefix: str, withDigest: bool, messageBodyJsonStr: str, - contentType: str) -> {}: + content_type: str) -> {}: """Note that the domain is the destination, not the sender """ algorithm = 'rsa-sha256' @@ -254,20 +254,20 @@ def createSignedHeader(dateStr: str, privateKeyPem: str, nickname: str, dateStr = strftime("%a, %d %b %Y %H:%M:%S %Z", gmtime()) # Content-Type or Accept header - if not contentType: - contentType = 'application/activity+json' + if not content_type: + content_type = 'application/activity+json' if not withDigest: headers = { '(request-target)': f'get {path}', 'host': headerDomain, 'date': dateStr, - 'accept': contentType + 'accept': content_type } signatureHeader = \ signPostHeaders(dateStr, privateKeyPem, nickname, domain, port, toDomain, toPort, - path, http_prefix, None, contentType, + path, http_prefix, None, content_type, algorithm, None) else: bodyDigest = messageContentDigest(messageBodyJsonStr, digestAlgorithm) @@ -279,14 +279,14 @@ def createSignedHeader(dateStr: str, privateKeyPem: str, nickname: str, 'date': dateStr, 'digest': f'{digestPrefix}={bodyDigest}', 'content-length': str(contentLength), - 'content-type': contentType + 'content-type': content_type } signatureHeader = \ signPostHeaders(dateStr, privateKeyPem, nickname, domain, port, toDomain, toPort, path, http_prefix, messageBodyJsonStr, - contentType, algorithm, digestAlgorithm) + content_type, algorithm, digestAlgorithm) headers['signature'] = signatureHeader return headers diff --git a/session.py b/session.py index 700704c54..a1455687c 100644 --- a/session.py +++ b/session.py @@ -184,13 +184,13 @@ def _getJsonSigned(session, url: str, domain_full: str, sessionHeaders: {}, path = '/' + url.split(toDomainFull + '/')[1] else: path = '/actor' - contentType = 'application/activity+json' + content_type = 'application/activity+json' if sessionHeaders.get('Accept'): - contentType = sessionHeaders['Accept'] + content_type = sessionHeaders['Accept'] signatureHeaderJson = \ createSignedHeader(None, signing_priv_key_pem, 'actor', domain, port, toDomain, toPort, path, http_prefix, withDigest, - messageStr, contentType) + messageStr, content_type) if debug: print('Signed GET signatureHeaderJson ' + str(signatureHeaderJson)) # update the session headers from the signature headers @@ -203,7 +203,7 @@ def _getJsonSigned(session, url: str, domain_full: str, sessionHeaders: {}, print('Signed GET sessionHeaders ' + str(sessionHeaders)) returnJson = True - if 'json' not in contentType: + if 'json' not in content_type: returnJson = False return _getJsonRequest(session, url, domain_full, sessionHeaders, sessionParams, timeoutSec, None, quiet, @@ -404,18 +404,18 @@ def postImage(session, attachImageFilename: str, federation_list: [], if not os.path.isfile(attachImageFilename): print('Image not found: ' + attachImageFilename) return None - contentType = 'image/jpeg' + content_type = 'image/jpeg' if attachImageFilename.endswith('.png'): - contentType = 'image/png' + content_type = 'image/png' elif attachImageFilename.endswith('.gif'): - contentType = 'image/gif' + content_type = 'image/gif' elif attachImageFilename.endswith('.webp'): - contentType = 'image/webp' + content_type = 'image/webp' elif attachImageFilename.endswith('.avif'): - contentType = 'image/avif' + content_type = 'image/avif' elif attachImageFilename.endswith('.svg'): - contentType = 'image/svg+xml' - headers['Content-type'] = contentType + content_type = 'image/svg+xml' + headers['Content-type'] = content_type with open(attachImageFilename, 'rb') as avFile: mediaBinary = avFile.read() @@ -507,7 +507,7 @@ def downloadImageAnyMimeType(session, url: str, timeoutSec: int, debug: bool): """http GET for an image with any mime type """ mimeType = None - contentType = None + content_type = None result = None sessionHeaders = { 'Accept': 'image/x-icon, image/png, image/webp, image/jpeg, image/gif' @@ -537,13 +537,13 @@ def downloadImageAnyMimeType(session, url: str, timeoutSec: int, debug: bool): return None, None if result.headers.get('content-type'): - contentType = result.headers['content-type'] + content_type = result.headers['content-type'] elif result.headers.get('Content-type'): - contentType = result.headers['Content-type'] + content_type = result.headers['Content-type'] elif result.headers.get('Content-Type'): - contentType = result.headers['Content-Type'] + content_type = result.headers['Content-Type'] - if not contentType: + if not content_type: return None, None imageFormats = { @@ -557,6 +557,6 @@ def downloadImageAnyMimeType(session, url: str, timeoutSec: int, debug: bool): 'avif': 'avif' } for imFormat, mType in imageFormats.items(): - if 'image/' + mType in contentType: + if 'image/' + mType in content_type: mimeType = 'image/' + mType return result.content, mimeType diff --git a/tests.py b/tests.py index 6752f546c..6f27e3c51 100644 --- a/tests.py +++ b/tests.py @@ -409,7 +409,7 @@ def _testHttpSigNew(algorithm: str, digestAlgorithm: str): bodyDigest = messageContentDigest(messageBodyJsonStr, digestAlgorithm) assert bodyDigest in digestStr contentLength = 18 - contentType = 'application/activity+json' + content_type = 'application/activity+json' publicKeyPem = \ '-----BEGIN RSA PUBLIC KEY-----\n' + \ 'MIIBCgKCAQEAhAKYdtoeoy8zcAcR874L8' + \ @@ -482,7 +482,7 @@ def _testHttpSigNew(algorithm: str, digestAlgorithm: str): "host": domain, "date": dateStr, "digest": f'{digestPrefix}={bodyDigest}', - "content-type": contentType, + "content-type": content_type, "content-length": str(contentLength) } signatureIndexHeader, signatureHeader = \ @@ -534,7 +534,7 @@ def _testHttpsigBase(withDigest: bool, base_dir: str): algorithm = 'rsa-sha256' digestAlgorithm = 'rsa-sha256' - contentType = 'application/activity+json' + content_type = 'application/activity+json' nickname = 'socrates' hostDomain = 'someother.instance' domain = 'argumentative.social' @@ -563,13 +563,13 @@ def _testHttpsigBase(withDigest: bool, base_dir: str): headers = { 'host': headersDomain, 'date': dateStr, - 'accept': contentType + 'accept': content_type } signatureHeader = \ signPostHeaders(dateStr, privateKeyPem, nickname, domain, port, hostDomain, port, - boxpath, http_prefix, None, contentType, + boxpath, http_prefix, None, content_type, algorithm, None) else: digestPrefix = getDigestPrefix(digestAlgorithm) @@ -579,7 +579,7 @@ def _testHttpsigBase(withDigest: bool, base_dir: str): 'host': headersDomain, 'date': dateStr, 'digest': f'{digestPrefix}={bodyDigest}', - 'content-type': contentType, + 'content-type': content_type, 'content-length': str(contentLength) } assert getDigestAlgorithmFromHeaders(headers) == digestAlgorithm @@ -588,7 +588,7 @@ def _testHttpsigBase(withDigest: bool, base_dir: str): domain, port, hostDomain, port, boxpath, http_prefix, messageBodyJsonStr, - contentType, algorithm, digestAlgorithm) + content_type, algorithm, digestAlgorithm) headers['signature'] = signatureHeader GETmethod = not withDigest @@ -613,7 +613,7 @@ def _testHttpsigBase(withDigest: bool, base_dir: str): headers = { 'host': 'bogon.domain', 'date': dateStr, - 'content-type': contentType + 'content-type': content_type } else: # correct domain but fake message @@ -627,7 +627,7 @@ def _testHttpsigBase(withDigest: bool, base_dir: str): 'host': domain, 'date': dateStr, 'digest': f'{digestPrefix}={bodyDigest}', - 'content-type': contentType, + 'content-type': content_type, 'content-length': str(contentLength) } assert getDigestAlgorithmFromHeaders(headers) == digestAlgorithm @@ -5918,7 +5918,7 @@ def _testHttpsigBaseNew(withDigest: bool, base_dir: str, os.mkdir(path) os.chdir(path) - contentType = 'application/activity+json' + content_type = 'application/activity+json' nickname = 'socrates' hostDomain = 'someother.instance' domain = 'argumentative.social' @@ -5947,7 +5947,7 @@ def _testHttpsigBaseNew(withDigest: bool, base_dir: str, headers = { 'host': headersDomain, 'date': dateStr, - 'accept': contentType + 'accept': content_type } signatureIndexHeader, signatureHeader = \ signPostHeadersNew(dateStr, privateKeyPem, nickname, @@ -5963,7 +5963,7 @@ def _testHttpsigBaseNew(withDigest: bool, base_dir: str, 'host': headersDomain, 'date': dateStr, 'digest': f'{digestPrefix}={bodyDigest}', - 'content-type': contentType, + 'content-type': content_type, 'content-length': str(contentLength) } assert getDigestAlgorithmFromHeaders(headers) == digestAlgorithm @@ -6001,7 +6001,7 @@ def _testHttpsigBaseNew(withDigest: bool, base_dir: str, headers = { 'host': 'bogon.domain', 'date': dateStr, - 'content-type': contentType + 'content-type': content_type } else: # correct domain but fake message @@ -6015,7 +6015,7 @@ def _testHttpsigBaseNew(withDigest: bool, base_dir: str, 'host': domain, 'date': dateStr, 'digest': f'{digestPrefix}={bodyDigest}', - 'content-type': contentType, + 'content-type': content_type, 'content-length': str(contentLength) } assert getDigestAlgorithmFromHeaders(headers) == digestAlgorithm diff --git a/utils.py b/utils.py index 11a2d16be..12b12c408 100644 --- a/utils.py +++ b/utils.py @@ -378,7 +378,7 @@ def get_image_mime_type(image_filename: str) -> str: return 'image/png' -def getImageExtensionFromMimeType(contentType: str) -> str: +def getImageExtensionFromMimeType(content_type: str) -> str: """Returns the image extension from a mime type, such as image/jpeg """ image_media = { @@ -391,7 +391,7 @@ def getImageExtensionFromMimeType(contentType: str) -> str: 'x-icon': 'ico' } for mimeExt, ext in image_media.items(): - if contentType.endswith(mimeExt): + if content_type.endswith(mimeExt): return ext return 'png'