From 4c47a99888f1e89d9bd0f707b65cedf8ffa42f33 Mon Sep 17 00:00:00 2001
From: Devon Hudson <devonhudson@librem.one>
Date: Tue, 3 Dec 2024 11:49:34 -0700
Subject: [PATCH] Update AGPL headers to include element commercial license

---
 LICENSE-COMMERCIAL                                          | 6 ++++++
 src/matrix_content_scanner/__init__.py                      | 4 ++--
 src/matrix_content_scanner/config.py                        | 4 ++--
 src/matrix_content_scanner/httpserver.py                    | 4 ++--
 src/matrix_content_scanner/logutils.py                      | 4 ++--
 src/matrix_content_scanner/mcs.py                           | 4 ++--
 src/matrix_content_scanner/scanner/__init__.py              | 4 ++--
 src/matrix_content_scanner/scanner/file_downloader.py       | 4 ++--
 src/matrix_content_scanner/scanner/scanner.py               | 4 ++--
 src/matrix_content_scanner/servlets/__init__.py             | 4 ++--
 src/matrix_content_scanner/servlets/download.py             | 4 ++--
 src/matrix_content_scanner/servlets/public_key.py           | 4 ++--
 src/matrix_content_scanner/servlets/scan.py                 | 4 ++--
 src/matrix_content_scanner/servlets/thumbnail.py            | 4 ++--
 src/matrix_content_scanner/utils/__init__.py                | 4 ++--
 src/matrix_content_scanner/utils/constants.py               | 4 ++--
 src/matrix_content_scanner/utils/encrypted_file_metadata.py | 4 ++--
 src/matrix_content_scanner/utils/errors.py                  | 4 ++--
 src/matrix_content_scanner/utils/rust.py                    | 4 ++--
 src/matrix_content_scanner/utils/types.py                   | 4 ++--
 tests/__init__.py                                           | 4 ++--
 tests/scanner/__init__.py                                   | 4 ++--
 tests/scanner/test_file_downloader.py                       | 4 ++--
 tests/scanner/test_scanner.py                               | 4 ++--
 tests/servlets/__init__.py                                  | 4 ++--
 tests/servlets/test_scan.py                                 | 4 ++--
 tests/servlets/test_servlets.py                             | 4 ++--
 tests/test_crypto.py                                        | 4 ++--
 tests/testutils.py                                          | 4 ++--
 tests/utils/__init__.py                                     | 4 ++--
 tests/utils/test_encrypted_file_metadata.py                 | 4 ++--
 31 files changed, 66 insertions(+), 60 deletions(-)
 create mode 100644 LICENSE-COMMERCIAL

diff --git a/LICENSE-COMMERCIAL b/LICENSE-COMMERCIAL
new file mode 100644
index 0000000..173e03e
--- /dev/null
+++ b/LICENSE-COMMERCIAL
@@ -0,0 +1,6 @@
+Licensees holding a valid commercial license with Element may use this
+software in accordance with the terms contained in a written agreement
+between you and Element.
+
+To purchase a commercial license please contact our sales team at
+licensing@element.io
diff --git a/src/matrix_content_scanner/__init__.py b/src/matrix_content_scanner/__init__.py
index 953e163..4e0b928 100644
--- a/src/matrix_content_scanner/__init__.py
+++ b/src/matrix_content_scanner/__init__.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 
 from matrix_content_scanner.utils.rust import check_rust_lib_up_to_date
 
diff --git a/src/matrix_content_scanner/config.py b/src/matrix_content_scanner/config.py
index d396a2e..5651b78 100644
--- a/src/matrix_content_scanner/config.py
+++ b/src/matrix_content_scanner/config.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 from typing import Any, Dict, List, Optional, Union
 
 import attr
diff --git a/src/matrix_content_scanner/httpserver.py b/src/matrix_content_scanner/httpserver.py
index e05a146..d1189d2 100644
--- a/src/matrix_content_scanner/httpserver.py
+++ b/src/matrix_content_scanner/httpserver.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 import logging
 from typing import TYPE_CHECKING, Awaitable, Callable
 
diff --git a/src/matrix_content_scanner/logutils.py b/src/matrix_content_scanner/logutils.py
index bbc7907..8e48af1 100644
--- a/src/matrix_content_scanner/logutils.py
+++ b/src/matrix_content_scanner/logutils.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 import logging
 from contextvars import ContextVar
 from typing import Any
