From f809c7e525bed9fa9596aa63c09f563bedcac614 Mon Sep 17 00:00:00 2001 From: Olga Larinova Date: Fri, 25 Mar 2022 13:26:00 +0300 Subject: [PATCH] python: certificate ignore was added --- web/documentserver-example/python/config.py | 2 ++ web/documentserver-example/python/src/utils/docManager.py | 2 +- .../python/src/utils/serviceConverter.py | 2 +- web/documentserver-example/python/src/utils/trackManager.py | 6 ++---- web/documentserver-example/python/src/views/actions.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) mode change 100644 => 100755 web/documentserver-example/python/src/utils/docManager.py mode change 100644 => 100755 web/documentserver-example/python/src/utils/serviceConverter.py diff --git a/web/documentserver-example/python/config.py b/web/documentserver-example/python/config.py index ea3b2931..bf4e9cda 100644 --- a/web/documentserver-example/python/config.py +++ b/web/documentserver-example/python/config.py @@ -30,6 +30,8 @@ EXAMPLE_DOMAIN = None DOC_SERV_JWT_SECRET = '' # the secret key for generating token DOC_SERV_JWT_HEADER = 'Authorization' +DOC_SERV_VERIFY_PEER = False + EXT_SPREADSHEET = [ ".xls", ".xlsx", ".xlsm", ".xlsb", ".xlt", ".xltx", ".xltm", diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py old mode 100644 new mode 100755 index c252f477..c7c2e9e2 --- a/web/documentserver-example/python/src/utils/docManager.py +++ b/web/documentserver-example/python/src/utils/docManager.py @@ -253,7 +253,7 @@ def createFileResponse(response, path, req, meta): # save file from the given url def saveFileFromUri(uri, path, req = None, meta = False): - resp = requests.get(uri, stream=True) + resp = requests.get(uri, stream=True, verify = config.DOC_SERV_VERIFY_PEER) createFileResponse(resp, path, req, meta) return diff --git a/web/documentserver-example/python/src/utils/serviceConverter.py b/web/documentserver-example/python/src/utils/serviceConverter.py old mode 100644 new mode 100755 index a892f5bd..dea90579 --- a/web/documentserver-example/python/src/utils/serviceConverter.py +++ b/web/documentserver-example/python/src/utils/serviceConverter.py @@ -58,7 +58,7 @@ def getConverterUri(docUri, fromExt, toExt, docKey, isAsync, filePass = None, la payload['token'] = jwtManager.encode(payload) # encode a payload object into a body token headers[jwtHeader] = f'Bearer {headerToken}' # add a header Authorization with a header token with Authorization prefix in it - response = requests.post(config.DOC_SERV_SITE_URL + config.DOC_SERV_CONVERTER_URL, json=payload, headers=headers ) # send the headers and body values to the converter and write the result to the response + response = requests.post(config.DOC_SERV_SITE_URL + config.DOC_SERV_CONVERTER_URL, json=payload, headers=headers, verify = config.DOC_SERV_VERIFY_PEER) # send the headers and body values to the converter and write the result to the response json = response.json() return getResponseUri(json) diff --git a/web/documentserver-example/python/src/utils/trackManager.py b/web/documentserver-example/python/src/utils/trackManager.py index 01331e67..82585037 100755 --- a/web/documentserver-example/python/src/utils/trackManager.py +++ b/web/documentserver-example/python/src/utils/trackManager.py @@ -25,7 +25,6 @@ """ -from asyncio.windows_events import NULL import config import requests import os @@ -160,7 +159,7 @@ def commandRequest(method, key, meta = None): } if (meta): - payload.meta = meta + payload['meta'] = meta headers={'accept': 'application/json'} @@ -171,8 +170,7 @@ def commandRequest(method, key, meta = None): headers[jwtHeader] = f'Bearer {headerToken}' # add a header Authorization with a header token with Authorization prefix in it payload['token'] = jwtManager.encode(payload) # encode a payload object into a body token - - response = requests.post(documentCommandUrl, json=payload, headers=headers) + response = requests.post(documentCommandUrl, json=payload, headers=headers, verify = config.DOC_SERV_VERIFY_PEER) if (meta): return response diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index db7fdeed..2b1dfc4c 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -127,7 +127,7 @@ def saveAs(request): filename = docManager.getCorrectName(title, request) path = docManager.getStoragePath(filename, request) - resp = requests.get(saveAsFileUrl) + resp = requests.get(saveAsFileUrl, verify = config.DOC_SERV_VERIFY_PEER) if ((len(resp.content) > config.FILE_SIZE_MAX) | (len(resp.content) <= 0)): # check if the file size exceeds the maximum size allowed (5242880) response.setdefault('error', 'File size is incorrect')