Compare commits

...
14 Commits
Author SHA1 Message Date
IAmTomahawkx 71e7fe3086 chore: bump release for patch 2024-12-27 16:35:02 -08:00
IAmTomahawkx 03f2e3b1bf fix: last message in a channel could not be acked, resulting in ghost dms and channel messages 2024-12-27 16:29:56 -08:00
Paul Makles 8bbb579d23 ci: revert back to GH runner 2024-12-26 14:59:03 +00:00
Paul Makles 6448af071b ci: remove purge command 2024-12-22 16:10:09 +00:00
Paul Makles c2a0ab71df ci: bring our own runner 2024-12-22 16:03:49 +00:00
Paul Makles 7a17165c24 ci: try pin to 20.04 2024-12-22 15:24:36 +00:00
Paul Makles d7213fa409 fix(ci): try to work-around runner being killed 2024-12-22 14:13:30 +00:00
Paul Makles 479f0402ca ci: switch to ubuntu 24.04 pre-emptively
trying to fix build cancellations
2024-12-22 13:30:27 +00:00
Paul Makles b62eeef80c chore(autumn): conditional animation stripping
feat(autumn): add /original redirect for files
fix(autumn): block non-images for non-attachment tags
fix(ci): use correct port for Rust test
2024-12-22 12:35:06 +00:00
Paul Makles 7b15006a50 fix: don't create "previews" of GIFs
chore: change hardcoded cache limit (should be configed!)
2024-12-20 16:42:32 +00:00
Paul Makles ac731e547d chore: log database errors to Sentry 2024-12-17 21:09:44 +00:00
TheBobBobs 443f374f23 fix(core): fix _id typo (#384) 2024-12-17 17:52:59 +00:00
Kirill MironovandPaul Makles 42367f477c perf(lto): enable link-time optimization (#371)
Co-authored-by: Paul Makles <me@insrt.uk>
2024-12-17 17:23:15 +00:00
IAmTomahawkx 3cb91151ca fix exposed port in delta dockerfile 2024-12-15 19:39:57 -08:00
26 changed files with 152 additions and 109 deletions
+2 -2
View File
@@ -67,7 +67,7 @@ jobs:
if: github.event_name != 'pull_request' && github.ref_name == 'main'
uses: nev7n/wait_for_response@v1
with:
url: "http://localhost:8000/"
url: "http://localhost:14702/"
- name: Checkout API repository
if: github.event_name != 'pull_request' && github.ref_name == 'main'
@@ -79,7 +79,7 @@ jobs:
- name: Download OpenAPI specification
if: github.event_name != 'pull_request' && github.ref_name == 'main'
run: curl http://localhost:8000/openapi.json -o api/OpenAPI.json
run: curl http://localhost:14702/openapi.json -o api/OpenAPI.json
- name: Commit changes
if: github.event_name != 'pull_request' && github.ref_name == 'main'
+2
View File
@@ -7,3 +7,5 @@ target
.vercel
.DS_Store
.idea
Generated
+13 -13
View File
@@ -5523,7 +5523,7 @@ dependencies = [
[[package]]
name = "revolt-autumn"
version = "0.8.0"
version = "0.8.1"
dependencies = [
"axum",
"axum-macros",
@@ -5560,7 +5560,7 @@ dependencies = [
[[package]]
name = "revolt-bonfire"
version = "0.8.0"
version = "0.8.1"
dependencies = [
"async-channel 2.3.1",
"async-std",
@@ -5590,7 +5590,7 @@ dependencies = [
[[package]]
name = "revolt-config"
version = "0.8.0"
version = "0.8.1"
dependencies = [
"async-std",
"cached",
@@ -5606,7 +5606,7 @@ dependencies = [
[[package]]
name = "revolt-database"
version = "0.8.0"
version = "0.8.1"
dependencies = [
"amqprs",
"async-lock 2.8.0",
@@ -5655,7 +5655,7 @@ dependencies = [
[[package]]
name = "revolt-delta"
version = "0.8.0"
version = "0.8.1"
dependencies = [
"amqprs",
"async-channel 1.6.1",
@@ -5702,7 +5702,7 @@ dependencies = [
[[package]]
name = "revolt-files"
version = "0.8.0"
version = "0.8.1"
dependencies = [
"aes-gcm",
"aws-config",
@@ -5725,7 +5725,7 @@ dependencies = [
[[package]]
name = "revolt-january"
version = "0.8.0"
version = "0.8.1"
dependencies = [
"async-recursion",
"axum",
@@ -5753,7 +5753,7 @@ dependencies = [
[[package]]
name = "revolt-models"
version = "0.8.0"
version = "0.8.1"
dependencies = [
"indexmap 1.9.3",
"iso8601-timestamp 0.2.11",
@@ -5771,7 +5771,7 @@ dependencies = [
[[package]]
name = "revolt-nodejs-bindings"
version = "0.8.0"
version = "0.8.1"
dependencies = [
"async-std",
"neon",
@@ -5784,7 +5784,7 @@ dependencies = [
[[package]]
name = "revolt-permissions"
version = "0.8.0"
version = "0.8.1"
dependencies = [
"async-std",
"async-trait",
@@ -5799,7 +5799,7 @@ dependencies = [
[[package]]
name = "revolt-presence"
version = "0.8.0"
version = "0.8.1"
dependencies = [
"async-std",
"log",
@@ -5810,7 +5810,7 @@ dependencies = [
[[package]]
name = "revolt-pushd"
version = "0.8.0"
version = "0.8.1"
dependencies = [
"amqprs",
"async-trait",
@@ -5834,7 +5834,7 @@ dependencies = [
[[package]]
name = "revolt-result"
version = "0.8.0"
version = "0.8.1"
dependencies = [
"axum",
"revolt_okapi",
+5
View File
@@ -13,3 +13,8 @@ members = [
[patch.crates-io]
redis22 = { package = "redis", version = "0.22.3", git = "https://github.com/revoltchat/redis-rs", rev = "1a41faf356fd21aebba71cea7eb7eb2653e5f0ef" }
redis23 = { package = "redis", version = "0.23.1", git = "https://github.com/revoltchat/redis-rs", rev = "f8ca28ab85da59d2ccde526b4d2fb390eff5a5f9" }
# authifier = { package = "authifier", version = "1.0.8", path = "../authifier/crates/authifier" }
# rocket_authifier = { package = "rocket_authifier", version = "1.0.8", path = "../authifier/crates/rocket_authifier" }
[profile.release]
lto = true
+1
View File
@@ -25,6 +25,7 @@ COPY crates/core/presence/Cargo.toml ./crates/core/presence/
COPY crates/core/result/Cargo.toml ./crates/core/result/
COPY crates/services/autumn/Cargo.toml ./crates/services/autumn/
COPY crates/services/january/Cargo.toml ./crates/services/january/
COPY crates/daemons/pushd/Cargo.toml ./crates/daemons/pushd/
RUN sh /tmp/build-image-layer.sh deps
# Build all apps
+4 -4
View File
@@ -1,6 +1,6 @@
[package]
name = "revolt-nodejs-bindings"
version = "0.8.0"
version = "0.8.1"
description = "Node.js bindings for the Revolt software"
authors = ["Paul Makles <me@insrt.uk>"]
license = "MIT"
@@ -20,6 +20,6 @@ serde = { version = "1", features = ["derive"] }
async-std = "1.12.0"
revolt-config = { version = "0.8.0", path = "../../core/config" }
revolt-result = { version = "0.8.0", path = "../../core/result" }
revolt-database = { version = "0.8.0", path = "../../core/database" }
revolt-config = { version = "0.8.1", path = "../../core/config" }
revolt-result = { version = "0.8.1", path = "../../core/result" }
revolt-database = { version = "0.8.1", path = "../../core/database" }
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "revolt-bonfire"
version = "0.8.0"
version = "0.8.1"
license = "AGPL-3.0-or-later"
edition = "2021"
@@ -41,7 +41,7 @@ revolt-result = { path = "../core/result" }
revolt-models = { path = "../core/models" }
revolt-config = { path = "../core/config" }
revolt-database = { path = "../core/database" }
revolt-permissions = { version = "0.8.0", path = "../core/permissions" }
revolt-permissions = { version = "0.8.1", path = "../core/permissions" }
revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
# redis
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "revolt-config"
version = "0.8.0"
version = "0.8.1"
edition = "2021"
license = "MIT"
authors = ["Paul Makles <me@insrt.uk>"]
@@ -34,4 +34,4 @@ pretty_env_logger = "0.4.0"
sentry = "0.31.5"
# Core
revolt-result = { version = "0.8.0", path = "../result", optional = true }
revolt-result = { version = "0.8.1", path = "../result", optional = true }
+11
View File
@@ -23,6 +23,17 @@ macro_rules! report_error {
};
}
#[cfg(feature = "report-macros")]
#[macro_export]
macro_rules! capture_internal_error {
( $expr: expr ) => {
$crate::capture_message(
&format!("{:?} ({}:{}:{})", $expr, file!(), line!(), column!()),
$crate::Level::Error,
);
};
}
#[cfg(feature = "report-macros")]
#[macro_export]
macro_rules! report_internal_error {
+6 -6
View File
@@ -1,6 +1,6 @@
[package]
name = "revolt-database"
version = "0.8.0"
version = "0.8.1"
edition = "2021"
license = "AGPL-3.0-or-later"
authors = ["Paul Makles <me@insrt.uk>"]
@@ -24,15 +24,15 @@ default = ["mongodb", "async-std-runtime", "tasks"]
[dependencies]
# Core
revolt-config = { version = "0.8.0", path = "../config", features = [
revolt-config = { version = "0.8.1", path = "../config", features = [
"report-macros",
] }
revolt-result = { version = "0.8.0", path = "../result" }
revolt-models = { version = "0.8.0", path = "../models", features = [
revolt-result = { version = "0.8.1", path = "../result" }
revolt-models = { version = "0.8.1", path = "../models", features = [
"validator",
] }
revolt-presence = { version = "0.8.0", path = "../presence" }
revolt-permissions = { version = "0.8.0", path = "../permissions", features = [
revolt-presence = { version = "0.8.1", path = "../presence" }
revolt-permissions = { version = "0.8.1", path = "../permissions", features = [
"serde",
"bson",
] }
+20
View File
@@ -25,6 +25,26 @@ pub use mongodb;
#[macro_use]
extern crate bson;
#[macro_export]
#[cfg(debug_assertions)]
macro_rules! query {
( $self: ident, $type: ident, $collection: expr, $($rest:expr),+ ) => {
Ok($self.$type($collection, $($rest),+).await.unwrap())
};
}
#[macro_export]
#[cfg(not(debug_assertions))]
macro_rules! query {
( $self: ident, $type: ident, $collection: expr, $($rest:expr),+ ) => {
$self.$type($collection, $($rest),+).await
.map_err(|err| {
revolt_config::capture_internal_error!(err);
create_database_error!(stringify!($type), $collection)
})
};
}
macro_rules! database_derived {
( $( $item:item )+ ) => {
$(
@@ -30,7 +30,7 @@ impl AbstractChannelUnreads for MongoDb {
doc! {
"$pull": {
"mentions": {
"$lt": message_id
"$lte": message_id
}
},
"$set": {
@@ -45,7 +45,7 @@ auto_derived!(
Image {
width: isize,
height: isize,
// animated: bool // TODO: https://docs.rs/image/latest/image/trait.AnimationDecoder.html
// animated: bool // TODO: https://docs.rs/image/latest/image/trait.AnimationDecoder.html for APNG support
},
/// File is a video with specific dimensions
Video { width: isize, height: isize },
@@ -171,7 +171,7 @@ impl AbstractMessages for MongoDb {
self.find_with_options(
COL,
doc! {
"ids": {
"_id": {
"$in": ids
}
},
+3 -3
View File
@@ -1,6 +1,6 @@
[package]
name = "revolt-files"
version = "0.8.0"
version = "0.8.1"
edition = "2021"
license = "AGPL-3.0-or-later"
authors = ["Paul Makles <me@insrt.uk>"]
@@ -20,10 +20,10 @@ typenum = "1.17.0"
aws-config = "1.5.5"
aws-sdk-s3 = { version = "1.46.0", features = ["behavior-version-latest"] }
revolt-config = { version = "0.8.0", path = "../config", features = [
revolt-config = { version = "0.8.1", path = "../config", features = [
"report-macros",
] }
revolt-result = { version = "0.8.0", path = "../result" }
revolt-result = { version = "0.8.1", path = "../result" }
# image processing
jxl-oxide = "0.8.1"
+3 -3
View File
@@ -1,6 +1,6 @@
[package]
name = "revolt-models"
version = "0.8.0"
version = "0.8.1"
edition = "2021"
license = "MIT"
authors = ["Paul Makles <me@insrt.uk>"]
@@ -20,8 +20,8 @@ default = ["serde", "partials", "rocket"]
[dependencies]
# Core
revolt-config = { version = "0.8.0", path = "../config" }
revolt-permissions = { version = "0.8.0", path = "../permissions" }
revolt-config = { version = "0.8.1", path = "../config" }
revolt-permissions = { version = "0.8.1", path = "../permissions" }
# Utility
regex = "1"
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "revolt-permissions"
version = "0.8.0"
version = "0.8.1"
edition = "2021"
license = "MIT"
authors = ["Paul Makles <me@insrt.uk>"]
@@ -21,7 +21,7 @@ async-std = { version = "1.8.0", features = ["attributes"] }
[dependencies]
# Core
revolt-result = { version = "0.8.0", path = "../result" }
revolt-result = { version = "0.8.1", path = "../result" }
# Utility
auto_ops = "0.3.0"
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "revolt-presence"
version = "0.8.0"
version = "0.8.1"
edition = "2021"
license = "AGPL-3.0-or-later"
authors = ["Paul Makles <me@insrt.uk>"]
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "revolt-result"
version = "0.8.0"
version = "0.8.1"
edition = "2021"
license = "MIT"
authors = ["Paul Makles <me@insrt.uk>"]
-17
View File
@@ -189,23 +189,6 @@ macro_rules! create_database_error {
};
}
#[macro_export]
#[cfg(debug_assertions)]
macro_rules! query {
( $self: ident, $type: ident, $collection: expr, $($rest:expr),+ ) => {
Ok($self.$type($collection, $($rest),+).await.unwrap())
};
}
#[macro_export]
#[cfg(not(debug_assertions))]
macro_rules! query {
( $self: ident, $type: ident, $collection: expr, $($rest:expr),+ ) => {
$self.$type($collection, $($rest),+).await
.map_err(|_| create_database_error!(stringify!($type), $collection))
};
}
#[cfg(test)]
mod tests {
use crate::ErrorType;
+4 -4
View File
@@ -1,12 +1,12 @@
[package]
name = "revolt-pushd"
version = "0.8.0"
version = "0.8.1"
edition = "2021"
[dependencies]
revolt-config = { version = "0.8.0", path = "../../core/config" }
revolt-database = { version = "0.8.0", path = "../../core/database" }
revolt-models = { version = "0.8.0", path = "../../core/models", features = [
revolt-config = { version = "0.8.1", path = "../../core/config" }
revolt-database = { version = "0.8.1", path = "../../core/database" }
revolt-models = { version = "0.8.1", path = "../../core/models", features = [
"validator",
] }
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "revolt-delta"
version = "0.8.0"
version = "0.8.1"
license = "AGPL-3.0-or-later"
authors = ["Paul Makles <paulmakles@gmail.com>"]
edition = "2018"
+2 -2
View File
@@ -7,7 +7,7 @@ FROM gcr.io/distroless/cc-debian12:nonroot
COPY --from=builder /home/rust/src/target/release/revolt-delta ./
COPY --from=debian /usr/bin/uname /usr/bin/uname
EXPOSE 8000
ENV ROCKET_ADDRESS 0.0.0.0
EXPOSE 14702
ENV ROCKET_ADDRESS=0.0.0.0
USER nonroot
CMD ["./revolt-delta"]
+5 -5
View File
@@ -1,6 +1,6 @@
[package]
name = "revolt-autumn"
version = "0.8.0"
version = "0.8.1"
edition = "2021"
[dependencies]
@@ -42,12 +42,12 @@ tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
# Core crates
revolt-files = { version = "0.8.0", path = "../../core/files" }
revolt-config = { version = "0.8.0", path = "../../core/config" }
revolt-database = { version = "0.8.0", path = "../../core/database", features = [
revolt-files = { version = "0.8.1", path = "../../core/files" }
revolt-config = { version = "0.8.1", path = "../../core/config" }
revolt-database = { version = "0.8.1", path = "../../core/database", features = [
"axum-impl",
] }
revolt-result = { version = "0.8.0", path = "../../core/result", features = [
revolt-result = { version = "0.8.1", path = "../../core/result", features = [
"utoipa",
"axum",
] }
+54 -33
View File
@@ -64,7 +64,8 @@ lazy_static! {
})
// TODO config
// .max_capacity(1024 * 1024 * 1024) // Cache up to 1GiB in memory
.max_capacity(512 * 1024 * 1024) // Cache up to 512MiB in memory
// .max_capacity(512 * 1024 * 1024) // Cache up to 512MiB in memory
.max_capacity(2 * 1024 * 1024 * 1024) // Cache up to 2GiB in memory
.time_to_live(Duration::from_secs(5 * 60)) // For up to 5 minutes
.build();
}
@@ -215,6 +216,27 @@ async fn upload_file(
nanoid::nanoid!(42)
};
// Determine the mime type for the file
let mime_type = determine_mime_type(&mut file.contents, &buf, &filename);
// Check blocklist for mime type
if config
.files
.blocked_mime_types
.iter()
.any(|m| m == mime_type)
{
return Err(create_error!(FileTypeNotAllowed));
}
// Determine metadata for the file
let metadata = generate_metadata(&file.contents, mime_type);
// Block non-images for non-attachment uploads
if !matches!(tag, Tag::attachments) && !matches!(metadata, Metadata::Image { .. }) {
return Err(create_error!(FileTypeNotAllowed));
}
// Find an existing hash and use that if possible
let file_hash_exists = if let Ok(file_hash) = db
.fetch_attachment_hash(&format!("{original_hash:02x}"))
@@ -238,22 +260,6 @@ async fn upload_file(
false
};
// Determine the mime type for the file
let mime_type = determine_mime_type(&mut file.contents, &buf, &filename);
// Check blocklist for mime type
if config
.files
.blocked_mime_types
.iter()
.any(|m| m == mime_type)
{
return Err(create_error!(FileTypeNotAllowed));
}
// Determine metadata for the file
let metadata = generate_metadata(&file.contents, mime_type);
// Strip metadata
let (buf, metadata) = strip_metadata(file.contents, buf, metadata, mime_type).await?;
@@ -321,21 +327,23 @@ pub static CACHE_CONTROL: &str = "public, max-age=604800, must-revalidate";
/// Fetch preview of file
///
/// This route will only return image content.
/// This route will only return image content. <br>
/// For all other file types, please use the fetch route (you will receive a redirect if you try to use this route anyways!).
///
/// Depending on the given tag, the file will be re-processed to fit the criteria:
///
/// | Tag | Image Resolution <sup>†</sup> |
/// | :-: | --- |
/// | attachments | Up to 1280px on any axis |
/// | avatars | Up to 128px on any axis |
/// | backgrounds | Up to 1280x720px |
/// | icons | Up to 128px on any axis |
/// | banners | Up to 480px on any axis |
/// | emojis | Up to 128px on any axis |
/// | Tag | Image Resolution <sup>†</sup> | Animations stripped by preview <sup>‡</sup> |
/// | :-: | --- | :-: |
/// | attachments | Up to 1280px on any axis | ❌ |
/// | avatars | Up to 128px on any axis | ✅ |
/// | backgrounds | Up to 1280x720px | ❌ |
/// | icons | Up to 128px on any axis | ✅ |
/// | banners | Up to 480px on any axis | ❌ |
/// | emojis | Up to 128px on any axis | ❌ |
///
/// <sup>†</sup> aspect ratio will always be preserved
///
/// <sup>‡</sup> to fetch animated variant, suffix `/{file_name}` or `/original` to the path
#[utoipa::path(
get,
path = "/{tag}/{file_id}",
@@ -351,8 +359,8 @@ async fn fetch_preview(
State(db): State<Database>,
Path((tag, file_id)): Path<(Tag, String)>,
) -> Result<Response> {
let tag: &'static str = tag.into();
let file = db.fetch_attachment(tag, &file_id).await?;
let tag_str: &'static str = tag.clone().into();
let file = db.fetch_attachment(tag_str, &file_id).await?;
// Ignore deleted files
if file.deleted.is_some_and(|v| v) {
@@ -366,10 +374,14 @@ async fn fetch_preview(
let hash = file.as_hash(&db).await?;
// Only process image files
if !matches!(hash.metadata, Metadata::Image { .. }) {
let is_animated = hash.content_type == "image/gif"; // TODO: extract this data from files
// Only process image files and don't process GIFs if not avatar or icon
if !matches!(hash.metadata, Metadata::Image { .. })
|| (is_animated && !matches!(tag, Tag::avatars | Tag::icons))
{
return Ok(
Redirect::permanent(&format!("/{tag}/{file_id}/{}", file.filename)).into_response(),
Redirect::permanent(&format!("/{tag_str}/{file_id}/{}", file.filename)).into_response(),
);
}
@@ -379,7 +391,7 @@ async fn fetch_preview(
// Read image and create thumbnail
let data = create_thumbnail(
decode_image(&mut Cursor::new(data), &file.content_type)?,
tag,
tag_str,
)
.await;
@@ -397,6 +409,8 @@ async fn fetch_preview(
/// Fetch original file
///
/// Content disposition header will be set to 'attachment' to prevent browser from rendering anything.
///
/// Using `original` as the file name parameter will redirect you to the original file.
#[utoipa::path(
get,
path = "/{tag}/{file_id}/{file_name}",
@@ -413,7 +427,8 @@ async fn fetch_file(
State(db): State<Database>,
Path((tag, file_id, file_name)): Path<(Tag, String, String)>,
) -> Result<Response> {
let file = db.fetch_attachment(tag.into(), &file_id).await?;
let tag: &'static str = tag.clone().into();
let file = db.fetch_attachment(tag, &file_id).await?;
// Ignore deleted files
if file.deleted.is_some_and(|v| v) {
@@ -427,6 +442,12 @@ async fn fetch_file(
// Ensure filename is correct
if file_name != file.filename {
if file_name == "original" {
return Ok(
Redirect::permanent(&format!("/{tag}/{file_id}/{}", file.filename)).into_response(),
);
}
return Err(create_error!(NotFound));
}
+5 -5
View File
@@ -1,6 +1,6 @@
[package]
name = "revolt-january"
version = "0.8.0"
version = "0.8.1"
edition = "2021"
[dependencies]
@@ -31,13 +31,13 @@ tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
# Core crates
revolt-config = { version = "0.8.0", path = "../../core/config" }
revolt-models = { version = "0.8.0", path = "../../core/models" }
revolt-result = { version = "0.8.0", path = "../../core/result", features = [
revolt-config = { version = "0.8.1", path = "../../core/config" }
revolt-models = { version = "0.8.1", path = "../../core/models" }
revolt-result = { version = "0.8.1", path = "../../core/result", features = [
"utoipa",
"axum",
] }
revolt-files = { version = "0.8.0", path = "../../core/files" }
revolt-files = { version = "0.8.1", path = "../../core/files" }
# Axum / web server
axum = { version = "0.7.5" }