diff --git a/src/matrix_content_scanner/mcs.py b/src/matrix_content_scanner/mcs.py
index 07a1131..07e4688 100644
--- a/src/matrix_content_scanner/mcs.py
+++ b/src/matrix_content_scanner/mcs.py
@@ -1,7 +1,7 @@
 # Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 import argparse
 import logging
 import sys
diff --git a/src/matrix_content_scanner/scanner/__init__.py b/src/matrix_content_scanner/scanner/__init__.py
index c6a456e..86cd8d4 100644
--- a/src/matrix_content_scanner/scanner/__init__.py
+++ b/src/matrix_content_scanner/scanner/__init__.py
@@ -1,4 +1,4 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
diff --git a/src/matrix_content_scanner/scanner/file_downloader.py b/src/matrix_content_scanner/scanner/file_downloader.py
index 389030d..bcdab50 100644
--- a/src/matrix_content_scanner/scanner/file_downloader.py
+++ b/src/matrix_content_scanner/scanner/file_downloader.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 import json
 import logging
 import urllib.parse
diff --git a/src/matrix_content_scanner/scanner/scanner.py b/src/matrix_content_scanner/scanner/scanner.py
index 53e9806..9e27958 100644
--- a/src/matrix_content_scanner/scanner/scanner.py
+++ b/src/matrix_content_scanner/scanner/scanner.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 import asyncio
 import hashlib
 import logging
diff --git a/src/matrix_content_scanner/servlets/__init__.py b/src/matrix_content_scanner/servlets/__init__.py
index 84e1860..53e4ff7 100644
--- a/src/matrix_content_scanner/servlets/__init__.py
+++ b/src/matrix_content_scanner/servlets/__init__.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 import functools
 import json
 import logging
diff --git a/src/matrix_content_scanner/servlets/download.py b/src/matrix_content_scanner/servlets/download.py
index 681cfb4..6f1626c 100644
--- a/src/matrix_content_scanner/servlets/download.py
+++ b/src/matrix_content_scanner/servlets/download.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 from typing import TYPE_CHECKING, Optional, Tuple
 
 from aiohttp import web
diff --git a/src/matrix_content_scanner/servlets/public_key.py b/src/matrix_content_scanner/servlets/public_key.py
index f9cf389..b41a391 100644
--- a/src/matrix_content_scanner/servlets/public_key.py
+++ b/src/matrix_content_scanner/servlets/public_key.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 from typing import TYPE_CHECKING, Tuple
 
 from aiohttp import web
diff --git a/src/matrix_content_scanner/servlets/scan.py b/src/matrix_content_scanner/servlets/scan.py
index c3f2060..dc13cdb 100644
--- a/src/matrix_content_scanner/servlets/scan.py
+++ b/src/matrix_content_scanner/servlets/scan.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 from typing import TYPE_CHECKING, Optional, Tuple
 
 from aiohttp import web
diff --git a/src/matrix_content_scanner/servlets/thumbnail.py b/src/matrix_content_scanner/servlets/thumbnail.py
index dfae44a..9b0dd72 100644
--- a/src/matrix_content_scanner/servlets/thumbnail.py
+++ b/src/matrix_content_scanner/servlets/thumbnail.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 from typing import TYPE_CHECKING, Tuple
 
 from aiohttp import web
diff --git a/src/matrix_content_scanner/utils/__init__.py b/src/matrix_content_scanner/utils/__init__.py
index c6a456e..86cd8d4 100644
--- a/src/matrix_content_scanner/utils/__init__.py
+++ b/src/matrix_content_scanner/utils/__init__.py
@@ -1,4 +1,4 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
diff --git a/src/matrix_content_scanner/utils/constants.py b/src/matrix_content_scanner/utils/constants.py
index 49a3a83..13387a1 100644
--- a/src/matrix_content_scanner/utils/constants.py
+++ b/src/matrix_content_scanner/utils/constants.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 from enum import Enum
 
 
diff --git a/src/matrix_content_scanner/utils/encrypted_file_metadata.py b/src/matrix_content_scanner/utils/encrypted_file_metadata.py
index 2e3bdc3..7397e5f 100644
--- a/src/matrix_content_scanner/utils/encrypted_file_metadata.py
+++ b/src/matrix_content_scanner/utils/encrypted_file_metadata.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 from jsonschema import ValidationError, validate
 
 from matrix_content_scanner.utils.constants import ErrCode
