Compare commits

...
9 Commits
Author SHA1 Message Date
Jade Ellis dda4bdc367 chore: Release 2026-11-14 20:30:27 +00:00
nex 2a753e612e fix(ci): Disable GitLab mirror 2026-11-14 20:12:54 +00:00
Jade EllisandHenry-Hiles 78db465556 fix: SEC45
Co-authored-by: Henry-Hiles <henry@henryhiles.com>
2026-11-14 20:12:28 +00:00
timedout 48d4bd60cb chore: Release 2026-11-10 20:32:00 +00:00
Jade Ellis 9c2cec78e0 fix(ci): Kill the permissions blocks entirely, they don't do anything
(cherry picked from commit 87b2ca81a3)
2026-11-10 20:30:40 +00:00
Jade Ellis 437bf0c3e6 fix(ci): Pull base images on build to prevent using outdated base images
(cherry picked from commit 7c451888ae)
2026-11-10 20:30:35 +00:00
Jade Ellis 372e956286 fix(ci): Move permissions fields causing workflow warnings
(cherry picked from commit 1716913b1a)
2026-11-10 20:30:30 +00:00
Ginger 121652fa81 fix(ci): Use local versions of workflows hosted on tomfos.tr
(cherry picked from commit d8229a7933)
2026-11-10 20:30:29 +00:00
Renovate Bot 13bd60dda9 chore(deps): update dependency node to v26
(cherry picked from commit 2badf2dfe9)
2026-11-10 20:30:29 +00:00
16 changed files with 56 additions and 56 deletions

No files matched your search

