Skip to content

Commit

Permalink
Update AGPL headers to include element commercial license (#68)
Browse files Browse the repository at this point in the history
This was missed in #66.
Adds information about the Element-Commercial license.
  • Loading branch information
devonh authored Dec 5, 2024
1 parent af7f726 commit 2056293
Show file tree
Hide file tree
Showing 31 changed files with 66 additions and 60 deletions.
6 changes: 6 additions & 0 deletions LICENSE-COMMERCIAL
Original file line number Diff line number Diff line change
@@ -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
[email protected]
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/__init__.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/config.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/httpserver.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/logutils.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/mcs.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/scanner/__init__.py
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/scanner/file_downloader.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/scanner/scanner.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/servlets/__init__.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/servlets/download.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/servlets/public_key.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/servlets/scan.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/servlets/thumbnail.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/utils/constants.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/utils/encrypted_file_metadata.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/utils/errors.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/utils/rust.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/matrix_content_scanner/utils/types.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/__init__.py
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 2 additions & 2 deletions tests/scanner/__init__.py
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 2 additions & 2 deletions tests/scanner/test_file_downloader.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/scanner/test_scanner.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/servlets/__init__.py
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 2 additions & 2 deletions tests/servlets/test_scan.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions tests/servlets/test_servlets.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions tests/test_crypto.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions tests/testutils.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 2 additions & 2 deletions tests/utils/test_encrypted_file_metadata.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit 2056293

Please sign in to comment.