diff --git a/src/matrix_content_scanner/utils/errors.py b/src/matrix_content_scanner/utils/errors.py
index 2274852..928a6ee 100644
--- a/src/matrix_content_scanner/utils/errors.py
+++ b/src/matrix_content_scanner/utils/errors.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 from typing import Optional
 
 from matrix_content_scanner.utils.constants import ErrCode
diff --git a/src/matrix_content_scanner/utils/rust.py b/src/matrix_content_scanner/utils/rust.py
index 98f86e0..8aaf537 100644
--- a/src/matrix_content_scanner/utils/rust.py
+++ b/src/matrix_content_scanner/utils/rust.py
@@ -1,7 +1,7 @@
 #  Copyright 2024 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 
 import os
 import sys
diff --git a/src/matrix_content_scanner/utils/types.py b/src/matrix_content_scanner/utils/types.py
index ae09606..ec77926 100644
--- a/src/matrix_content_scanner/utils/types.py
+++ b/src/matrix_content_scanner/utils/types.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 from typing import Any, Dict
 
 import attr
diff --git a/tests/__init__.py b/tests/__init__.py
index c6a456e..86cd8d4 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
diff --git a/tests/scanner/__init__.py b/tests/scanner/__init__.py
index c6a456e..86cd8d4 100644
--- a/tests/scanner/__init__.py
+++ b/tests/scanner/__init__.py
@@ -1,4 +1,4 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
diff --git a/tests/scanner/test_file_downloader.py b/tests/scanner/test_file_downloader.py
index ce709d4..9d10d61 100644
--- a/tests/scanner/test_file_downloader.py
+++ b/tests/scanner/test_file_downloader.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 import json
 from typing import Dict, List, Optional, Tuple, Union
 from unittest import IsolatedAsyncioTestCase
diff --git a/tests/scanner/test_scanner.py b/tests/scanner/test_scanner.py
index 6ea61fd..9c7d66b 100644
--- a/tests/scanner/test_scanner.py
+++ b/tests/scanner/test_scanner.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 import asyncio
 import copy
 from typing import Any, Dict, List, Optional
diff --git a/tests/servlets/__init__.py b/tests/servlets/__init__.py
index c6a456e..86cd8d4 100644
--- a/tests/servlets/__init__.py
+++ b/tests/servlets/__init__.py
@@ -1,4 +1,4 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
diff --git a/tests/servlets/test_scan.py b/tests/servlets/test_scan.py
index 5736919..6691b1f 100644
--- a/tests/servlets/test_scan.py
+++ b/tests/servlets/test_scan.py
@@ -1,7 +1,7 @@
 #  Copyright 2023 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 from http import HTTPStatus
 from unittest.mock import patch
 
diff --git a/tests/servlets/test_servlets.py b/tests/servlets/test_servlets.py
index c50c834..a8fc31d 100644
--- a/tests/servlets/test_servlets.py
+++ b/tests/servlets/test_servlets.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 import json
 import unittest
 
diff --git a/tests/test_crypto.py b/tests/test_crypto.py
index 0675135..9786a8a 100644
--- a/tests/test_crypto.py
+++ b/tests/test_crypto.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 import json
 import unittest
 
diff --git a/tests/testutils.py b/tests/testutils.py
index f57e816..5a23a60 100644
--- a/tests/testutils.py
+++ b/tests/testutils.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 import os
 from binascii import unhexlify
 from typing import Dict, Optional
diff --git a/tests/utils/__init__.py b/tests/utils/__init__.py
index c6a456e..86cd8d4 100644
--- a/tests/utils/__init__.py
+++ b/tests/utils/__init__.py
@@ -1,4 +1,4 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
diff --git a/tests/utils/test_encrypted_file_metadata.py b/tests/utils/test_encrypted_file_metadata.py
index 102215e..2d871fa 100644
--- a/tests/utils/test_encrypted_file_metadata.py
+++ b/tests/utils/test_encrypted_file_metadata.py
@@ -1,7 +1,7 @@
 #  Copyright 2022 New Vector Ltd
 #
-# SPDX-License-Identifier: AGPL-3.0-only
-# Please see LICENSE in the repository root for full details.
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# Please see LICENSE files in the repository root for full details.
 import copy
 import unittest