sup39/firefish
1
0
Fork 0
Code Issues Pull requests Activity

Compare commits

base: sup39:0afd1de14ea3c5cfd229988a42816a13e0dca62c
Branches Tags
sup39:main
sup39:fix/use-nullable
sup39:fix/import-ApiError
...
compare: sup39:8fa30c7a15c9f0aa466da0a26030a70e35d5e56b
Branches Tags
sup39:main
sup39:fix/use-nullable
sup39:fix/import-ApiError

3 commits
0afd1de14e ... 8fa30c7a15

Author SHA1 Message Date
sup39
8fa30c7a15
refactor (backend-rs) 
Co-authored-by: naskya <m@naskya.net>
 2024-02-20 00:21:50 +09:00
sup39
9cd3d474ae
refactor (backend-rs): check_word_mute 
Co-authored-by: naskya <m@naskya.net>
 2024-02-19 22:53:12 +09:00
mei23
a7fc8f22c1
fix (backend): validate ActivityPub Content-Type 
Co-authored-by: naskya <m@naskya.net>
 2024-02-17 18:52:02 +09:00
13 changed files with 248 additions and 237 deletions
Show stats Expand all files Collapse all files

133
Cargo.lock generated
View file

@ -30,9 +30,9 @@ dependencies = [
[[package]] [[package]]
name = "ahash" name = "ahash"
version = "0.8.7" version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"getrandom", "getrandom",
@ -80,9 +80,9 @@ dependencies = [
[[package]] [[package]]
name = "anstream" name = "anstream"
version = "0.6.11" version = "0.6.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540"
dependencies = [ dependencies = [
"anstyle", "anstyle",
"anstyle-parse", "anstyle-parse",
@ -128,9 +128,9 @@ dependencies = [
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.79" version = "1.0.80"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
[[package]] [[package]]
name = "argon2" name = "argon2"
@ -169,7 +169,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -180,7 +180,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -387,15 +387,15 @@ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
"syn_derive", "syn_derive",
] ]
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.14.0" version = "3.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f"
[[package]] [[package]]
name = "bytecheck" name = "bytecheck"
@ -460,9 +460,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
[[package]] [[package]]
name = "chrono" name = "chrono"
version = "0.4.33" version = "0.4.34"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
dependencies = [ dependencies = [
"android-tzdata", "android-tzdata",
"iana-time-zone", "iana-time-zone",
@ -485,9 +485,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.5.0" version = "4.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
dependencies = [ dependencies = [
"clap_builder", "clap_builder",
"clap_derive", "clap_derive",
@ -495,9 +495,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_builder" name = "clap_builder"
version = "4.5.0" version = "4.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
@ -514,7 +514,7 @@ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -616,7 +616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"
dependencies = [ dependencies = [
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -964,7 +964,7 @@ version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
dependencies = [ dependencies = [
"ahash 0.8.7", "ahash 0.8.8",
"allocator-api2", "allocator-api2",
] ]
@ -988,9 +988,9 @@ dependencies = [
[[package]] [[package]]
name = "hermit-abi" name = "hermit-abi"
version = "0.3.5" version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd"
[[package]] [[package]]
name = "hex" name = "hex"
@ -1118,9 +1118,9 @@ dependencies = [
[[package]] [[package]]
name = "indexmap" name = "indexmap"
version = "2.2.2" version = "2.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
dependencies = [ dependencies = [
"equivalent", "equivalent",
"hashbrown 0.14.3", "hashbrown 0.14.3",
@ -1134,7 +1134,7 @@ checksum = "0122b7114117e64a63ac49f752a5ca4624d534c7b1c7de796ac196381cd2d947"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -1191,7 +1191,7 @@ version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a071f4f7efc9a9118dfb627a0a94ef247986e1ab8606a4c806ae2b3aa3b6978" checksum = "2a071f4f7efc9a9118dfb627a0a94ef247986e1ab8606a4c806ae2b3aa3b6978"
dependencies = [ dependencies = [
"ahash 0.8.7", "ahash 0.8.8",
"anyhow", "anyhow",
"base64", "base64",
"bytecount", "bytecount",
@ -1355,9 +1355,9 @@ dependencies = [
[[package]] [[package]]
name = "napi-build" name = "napi-build"
version = "2.1.0" version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4b4532cf86bfef556348ac65e561e3123879f0e7566cca6d43a6ff5326f13df" checksum = "2f9130fccc5f763cf2069b34a089a18f0d0883c66aceb81f2fad541a3d823c43"
[[package]] [[package]]
name = "napi-derive" name = "napi-derive"
@ -1370,14 +1370,14 @@ dependencies = [
"napi-derive-backend", "napi-derive-backend",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
name = "napi-derive-backend" name = "napi-derive-backend"
version = "1.0.60" version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cf2d74ac66fd1cccb646be75fdd1c1dce8acfe20a68f61566a31da0d3eb9786" checksum = "d03b8f403a37007cad225039fc0323b961bb40d697eea744140920ebb689ff1d"
dependencies = [ dependencies = [
"convert_case", "convert_case",
"once_cell", "once_cell",
@ -1385,7 +1385,7 @@ dependencies = [
"quote", "quote",
"regex", "regex",
"semver", "semver",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -1578,7 +1578,7 @@ dependencies = [
"proc-macro-error", "proc-macro-error",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -1627,7 +1627,7 @@ dependencies = [
"regex", "regex",
"regex-syntax 0.7.5", "regex-syntax 0.7.5",
"structmeta", "structmeta",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -1697,9 +1697,9 @@ dependencies = [
[[package]] [[package]]
name = "pkg-config" name = "pkg-config"
version = "0.3.29" version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
[[package]] [[package]]
name = "powerfmt" name = "powerfmt"
@ -1921,16 +1921,17 @@ dependencies = [
[[package]] [[package]]
name = "ring" name = "ring"
version = "0.17.7" version = "0.17.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
dependencies = [ dependencies = [
"cc", "cc",
"cfg-if",
"getrandom", "getrandom",
"libc", "libc",
"spin 0.9.8", "spin 0.9.8",
"untrusted", "untrusted",
"windows-sys 0.48.0", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@ -2049,9 +2050,9 @@ dependencies = [
[[package]] [[package]]
name = "ryu" name = "ryu"
version = "1.0.16" version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
[[package]] [[package]]
name = "schemars" name = "schemars"
@ -2104,7 +2105,7 @@ dependencies = [
"proc-macro-error", "proc-macro-error",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -2145,7 +2146,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"sea-bae", "sea-bae",
"syn 2.0.48", "syn 2.0.49",
"unicode-ident", "unicode-ident",
] ]
@ -2190,9 +2191,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
[[package]] [[package]]
name = "semver" name = "semver"
version = "1.0.21" version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
[[package]] [[package]]
name = "serde" name = "serde"
@ -2211,7 +2212,7 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -2250,9 +2251,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_yaml" name = "serde_yaml"
version = "0.9.31" version = "0.9.32"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f"
dependencies = [ dependencies = [
"indexmap", "indexmap",
"itoa", "itoa",
@ -2398,7 +2399,7 @@ version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd"
dependencies = [ dependencies = [
"ahash 0.8.7", "ahash 0.8.8",
"atoi", "atoi",
"bigdecimal", "bigdecimal",
"byteorder", "byteorder",
@ -2630,7 +2631,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"structmeta-derive", "structmeta-derive",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -2641,7 +2642,7 @@ checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -2669,9 +2670,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.48" version = "2.0.49"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2687,7 +2688,7 @@ dependencies = [
"proc-macro-error", "proc-macro-error",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -2737,22 +2738,22 @@ dependencies = [
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.56" version = "1.0.57"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
dependencies = [ dependencies = [
"thiserror-impl", "thiserror-impl",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.56" version = "1.0.57"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -2828,7 +2829,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -2899,7 +2900,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]
@ -3048,7 +3049,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -3082,7 +3083,7 @@ checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -3258,9 +3259,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
[[package]] [[package]]
name = "winnow" name = "winnow"
version = "0.5.39" version = "0.5.40"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29" checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@ -3307,7 +3308,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.49",
] ]
[[package]] [[package]]

6
packages/backend-rs/src/database/connect.rs → packages/backend-rs/src/database.rs
View file

@ -1,5 +1,5 @@
use crate::config::server::SERVER_CONFIG; use crate::config::server::SERVER_CONFIG;
use crate::database::NapiDbErrExt; use crate::prelude::to_napi_error;
use sea_orm::{Database, DbConn}; use sea_orm::{Database, DbConn};
use urlencoding::encode; use urlencoding::encode;
@ -23,9 +23,7 @@ pub async fn connect_to_database() -> napi::Result<JsDbConn> {
SERVER_CONFIG.db.port, SERVER_CONFIG.db.port,
SERVER_CONFIG.db.db, SERVER_CONFIG.db.db,
); );
let conn = Database::connect(conn_uri) let conn = Database::connect(conn_uri).await.map_err(to_napi_error)?;
.await
.map_err(NapiDbErrExt::into)?;
Ok(JsDbConn { inner: conn }) Ok(JsDbConn { inner: conn })
} }

22
packages/backend-rs/src/database/error.rs
View file

@ -1,22 +0,0 @@
use sea_orm::error::DbErr;
use crate::impl_napi_error_from;
#[derive(thiserror::Error, Debug, PartialEq, Eq)]
pub enum Error {
#[error("The database connections have not been initialized yet")]
Uninitialized,
#[error("ORM error: {0}")]
OrmError(#[from] DbErr),
}
impl_napi_error_from!(Error);
pub trait NapiDbErrExt {
fn into(self) -> napi::Error;
}
impl NapiDbErrExt for DbErr {
fn into(self) -> napi::Error {
napi::Error::from_reason(self.to_string())
}
}

5
packages/backend-rs/src/database/mod.rs
View file

@ -1,5 +0,0 @@
pub mod connect;
pub mod error;
pub use connect::JsDbConn;
pub use error::NapiDbErrExt;

2
packages/backend-rs/src/model/error.rs
View file

@ -4,8 +4,6 @@ use crate::impl_napi_error_from;
pub enum Error { pub enum Error {
#[error("Failed to parse string: {0}")] #[error("Failed to parse string: {0}")]
ParseError(#[from] parse_display::ParseError), ParseError(#[from] parse_display::ParseError),
#[error("Failed to get database connection: {0}")]
DbConnError(#[from] crate::database::error::Error),
#[error("Database operation error: {0}")] #[error("Database operation error: {0}")]
DbOperationError(#[from] sea_orm::DbErr), DbOperationError(#[from] sea_orm::DbErr),
#[error("Requested entity not found")] #[error("Requested entity not found")]

123
packages/backend-rs/src/util/check_word_mute.rs
View file

@ -1,10 +1,10 @@
use crate::database::JsDbConn; use crate::database::JsDbConn;
use crate::model::entity::{drive_file, note}; use crate::model::entity::{drive_file, note};
use crate::prelude::*;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use regex::Regex; use regex::Regex;
use sea_orm::prelude::*; use sea_orm::prelude::*;
// FIXME: remove this type
#[napi_derive::napi(object)] #[napi_derive::napi(object)]
pub struct NoteLike { pub struct NoteLike {
pub file_ids: Vec<String>, pub file_ids: Vec<String>,
@ -15,82 +15,76 @@ pub struct NoteLike {
pub reply_id: Option<String>, pub reply_id: Option<String>,
} }
async fn full_text(conn: &JsDbConn, note: NoteLike) -> String { async fn all_texts(conn: &JsDbConn, note: NoteLike) -> napi::Result<Vec<String>> {
let mut to_return = format!( let mut texts: Vec<String> = vec![];
"{}\n{}\n",
note.text.unwrap_or_default(), if let Some(text) = note.text {
note.cw.unwrap_or_default(), texts.push(text);
); }
if let Some(cw) = note.cw {
texts.push(cw);
}
for file_id in note.file_ids { for file_id in note.file_ids {
if let Some(alt_text) = drive_file::Entity::find_by_id(file_id) if let Some(alt_text) = drive_file::Entity::find_by_id(file_id)
.one(conn.inner()) .one(conn.inner())
.await .await
.expect("Failed to connect to the database") .map_err(to_napi_error)?
.expect("file_id is invalid") .ok_or_else(|| to_napi_error("file_id is invalid"))?
.comment .comment
{ {
to_return.push_str(alt_text.as_str()); texts.push(alt_text);
to_return.push('\n');
} }
} }
if note.renote_id.is_some() { if let Some(renote_id) = note.renote_id {
to_return.push_str( if let Some(text) = note::Entity::find_by_id(renote_id)
note::Entity::find_by_id(note.renote_id.unwrap()) .one(conn.inner())
.one(conn.inner()) .await
.await .map_err(to_napi_error)?
.expect("Failed to connect to the database") .ok_or_else(|| to_napi_error("renote_id is invalid"))?
.expect("renote_id is invalid") .text
.text {
.unwrap_or_default() texts.push(text);
.as_str(), }
);
to_return.push('\n');
} }
if note.reply_id.is_some() { if let Some(reply_id) = note.reply_id {
to_return.push_str( if let Some(text) = note::Entity::find_by_id(reply_id)
note::Entity::find_by_id(note.reply_id.unwrap()) .one(conn.inner())
.one(conn.inner()) .await
.await .map_err(to_napi_error)?
.expect("Failed to connect to the database") .ok_or_else(|| to_napi_error("reply_id is invalid"))?
.expect("reply_id is invalid") .text
.text {
.unwrap_or_default() texts.push(text);
.as_str(), }
);
} }
to_return.trim().to_owned() Ok(texts)
} }
// FIXME: remove this funtion fn convert_regex(js_regex: &str) -> String {
fn convert_regex(js_regex: String) -> String {
static RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"^/(.+)/(.*)$").unwrap()); static RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"^/(.+)/(.*)$").unwrap());
RE.replace(&js_regex, "(?$2)$1").to_string() RE.replace(js_regex, "(?$2)$1").to_string()
} }
async fn check_word_mute_impl( fn check_word_mute_impl(
text: String, texts: &[String],
muted_word_lists: Vec<Vec<String>>, muted_word_lists: &[Vec<String>],
muted_patterns: Vec<String>, muted_patterns: &[String],
) -> bool { ) -> bool {
if text.is_empty() { muted_word_lists.iter().any(|muted_word_list| {
return false; texts.iter().any(|text| {
} let text_lower = text.to_lowercase();
muted_word_list
let text_lowercase = text.to_lowercase(); .iter()
.all(|muted_word| text_lower.contains(muted_word))
muted_word_lists.into_iter().any(|muted_word_list| { })
muted_word_list }) || muted_patterns.iter().any(|muted_pattern| {
.into_iter() Regex::new(convert_regex(muted_pattern).as_str())
.all(|muted_word| text_lowercase.contains(&muted_word.to_lowercase())) .map(|re| texts.iter().any(|text| re.is_match(text)))
}) || muted_patterns.into_iter().any(|muted_patten| { .unwrap_or(false)
match Regex::new(convert_regex(muted_patten).as_str()) {
Ok(re) => re.is_match(&text),
Err(_) => false,
}
}) })
} }
@ -100,15 +94,14 @@ pub async fn check_word_mute(
note: NoteLike, note: NoteLike,
muted_word_lists: Vec<Vec<String>>, muted_word_lists: Vec<Vec<String>>,
muted_patterns: Vec<String>, muted_patterns: Vec<String>,
) -> bool { ) -> napi::Result<bool> {
if muted_word_lists.is_empty() && muted_patterns.is_empty() { if muted_word_lists.is_empty() && muted_patterns.is_empty() {
false Ok(false)
} else { } else {
check_word_mute_impl( Ok(check_word_mute_impl(
full_text(conn, note).await, &all_texts(conn, note).await?,
muted_word_lists, &muted_word_lists,
muted_patterns, &muted_patterns,
) ))
.await
} }
} }

74
packages/backend-rs/src/util/convert_host.rs
View file

@ -1,44 +1,52 @@
use crate::config::server::SERVER_CONFIG; use crate::config::server::SERVER_CONFIG;
use crate::prelude::to_napi_error;
use idna; use idna;
use url::Url; use url::Url;
#[napi_derive::napi] #[napi_derive::napi]
pub fn get_full_ap_account(username: String, host: Option<String>) -> String { pub fn get_full_ap_account(username: String, host: Option<String>) -> napi::Result<String> {
if host.is_none() { Ok(match host {
format!("{}@{}", username, extract_host(SERVER_CONFIG.url.clone())) Some(host) => format!("{}@{}", username, to_puny(&host)?),
} else { None => format!("{}@{}", username, extract_host(&SERVER_CONFIG.url)?),
format!("{}@{}", username, to_puny(host.unwrap())) })
}
} }
#[napi_derive::napi] #[napi_derive::napi]
pub fn is_self_host(host: Option<String>) -> bool { pub fn is_self_host(host: Option<String>) -> napi::Result<bool> {
if let Some(x) = host { Ok(match host {
extract_host(SERVER_CONFIG.url.clone()) == to_puny(x) Some(host) => extract_host(&SERVER_CONFIG.url)? == to_puny(&host)?,
} else { None => true,
true })
} }
fn extract_host(uri: &str) -> napi::Result<String> {
Url::parse(uri)
.map_err(to_napi_error)?
.host_str()
.ok_or_else(|| to_napi_error("Hostname is missing"))
.and_then(to_puny)
}
#[napi_derive::napi(js_name = "extractHost")]
pub fn extract_host_js(uri: String) -> napi::Result<String> {
extract_host(&uri)
}
fn to_puny(host: &str) -> napi::Result<String> {
idna::domain_to_ascii(host).map_err(to_napi_error)
}
#[napi_derive::napi(js_name = "toPuny")]
pub fn to_puny_js(host: String) -> napi::Result<String> {
to_puny(&host)
} }
#[napi_derive::napi] #[napi_derive::napi]
pub fn extract_host(uri: String) -> String { pub fn to_puny_optional(host: Option<String>) -> napi::Result<Option<String>> {
to_puny( Ok(match host {
Url::parse(uri.as_str()) Some(host) => Some(to_puny(&host)?),
.expect("Invalid uri") None => None,
.host_str() })
.unwrap()
.to_string(),
)
}
#[napi_derive::napi]
pub fn to_puny(host: String) -> String {
idna::domain_to_ascii(&host).expect("Failed to encode the host to punycode")
}
#[napi_derive::napi]
pub fn to_puny_optional(host: Option<String>) -> Option<String> {
host.map(to_puny)
} }
#[cfg(test)] #[cfg(test)]
@ -49,15 +57,15 @@ mod unit_test {
#[test] #[test]
fn extract_host_test() { fn extract_host_test() {
assert_eq!( assert_eq!(
extract_host("https://git.joinfirefish.org/firefish/firefish.git".to_string()), extract_host("https://firefish.dev/firefish/firefish.git").unwrap(),
"git.joinfirefish.org".to_string() "firefish.dev".to_string()
); );
} }
#[test] #[test]
fn to_puny_test() { fn to_puny_test() {
assert_eq!( assert_eq!(
to_puny("何もかも.owari.shop".to_string()), to_puny("何もかも.owari.shop").unwrap(),
"xn--u8jyfb5762a.owari.shop".to_string() "xn--u8jyfb5762a.owari.shop".to_string()
); );
} }

10
packages/backend-rs/src/util/meta.rs
View file

@ -1,5 +1,6 @@
use crate::database::{JsDbConn, NapiDbErrExt}; use crate::database::JsDbConn;
use crate::model::entity::meta; use crate::model::entity::meta;
use crate::prelude::to_napi_error;
use rand::prelude::*; use rand::prelude::*;
use sea_orm::{prelude::*, ActiveValue}; use sea_orm::{prelude::*, ActiveValue};
use std::sync::Mutex; use std::sync::Mutex;
@ -22,10 +23,7 @@ pub async fn fetch_meta(conn: &JsDbConn, invalidate_cache: Option<bool>) -> napi
// try fetching from db // try fetching from db
let db = conn.inner(); let db = conn.inner();
let meta = meta::Entity::find() let meta = meta::Entity::find().one(db).await.map_err(to_napi_error)?;
.one(db)
.await
.map_err(NapiDbErrExt::into)?;
if let Some(meta) = meta { if let Some(meta) = meta {
update_cache(&meta); update_cache(&meta);
return Ok(meta); return Ok(meta);
@ -38,7 +36,7 @@ pub async fn fetch_meta(conn: &JsDbConn, invalidate_cache: Option<bool>) -> napi
}) })
.exec_with_returning(db) .exec_with_returning(db)
.await .await
.map_err(NapiDbErrExt::into)?; .map_err(to_napi_error)?;
update_cache(&meta); update_cache(&meta);
Ok(meta) Ok(meta)
} }

5
packages/backend-rs/src/util/note.rs
View file

@ -1,5 +1,6 @@
use crate::database::{JsDbConn, NapiDbErrExt}; use crate::database::JsDbConn;
use crate::model::entity::note; use crate::model::entity::note;
use crate::prelude::to_napi_error;
use sea_orm::prelude::*; use sea_orm::prelude::*;
/** /**
@ -21,5 +22,5 @@ pub async fn has_other_renote_of_this_note(
.one(conn.inner()) .one(conn.inner())
.await .await
.map(|row| row.is_some()) .map(|row| row.is_some())
.map_err(NapiDbErrExt::into) .map_err(to_napi_error)
} }

3
packages/backend/src/remote/activitypub/ap-request.ts
View file

@ -65,7 +65,8 @@ export function createSignedGet(args: {
method: "GET", method: "GET",
headers: objectAssignWithLcKey( headers: objectAssignWithLcKey(
{ {
Accept: "application/activity+json, application/ld+json", Accept:
'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
Date: new Date().toUTCString(), Date: new Date().toUTCString(),
Host: new URL(args.url).hostname, Host: new URL(args.url).hostname,
}, },

81
packages/backend/src/remote/activitypub/request.ts
View file

@ -1,9 +1,10 @@
import config from "@/config/index.js"; import config from "@/config/index.js";
import { getUserKeypair } from "@/misc/keypair-store.js"; import { getUserKeypair } from "@/misc/keypair-store.js";
import type { User } from "@/models/entities/user.js"; import type { User, ILocalUser } from "@/models/entities/user.js";
import { getResponse } from "../../misc/fetch.js"; import { getResponse } from "@/misc/fetch.js";
import { createSignedPost, createSignedGet } from "./ap-request.js"; import { createSignedPost, createSignedGet } from "./ap-request.js";
import { apLogger } from "@/remote/activitypub/logger.js"; import type { Response } from "node-fetch";
import type { IObject } from "./type.js";
export default async (user: { id: User["id"] }, url: string, object: any) => { export default async (user: { id: User["id"] }, url: string, object: any) => {
const body = JSON.stringify(object); const body = JSON.stringify(object);
@ -31,30 +32,64 @@ export default async (user: { id: User["id"] }, url: string, object: any) => {
}; };
/** /**
* Get AP object with http-signature * Get ActivityPub object
* @param user http-signature user * @param user http-signature user
* @param url URL to fetch * @param url URL to fetch
*/ */
export async function signedGet(url: string, user: { id: User["id"] }) { export async function apGet(url: string, user?: ILocalUser): Promise<IObject> {
apLogger.debug(`Running signedGet on url: ${url}`); let res: Response;
const keypair = await getUserKeypair(user.id);
const req = createSignedGet({ if (user != null) {
key: { const keypair = await getUserKeypair(user.id);
privateKeyPem: keypair.privateKey, const req = createSignedGet({
keyId: `${config.url}/users/${user.id}#main-key`, key: {
}, privateKeyPem: keypair.privateKey,
url, keyId: `${config.url}/users/${user.id}#main-key`,
additionalHeaders: { },
"User-Agent": config.userAgent, url,
}, additionalHeaders: {
}); "User-Agent": config.userAgent,
},
});
const res = await getResponse({ res = await getResponse({
url, url,
method: req.request.method, method: req.request.method,
headers: req.request.headers, headers: req.request.headers,
}); });
} else {
res = await getResponse({
url,
method: "GET",
headers: {
Accept:
'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
"User-Agent": config.userAgent,
},
});
}
return await res.json(); const contentType = res.headers.get("content-type");
if (contentType == null || !validateContentType(contentType)) {
throw new Error("Invalid Content Type");
}
if (res.body == null) throw new Error("body is null");
const text = await res.text();
if (text.length > 65536) throw new Error("too big result");
return JSON.parse(text) as IObject;
}
function validateContentType(contentType: string): boolean {
const parts = contentType.split(/\s*;\s*/);
if (parts[0] === "application/activity+json") return true;
if (parts[0] !== "application/ld+json") return false;
return parts
.slice(1)
.some(
(part) =>
part.trim() === 'profile="https://www.w3.org/ns/activitystreams"',
);
} }

9
packages/backend/src/remote/activitypub/resolver.ts
View file

@ -1,10 +1,9 @@
import config from "@/config/index.js"; import config from "@/config/index.js";
import { getJson } from "@/misc/fetch.js";
import type { ILocalUser } from "@/models/entities/user.js"; import type { ILocalUser } from "@/models/entities/user.js";
import { getInstanceActor } from "@/services/instance-actor.js"; import { getInstanceActor } from "@/services/instance-actor.js";
import { fetchMeta } from "@/misc/backend-rs.js"; import { fetchMeta } from "@/misc/backend-rs.js";
import { extractHost, isSelfHost } from "backend-rs"; import { extractHost, isSelfHost } from "backend-rs";
import { signedGet } from "./request.js"; import { apGet } from "./request.js";
import type { IObject, ICollection, IOrderedCollection } from "./type.js"; import type { IObject, ICollection, IOrderedCollection } from "./type.js";
import { isCollectionOrOrderedCollection, getApId } from "./type.js"; import { isCollectionOrOrderedCollection, getApId } from "./type.js";
import { Notes, NoteReactions, Polls, Users } from "@/models/index.js"; import { Notes, NoteReactions, Polls, Users } from "@/models/index.js";
@ -114,11 +113,7 @@ export default class Resolver {
apLogger.debug("Getting object from remote, authenticated as user:"); apLogger.debug("Getting object from remote, authenticated as user:");
apLogger.debug(JSON.stringify(this.user, null, 2)); apLogger.debug(JSON.stringify(this.user, null, 2));
const object = ( const object = await apGet(value, this.user);
this.user
? await signedGet(value, this.user)
: await getJson(value, "application/activity+json, application/ld+json")
) as IObject;
if ( if (
object == null || object == null ||

12
packages/backend/src/server/file/send-drive-file.ts
View file

@ -161,7 +161,17 @@ export default async function (ctx: Koa.Context) {
// When doing a conditional request, we MUST return a "Cache-Control" header // When doing a conditional request, we MUST return a "Cache-Control" header
// if a normal 200 response would have included. // if a normal 200 response would have included.
ctx.set("Cache-Control", "max-age=31536000, immutable"); if (contentType === "application/octet-stream") {
ctx.vary("Accept");
ctx.set("Cache-Control", "private, max-age=0, must-revalidate");
if (ctx.header.accept?.match(/activity\+json|ld\+json/)) {
ctx.status = 400;
return;
}
} else {
ctx.set("Cache-Control", "max-age=2592000, s-maxage=172800, immutable");
}
if (ctx.fresh) { if (ctx.fresh) {
ctx.status = 304; ctx.status = 304;