Skip to content

Commit 68c92f5

Browse files
sandhosesandhose
authored
Make the dual license explicit (#3955)
2 parents 8658e8d + da30500 commit 68c92f5

File tree

761 files changed

+2362
-1948
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

761 files changed

+2362
-1948
lines changed

‎.cargo/config.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
[build]
27
rustflags = ["--cfg", "tokio_unstable"]
38

‎.codecov.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
comment: false
27

38
flag_management:

‎.config/nextest.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
[profile.default]
27
retries = 1

‎.dockerignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
target/
27
crates/*/target
38
crates/*/node_modules

‎.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
root = true
27

38
[*]

‎.gitattributes

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.github/actions/build-frontend/action.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
name: Build the frontend assets
27
description: Installs Node.js and builds the frontend assets from the frontend directory
38

@@ -7,7 +12,7 @@ runs:
712
- name: Install Node
813
uses: actions/setup-node@v4.2.0
914
with:
10-
node-version: '22'
15+
node-version: "22"
1116

1217
- name: Install dependencies
1318
run: npm ci

‎.github/actions/build-policies/action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
name: Build the Open Policy Agent policies
27
description: Installs OPA and builds the policies
38

‎.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
version: 2
27
updates:
38
- package-ecosystem: "cargo"

‎.github/release.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
changelog:
27
categories:
38
- title: Bug Fixes

‎.github/scripts/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
node_modules/
27
package-lock.json

‎.github/scripts/cleanup-pr.cjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2025 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
// @ts-check
77

‎.github/scripts/commit-and-tag.cjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2025 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
// @ts-check
77

‎.github/scripts/create-release-branch.cjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2025 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
// @ts-check
77

‎.github/scripts/create-version-tag.cjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2025 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
// @ts-check
77

‎.github/scripts/merge-back.cjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2025 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
// @ts-check
77

‎.github/scripts/update-release-branch.cjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2025 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
// @ts-check
77

‎.github/scripts/update-unstable-tag.cjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2025 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
// @ts-check
77

‎.github/workflows/build.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
name: Build
27

38
on:

‎.github/workflows/ci.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
name: CI
27

38
on:

‎.github/workflows/coverage.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
name: Coverage
27

38
on:

‎.github/workflows/docs.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
name: Build and deploy the documentation
27

38
on:
49
push:
5-
branches: [ main ]
10+
branches: [main]
611
pull_request:
7-
branches: [ main ]
12+
branches: [main]
813

914
concurrency:
1015
group: ${{ github.workflow }}-${{ github.ref }}

‎.github/workflows/merge-back.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
name: Merge back a reference to main
27
on:
38
workflow_call:

‎.github/workflows/release-branch.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
name: Create a new release branch
27
on:
38
workflow_dispatch:

‎.github/workflows/release-bump.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
name: Bump the version on a release branch
27
on:
38
workflow_dispatch:

‎.github/workflows/tag.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
name: Tag a new version
27
on:
38
workflow_call:

‎.github/workflows/translations-download.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
name: Download translation files from Localazy
27
on:
38
workflow_dispatch:

‎.github/workflows/translations-upload.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
name: Upload translation files to Localazy
27
on:
38
push:

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
# Rust
27
target/
38

‎.rustfmt.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
max_width = 100
27
comment_width = 80
38
wrap_comments = true

‎Cargo.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
[workspace]
27
default-members = ["crates/cli"]
38
members = ["crates/*"]
49
resolver = "2"
510

611
# Updated in the CI with a `sed` command
712
package.version = "0.17.0-rc.0"
8-
package.license = "AGPL-3.0-only"
13+
package.license = "AGPL-3.0-only OR LicenseRef-Element-Commercial"
914
package.authors = ["Element Backend Team"]
1015
package.edition = "2024"
1116
package.homepage = "https://element-hq.github.io/matrix-authentication-service/"

‎Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# syntax = docker/dockerfile:1.7.1
2+
# Copyright 2025 New Vector Ltd.
3+
#
4+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
# Please see LICENSE files in the repository root for full details.
26

37
# Builds a minimal image with the binary only. It is multi-arch capable,
48
# cross-building to aarch64 and x86_64. When cross-compiling, Docker sets two

‎LICENSE-COMMERCIAL

Lines changed: 6 additions & 0 deletions
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+
licensing@element.io

‎README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,15 @@ Anyone can contribute to translations through [Localazy](https://localazy.com/el
2727
## 🏗️ Contributing
2828

2929
See the [contribution guidelines](https://element-hq.github.io/matrix-authentication-service/development/contributing.html) for information on how to contribute to this project.
30+
31+
## ⚖️ Copyright & License
32+
33+
Copyright 2024, 2025 New Vector Ltd.
34+
Copyright 2021-2024 The Matrix.org Foundation C.I.C.
35+
36+
This software is dual-licensed by New Vector Ltd (Element). It can be used either:
37+
38+
(1) for free under the terms of the GNU Affero General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR
39+
40+
(2) under the terms of a paid-for Element Commercial License agreement between you and Element (the terms of which may vary depending on what you and Element have agreed to).
41+
Unless required by applicable law or agreed to in writing, software distributed under the Licenses is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Licenses for the specific language governing permissions and limitations under the Licenses.

‎book.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
# Documentation for possible options in this file is at
27
# https://rust-lang.github.io/mdBook/format/config.html
38
[book]

‎clippy.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
doc-valid-idents = ["OpenID", "OAuth", "..", "PostgreSQL", "SQLite"]
27

38
disallowed-methods = [

‎crates/axum-utils/Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright 2025 New Vector Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
4+
# Please see LICENSE files in the repository root for full details.
5+
16
[package]
27
name = "mas-axum-utils"
38
version.workspace = true

‎crates/axum-utils/src/client_authorization.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Copyright 2024, 2025 New Vector Ltd.
22
// Copyright 2022-2024 The Matrix.org Foundation C.I.C.
33
//
4-
// SPDX-License-Identifier: AGPL-3.0-only
5-
// Please see LICENSE in the repository root for full details.
4+
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
// Please see LICENSE files in the repository root for full details.
66

77
use std::collections::HashMap;
88

‎crates/axum-utils/src/cookies.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Copyright 2024, 2025 New Vector Ltd.
22
// Copyright 2022-2024 The Matrix.org Foundation C.I.C.
33
//
4-
// SPDX-License-Identifier: AGPL-3.0-only
5-
// Please see LICENSE in the repository root for full details.
4+
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
// Please see LICENSE files in the repository root for full details.
66

77
//! Private (encrypted) cookie jar, based on axum-extra's cookie jar
88

‎crates/axum-utils/src/csrf.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// Copyright 2024 New Vector Ltd.
1+
// Copyright 2024, 2025 New Vector Ltd.
22
// Copyright 2022-2024 The Matrix.org Foundation C.I.C.
33
//
4-
// SPDX-License-Identifier: AGPL-3.0-only
5-
// Please see LICENSE in the repository root for full details.
4+
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
// Please see LICENSE files in the repository root for full details.
66

77
use base64ct::{Base64UrlUnpadded, Encoding};
88
use chrono::{DateTime, Duration, Utc};

0 commit comments

Comments
 (0)