From cde93160826cc3139526ab3645b0a1b3d4b5281e Mon Sep 17 00:00:00 2001 From: Elmer Miroslav Mosher Golovin Date: Tue, 28 Mar 2023 13:36:37 +0300 Subject: [PATCH 1/4] Add USER_AGENT to package root Signed-off-by: Elmer Miroslav Mosher Golovin --- recording/src/nextcloud/talk/recording/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recording/src/nextcloud/talk/recording/__init__.py b/recording/src/nextcloud/talk/recording/__init__.py index 42678ef6c8d..362d456be5e 100644 --- a/recording/src/nextcloud/talk/recording/__init__.py +++ b/recording/src/nextcloud/talk/recording/__init__.py @@ -21,3 +21,5 @@ RECORDING_STATUS_AUDIO_AND_VIDEO = 1 RECORDING_STATUS_AUDIO_ONLY = 2 + +USER_AGENT = f'Mozilla/5.0 (Recording) Nextcloud-Talk v{__version__}' From 7c1a9d1df461a1ff19321858bd76e23a34ffcb47 Mon Sep 17 00:00:00 2001 From: Elmer Miroslav Mosher Golovin Date: Tue, 28 Mar 2023 13:37:33 +0300 Subject: [PATCH 2/4] Use USER_AGENT where appropriate Signed-off-by: Elmer Miroslav Mosher Golovin --- recording/src/nextcloud/talk/recording/BackendNotifier.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recording/src/nextcloud/talk/recording/BackendNotifier.py b/recording/src/nextcloud/talk/recording/BackendNotifier.py index 02d67021d8f..24f163b57fc 100644 --- a/recording/src/nextcloud/talk/recording/BackendNotifier.py +++ b/recording/src/nextcloud/talk/recording/BackendNotifier.py @@ -98,7 +98,7 @@ def backendRequest(backend, data): 'OCS-ApiRequest': 'true', 'Talk-Recording-Random': random, 'Talk-Recording-Checksum': checksum, - 'User-Agent': 'Mozilla/5.0 (Recording) Nextcloud-Talk v' + recording.__version__, + 'User-Agent': recording.USER_AGENT, } backendRequest = Request(url, data, headers) @@ -208,6 +208,7 @@ def uploadRecording(backend, token, fileName, owner): 'OCS-ApiRequest': 'true', 'Talk-Recording-Random': random, 'Talk-Recording-Checksum': checksum, + 'User-Agent': recording.USER_AGENT, } uploadRequest = Request(url, data, headers) From 1b570876b4585b544fbb8ab0603c960b1d238e6f Mon Sep 17 00:00:00 2001 From: Elmer Miroslav Mosher Golovin Date: Tue, 28 Mar 2023 13:46:30 +0300 Subject: [PATCH 3/4] Remove double slashes Signed-off-by: Elmer Miroslav Mosher Golovin --- recording/src/nextcloud/talk/recording/BackendNotifier.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recording/src/nextcloud/talk/recording/BackendNotifier.py b/recording/src/nextcloud/talk/recording/BackendNotifier.py index 24f163b57fc..798a0cbb6f4 100644 --- a/recording/src/nextcloud/talk/recording/BackendNotifier.py +++ b/recording/src/nextcloud/talk/recording/BackendNotifier.py @@ -187,7 +187,7 @@ def uploadRecording(backend, token, fileName, owner): logger.info(f"Upload recording {fileName} to {backend} in {token} as {owner}") - url = backend + '/ocs/v2.php/apps/spreed/api/v1/recording/' + token + '/store' + url = backend.rstrip('/') + '/ocs/v2.php/apps/spreed/api/v1/recording/' + token + '/store' fileContents = None with open(fileName, 'rb') as file: From 8a670746102fde0d3098177bc4257d6e1026a0da Mon Sep 17 00:00:00 2001 From: Elmer Miroslav Mosher Golovin Date: Tue, 28 Mar 2023 13:52:25 +0300 Subject: [PATCH 4/4] Update copyright Signed-off-by: Elmer Miroslav Mosher Golovin --- recording/src/nextcloud/talk/recording/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/recording/src/nextcloud/talk/recording/__init__.py b/recording/src/nextcloud/talk/recording/__init__.py index 362d456be5e..9bcd0a43e9c 100644 --- a/recording/src/nextcloud/talk/recording/__init__.py +++ b/recording/src/nextcloud/talk/recording/__init__.py @@ -1,5 +1,6 @@ # # @copyright Copyright (c) 2023, Daniel Calviño Sánchez (danxuliu@gmail.com) +# @copyright Copyright (c) 2023, Elmer Miroslav Mosher Golovin (miroslav@mishamosher.com) # # @license GNU AGPL version 3 or any later version #