+1 -1
View File
@@ -7,7 +7,7 @@ runs:
using: composite
steps:
- name: Install sccache
uses: https://git.tomfos.tr/tom/sccache-action@v1
uses: https://forgejo.ellis.link/continuwuation/sccache-action@v1
- name: Configure sccache
uses: https://github.com/actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
with:
@@ -29,7 +29,7 @@ runs:
steps:
- name: Detect runner OS
id: runner-os
uses: https://git.tomfos.tr/actions/detect-versions@v1
uses: https://forgejo.ellis.link/continuwuation/detect-versions@v1
- name: Configure cross-compilation architecture
if: inputs.dpkg-arch != ''
+2 -2
View File
@@ -39,7 +39,7 @@ runs:
steps:
- name: Detect runner OS
id: runner-os
uses: https://git.tomfos.tr/actions/detect-versions@v1
uses: https://forgejo.ellis.link/continuwuation/detect-versions@v1
- name: Configure Cargo environment
shell: bash
@@ -147,7 +147,7 @@ runs:
run: echo "::group::📦 Restoring build cache"
- name: Setup sccache
uses: https://git.tomfos.tr/tom/sccache-action@v1
uses: https://forgejo.ellis.link/continuwuation/sccache-action@v1
- name: End build cache restore group
shell: bash
+7 -7
View File
@@ -37,9 +37,9 @@ creds:
- registry: forgejo.ellis.link
user: "{{env \"BUILTIN_REGISTRY_USER\"}}"
pass: "{{env \"BUILTIN_REGISTRY_PASSWORD\"}}"
- registry: registry.gitlab.com
user: "{{env \"GITLAB_USERNAME\"}}"
pass: "{{env \"GITLAB_TOKEN\"}}"
# - registry: registry.gitlab.com
# user: "{{env \"GITLAB_USERNAME\"}}"
# pass: "{{env \"GITLAB_TOKEN\"}}"
- registry: git.nexy7574.co.uk
user: "{{env \"N7574_GIT_USERNAME\"}}"
pass: "{{env \"N7574_GIT_TOKEN\"}}"
@@ -58,10 +58,10 @@ defaults:
# Sync configuration - each registry gets different image sets
sync:
- source: *source
target: registry.gitlab.com/continuwuity/continuwuity
type: repository
<<: *tags-main
#- source: *source
# target: registry.gitlab.com/continuwuity/continuwuity
# type: repository
# <<: *tags-main
- source: *source
target: ghcr.io/continuwuity/continuwuity
type: repository
-5
View File
@@ -4,11 +4,6 @@ on:
pull_request_target:
types: [opened, reopened]
permissions:
contents: read
pull-requests: write
issues: write
jobs:
auto-label:
name: Apply labels based on changed files
+1 -1
View File
@@ -60,7 +60,7 @@ jobs:
cargo-debian-${{ steps.debian-version.outputs.distribution }}-${{ matrix.arch }}-
- name: Setup sccache
uses: https://git.tomfos.tr/tom/sccache-action@v1
uses: https://forgejo.ellis.link/continuwuation/sccache-action@v1
- name: Configure sccache environment
run: |
-2
View File
@@ -54,8 +54,6 @@ jobs:
runs-on: ubuntu-latest
needs:
- build
permissions:
contents: write
if: startsWith(github.ref, 'refs/tags/')
steps:
- name: Download binary artifacts
-5
View File
@@ -4,11 +4,6 @@ on:
pull_request_target:
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
permissions:
contents: read
pull-requests: write
issues: write
jobs:
check-changelog:
name: Check changelog is added
+2 -2
View File
@@ -28,13 +28,13 @@ jobs:
- name: Detect runner environment
id: runner-env
uses: https://git.tomfos.tr/actions/detect-versions@v1
uses: https://forgejo.ellis.link/continuwuation/detect-versions@v1
- name: Setup Node.js
if: steps.runner-env.outputs.node_major == '' || steps.runner-env.outputs.node_major < '20'
uses: https://github.com/actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7
with:
node-version: 24
node-version: 26
- name: Cache npm dependencies
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
-4
View File
@@ -7,10 +7,6 @@ on:
- main
workflow_dispatch:
permissions:
contents: read
pull-requests: read
jobs:
fast-checks:
name: Pre-commit & Formatting
+2 -12
View File
@@ -31,11 +31,6 @@ jobs:
build-release:
name: "Build ${{ matrix.slug }} (release)"
runs-on: dind
permissions:
contents: read
packages: write
attestations: write
id-token: write
strategy:
matrix:
include:
@@ -84,6 +79,7 @@ jobs:
outputs: |
${{ env.BUILTIN_REGISTRY_ENABLED == 'true' && format('type=image,"name={0}",push-by-digest=true,name-canonical=true,push=true', env.IMAGE_PATH) || format('type=image,"name={0}",push=false', env.IMAGE_PATH) }}
type=local,dest=/tmp/binaries
pull: true # Base images were becoming out of date
env:
SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }}
- name: Upload Docker artifacts
@@ -117,11 +113,6 @@ jobs:
name: "Build ${{ matrix.slug }} (max-perf)"
runs-on: dind
needs: build-release
permissions:
contents: read
packages: write
attestations: write
id-token: write
strategy:
matrix:
include:
@@ -172,6 +163,7 @@ jobs:
outputs: |
${{ env.BUILTIN_REGISTRY_ENABLED == 'true' && format('type=image,"name={0}",push-by-digest=true,name-canonical=true,push=true', env.IMAGE_PATH) || format('type=image,"name={0}",push=false', env.IMAGE_PATH) }}
type=local,dest=/tmp/binaries
pull: true # Base images were becoming out of date
env:
SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }}
- name: Upload max-perf Docker artifacts
@@ -207,8 +199,6 @@ jobs:
needs:
- build-release
- build-maxperf
permissions:
contents: write
if: startsWith(github.ref, 'refs/tags/')
steps:
- name: Download binary artifacts
+10
View File
@@ -1,3 +1,13 @@
# Continuwuity v26.9.4 (2026-11-14)
No significant changes.
# Continuwuity v26.9.3 (2026-11-10)
No significant changes.
# Continuwuity v26.9.2 (2026-11-10)
## Bugfixes
Generated
+12 -12
View File
@@ -896,7 +896,7 @@ dependencies = [
[[package]]
name = "conduwuit"
version = "26.9.2"
version = "26.9.4"
dependencies = [
"aws-lc-rs",
"clap",
@@ -934,7 +934,7 @@ dependencies = [
[[package]]
name = "conduwuit_admin"
version = "26.9.2"
version = "26.9.4"
dependencies = [
"clap",
"conduwuit_api",
@@ -959,7 +959,7 @@ dependencies = [
[[package]]
name = "conduwuit_api"
version = "26.9.2"
version = "26.9.4"
dependencies = [
"axum",
"base64 0.23.1",
@@ -992,7 +992,7 @@ dependencies = [
[[package]]
name = "conduwuit_build_metadata"
version = "26.9.2"
version = "26.9.4"
dependencies = [
"built",
"cargo_metadata",
@@ -1000,7 +1000,7 @@ dependencies = [
[[package]]
name = "conduwuit_core"
version = "26.9.2"
version = "26.9.4"
dependencies = [
"argon2",
"arrayvec",
@@ -1065,7 +1065,7 @@ dependencies = [
[[package]]
name = "conduwuit_database"
version = "26.9.2"
version = "26.9.4"
dependencies = [
"async-channel",
"conduwuit_core",
@@ -1086,7 +1086,7 @@ dependencies = [
[[package]]
name = "conduwuit_macros"
version = "26.9.2"
version = "26.9.4"
dependencies = [
"itertools 0.15.0",
"proc-macro2",
@@ -1096,7 +1096,7 @@ dependencies = [
[[package]]
name = "conduwuit_router"
version = "26.9.2"
version = "26.9.4"
dependencies = [
"axum",
"axum-server",
@@ -1132,7 +1132,7 @@ dependencies = [
[[package]]
name = "conduwuit_service"
version = "26.9.2"
version = "26.9.4"
dependencies = [
"askama",
"assign",
@@ -1187,7 +1187,7 @@ dependencies = [
[[package]]
name = "conduwuit_web"
version = "26.9.2"
version = "26.9.4"
dependencies = [
"askama",
"async-trait",
@@ -5161,7 +5161,7 @@ dependencies = [
[[package]]
name = "ruminuwuity"
version = "26.9.2"
version = "26.9.4"
dependencies = [
"assign",
"http",
@@ -7301,7 +7301,7 @@ dependencies = [
[[package]]
name = "xtask"
version = "26.9.2"
version = "26.9.4"
dependencies = [
"askama",
"cargo_metadata",
+1 -1
View File
@@ -12,7 +12,7 @@ license = "Apache-2.0"
# See also `rust-toolchain.toml`
readme = "README.md"
repository = "https://forgejo.ellis.link/continuwuation/continuwuity"
version = "26.9.2"
version = "26.9.4"
[workspace.metadata.crane]
name = "conduwuit"
@@ -33,6 +33,16 @@ impl super::Service {
return Err!(Request(Forbidden("Redacting m.room.create is not safe, forbidding.")));
}
// Defense in depth, shouldn't be reachable
if redacting_event
.as_ref()
.is_ok_and(|pdu| pdu.room_id() != Some(room_id))
{
return Err!(Request(Forbidden(
"Cannot redact an event that belongs to a different room."
)));
}
if redacting_event
.as_ref()
.is_ok_and(|pdu| *pdu.kind() == TimelineEventType::RoomServerAcl)
+7 -1
View File
@@ -1,5 +1,5 @@
use conduwuit_core::{
Result, err,
Err, Result, err,
matrix::event::Event,
utils::{self},
warn,
@@ -32,6 +32,12 @@ impl super::Service {
err!(Database(error!(?pdu_id, %event_id, ?e, "PDU ID points to invalid PDU.")))
})?;
if pdu.room_id() != reason.room_id() {
return Err!(Request(Forbidden(
"Cannot redact an event that belongs to a different room."
)));
}
let thread_root = match pdu.get_content::<ExtractRelatesTo>() {
| Ok(ExtractRelatesTo { relates_to: Relation::Thread(thread) }) =>
Some(thread.event_id),