Skip to content

Commit 2056293

Browse files
authored
Update AGPL headers to include element commercial license (#68)
This was missed in #66. Adds information about the Element-Commercial license.
1 parent af7f726 commit 2056293

31 files changed

+66
-60
lines changed

Diff for: LICENSE-COMMERCIAL

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Licensees holding a valid commercial license with Element may use this
2+
software in accordance with the terms contained in a written agreement
3+
between you and Element.
4+
5+
To purchase a commercial license please contact our sales team at
6+

Diff for: src/matrix_content_scanner/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55

66
from matrix_content_scanner.utils.rust import check_rust_lib_up_to_date
77

Diff for: src/matrix_content_scanner/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
from typing import Any, Dict, List, Optional, Union
66

77
import attr

Diff for: src/matrix_content_scanner/httpserver.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
import logging
66
from typing import TYPE_CHECKING, Awaitable, Callable
77

Diff for: src/matrix_content_scanner/logutils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
import logging
66
from contextvars import ContextVar
77
from typing import Any

Diff for: src/matrix_content_scanner/mcs.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
import argparse
66
import logging
77
import sys

Diff for: src/matrix_content_scanner/scanner/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.

Diff for: src/matrix_content_scanner/scanner/file_downloader.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
import json
66
import logging
77
import urllib.parse

Diff for: src/matrix_content_scanner/scanner/scanner.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
import asyncio
66
import hashlib
77
import logging

Diff for: src/matrix_content_scanner/servlets/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
import functools
66
import json
77
import logging

Diff for: src/matrix_content_scanner/servlets/download.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
from typing import TYPE_CHECKING, Optional, Tuple
66

77
from aiohttp import web

Diff for: src/matrix_content_scanner/servlets/public_key.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
from typing import TYPE_CHECKING, Tuple
66

77
from aiohttp import web

Diff for: src/matrix_content_scanner/servlets/scan.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
from typing import TYPE_CHECKING, Optional, Tuple
66

77
from aiohttp import web

Diff for: src/matrix_content_scanner/servlets/thumbnail.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
from typing import TYPE_CHECKING, Tuple
66

77
from aiohttp import web

Diff for: src/matrix_content_scanner/utils/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.

Diff for: src/matrix_content_scanner/utils/constants.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
from enum import Enum
66

77

Diff for: src/matrix_content_scanner/utils/encrypted_file_metadata.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
from jsonschema import ValidationError, validate
66

77
from matrix_content_scanner.utils.constants import ErrCode

Diff for: src/matrix_content_scanner/utils/errors.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
from typing import Optional
66

77
from matrix_content_scanner.utils.constants import ErrCode

Diff for: src/matrix_content_scanner/utils/rust.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2024 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55

66
import os
77
import sys

Diff for: src/matrix_content_scanner/utils/types.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
from typing import Any, Dict
66

77
import attr

Diff for: tests/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.

Diff for: tests/scanner/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.

Diff for: tests/scanner/test_file_downloader.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
import json
66
from typing import Dict, List, Optional, Tuple, Union
77
from unittest import IsolatedAsyncioTestCase

Diff for: tests/scanner/test_scanner.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
import asyncio
66
import copy
77
from typing import Any, Dict, List, Optional

Diff for: tests/servlets/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.

Diff for: tests/servlets/test_scan.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2023 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
from http import HTTPStatus
66
from unittest.mock import patch
77

Diff for: tests/servlets/test_servlets.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
import json
66
import unittest
77

Diff for: tests/test_crypto.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
import json
66
import unittest
77

Diff for: tests/testutils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
import os
66
from binascii import unhexlify
77
from typing import Dict, Optional

Diff for: tests/utils/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.

Diff for: tests/utils/test_encrypted_file_metadata.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2022 New Vector Ltd
22
#
3-
# SPDX-License-Identifier: AGPL-3.0-only
4-
# Please see LICENSE in the repository root for full details.
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
55
import copy
66
import unittest
77

0 commit comments

Comments
 (0)