diff --git a/dtable_events/utils/dtable_storage_server_api.py b/dtable_events/utils/dtable_storage_server_api.py index a73f3c9c..6ed4a18c 100644 --- a/dtable_events/utils/dtable_storage_server_api.py +++ b/dtable_events/utils/dtable_storage_server_api.py @@ -1,11 +1,15 @@ import os import uuid +import time import requests +import jwt -from dtable_events.app.config import DTABLE_STORAGE_SERVER_URL +from dtable_events.app.config import DTABLE_STORAGE_SERVER_URL, DTABLE_PRIVATE_KEY TIMEOUT = 90 +STORAGE_SERVER_JWT_AUDIENCE = 'dtable-storage-server' +STORAGE_SERVER_JWT_TIMEOUT = 300 class StorageAPIError(Exception): @@ -29,6 +33,15 @@ def parse_response(response): return response.text # empty string '' +def gen_storage_server_headers(): + payload = { + 'exp': int(time.time()) + STORAGE_SERVER_JWT_TIMEOUT, + 'aud': STORAGE_SERVER_JWT_AUDIENCE, + } + token = jwt.encode(payload, DTABLE_PRIVATE_KEY, algorithm='HS256') + return {'Authorization': 'Token %s' % token} + + class DTableStorageServerAPI(object): """DTable Storage Server API """ @@ -45,7 +58,7 @@ def __str__(self): def get_dtable(self, dtable_uuid): dtable_uuid = uuid_str_to_36_chars(dtable_uuid) url = self.server_url + '/dtables/' + dtable_uuid - response = requests.get(url, timeout=TIMEOUT) + response = requests.get(url, headers=gen_storage_server_headers(), timeout=TIMEOUT) try: data = parse_response(response) except StorageAPIError as e: @@ -56,21 +69,21 @@ def get_dtable(self, dtable_uuid): def create_empty_dtable(self, dtable_uuid): dtable_uuid = uuid_str_to_36_chars(dtable_uuid) url = self.server_url + '/dtables/' + dtable_uuid - response = requests.put(url, timeout=TIMEOUT) + response = requests.put(url, headers=gen_storage_server_headers(), timeout=TIMEOUT) data = parse_response(response) return data def save_dtable(self, dtable_uuid, json_string): dtable_uuid = uuid_str_to_36_chars(dtable_uuid) url = self.server_url + '/dtables/' + dtable_uuid - response = requests.put(url, data=json_string, timeout=TIMEOUT) + response = requests.put(url, data=json_string, headers=gen_storage_server_headers(), timeout=TIMEOUT) data = parse_response(response) return data def delete_dtable(self, dtable_uuid): dtable_uuid = uuid_str_to_36_chars(dtable_uuid) url = self.server_url + '/dtables/' + dtable_uuid - response = requests.delete(url, timeout=TIMEOUT) + response = requests.delete(url, headers=gen_storage_server_headers(), timeout=TIMEOUT) try: data = parse_response(response) except StorageAPIError as e: @@ -81,7 +94,7 @@ def delete_dtable(self, dtable_uuid): def get_backup(self, dtable_uuid, version): """Return backup content""" url = self.server_url + f'/backups/{dtable_uuid}/{version}' - response = requests.get(url, timeout=TIMEOUT) + response = requests.get(url, headers=gen_storage_server_headers(), timeout=TIMEOUT) if not response.ok: raise ConnectionError(response.status_code, 'get backup failed') return response.content @@ -90,7 +103,7 @@ def get_backup_chunked(self, dtable_uuid, version, file_path): temp_path = f'{file_path}.part' url = self.server_url + f'/backups/{dtable_uuid}/{version}' try: - resp = requests.get(url, stream=True, timeout=TIMEOUT) + resp = requests.get(url, stream=True, headers=gen_storage_server_headers(), timeout=TIMEOUT) resp.raise_for_status() with open(temp_path, 'wb') as f: @@ -108,12 +121,12 @@ def create_backup(self, dtable_uuid, version, file): file: bytes or a file-like obj """ url = self.server_url + f'/backups/{dtable_uuid}/{version}' - resp = requests.put(url, data=file) + resp = requests.put(url, data=file, headers=gen_storage_server_headers()) return resp def delete_dtable_all_backups(self, dtable_uuid): url = self.server_url + f'/backups/{dtable_uuid}' - response = requests.delete(url) + response = requests.delete(url, headers=gen_storage_server_headers()) return parse_response(response)