From f19c7a2e720ec22de7c64897714e93ab0e71df94 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Tue, 16 Feb 2021 19:52:56 -0500 Subject: [PATCH 1/8] A first attempt at using deser-hjson. Fixes #1270 --- .rustfmt.toml | 2 +- Cargo.lock | 233 ++++++++++++----------------- crates/api/src/lib.rs | 6 +- crates/api/src/user.rs | 21 ++- crates/apub/src/activity_queue.rs | 4 +- crates/apub/src/inbox/mod.rs | 2 +- crates/apub/src/lib.rs | 2 +- crates/apub/src/objects/mod.rs | 2 +- crates/apub/src/objects/user.rs | 2 +- crates/apub/src/routes.rs | 7 +- crates/routes/src/feeds.rs | 2 +- crates/routes/src/images.rs | 16 +- crates/routes/src/nodeinfo.rs | 2 +- crates/routes/src/webfinger.rs | 2 +- crates/structs/src/lib.rs | 2 +- crates/utils/Cargo.toml | 3 +- crates/utils/src/claims.rs | 4 +- crates/utils/src/email.rs | 2 +- crates/utils/src/lib.rs | 4 +- crates/utils/src/rate_limit/mod.rs | 2 +- crates/utils/src/request.rs | 8 +- crates/utils/src/settings.rs | 159 ++++++++++++++------ crates/utils/src/utils.rs | 5 +- docker/lemmy.hjson | 4 + src/main.rs | 7 +- tests/integration_test.rs | 2 +- 26 files changed, 285 insertions(+), 220 deletions(-) diff --git a/.rustfmt.toml b/.rustfmt.toml index f3efdc30..59528c80 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -1,5 +1,5 @@ tab_spaces = 2 edition="2018" imports_layout="HorizontalVertical" -merge_imports=true +imports_granularity="Crate" reorder_imports=true diff --git a/Cargo.lock b/Cargo.lock index 2edcca8d..ea7fdca3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ checksum = "fe7ceed015dfca322d3bcec3653909c77557e7e57df72e98cb8806e2c93cc919" dependencies = [ "chrono", "mime", - "serde 1.0.123", + "serde", "serde_json", "thiserror", "url", @@ -21,7 +21,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb8e19a0810cc25df3535061a08b7d8f8a734d309ea4411c57a9767e4a2ffa0e" dependencies = [ "activitystreams", - "serde 1.0.123", + "serde", "serde_json", ] @@ -128,7 +128,7 @@ dependencies = [ "pin-project 1.0.4", "rand 0.7.3", "regex", - "serde 1.0.123", + "serde", "serde_json", "serde_urlencoded", "sha-1 0.9.3", @@ -156,7 +156,7 @@ dependencies = [ "http", "log", "regex", - "serde 1.0.123", + "serde", ] [[package]] @@ -300,7 +300,7 @@ dependencies = [ "pin-project 1.0.4", "regex", "rustls", - "serde 1.0.123", + "serde", "serde_json", "serde_urlencoded", "socket2", @@ -389,12 +389,6 @@ version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "async-mutex" version = "1.4.0" @@ -464,7 +458,7 @@ dependencies = [ "percent-encoding", "rand 0.7.3", "rustls", - "serde 1.0.123", + "serde", "serde_json", "serde_urlencoded", ] @@ -494,7 +488,7 @@ dependencies = [ "log", "num_cpus", "rand 0.7.3", - "serde 1.0.123", + "serde", "serde_json", "thiserror", "tokio 0.2.25", @@ -513,7 +507,7 @@ dependencies = [ "async-trait", "chrono", "log", - "serde 1.0.123", + "serde", "serde_json", "thiserror", "tokio 0.2.25", @@ -733,8 +727,8 @@ checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ "libc", "num-integer", - "num-traits 0.2.14", - "serde 1.0.123", + "num-traits", + "serde", "time 0.1.44", "winapi 0.3.9", ] @@ -781,18 +775,6 @@ dependencies = [ "xdg", ] -[[package]] -name = "config" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" -dependencies = [ - "lazy_static", - "nom 5.1.2", - "serde 1.0.123", - "serde-hjson", -] - [[package]] name = "const_fn" version = "0.4.5" @@ -995,6 +977,15 @@ dependencies = [ "syn", ] +[[package]] +name = "deser-hjson" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d995b60ff81bc6af01a98f0bf5db70a7418a1ac8bd74ada633968f388139da5e" +dependencies = [ + "serde", +] + [[package]] name = "diesel" version = "1.4.5" @@ -1590,7 +1581,7 @@ dependencies = [ "jpeg-decoder", "num-iter", "num-rational", - "num-traits 0.2.14", + "num-traits", "png", "scoped_threadpool", "tiff", @@ -1684,7 +1675,7 @@ dependencies = [ "base64 0.12.3", "pem", "ring", - "serde 1.0.123", + "serde", "serde_json", "simple_asn1", ] @@ -1745,7 +1736,7 @@ dependencies = [ "openssl", "rand 0.8.3", "reqwest", - "serde 1.0.123", + "serde", "serde_json", "sha2", "strum", @@ -1792,7 +1783,7 @@ dependencies = [ "percent-encoding", "rand 0.8.3", "reqwest", - "serde 1.0.123", + "serde", "serde_json", "sha2", "strum", @@ -1816,7 +1807,7 @@ dependencies = [ "lemmy_utils", "log", "regex", - "serde 1.0.123", + "serde", "serde_json", "sha2", "strum", @@ -1831,7 +1822,7 @@ dependencies = [ "chrono", "diesel", "log", - "serde 1.0.123", + "serde", "serde_json", "url", ] @@ -1844,7 +1835,7 @@ dependencies = [ "lemmy_db_queries", "lemmy_db_schema", "log", - "serde 1.0.123", + "serde", "url", ] @@ -1855,7 +1846,7 @@ dependencies = [ "diesel", "lemmy_db_queries", "lemmy_db_schema", - "serde 1.0.123", + "serde", ] [[package]] @@ -1865,7 +1856,7 @@ dependencies = [ "diesel", "lemmy_db_queries", "lemmy_db_schema", - "serde 1.0.123", + "serde", ] [[package]] @@ -1889,7 +1880,7 @@ dependencies = [ "lemmy_websocket", "log", "rss", - "serde 1.0.123", + "serde", "sha2", "strum", "url", @@ -1925,7 +1916,7 @@ dependencies = [ "log", "openssl", "reqwest", - "serde 1.0.123", + "serde", "serde_json", "strum", "tokio 0.3.7", @@ -1946,7 +1937,7 @@ dependencies = [ "lemmy_db_views_moderator", "lemmy_utils", "log", - "serde 1.0.123", + "serde", "serde_json", "url", ] @@ -1960,7 +1951,7 @@ dependencies = [ "anyhow", "chrono", "comrak", - "config", + "deser-hjson", "diesel", "futures", "http", @@ -1969,12 +1960,13 @@ dependencies = [ "lazy_static", "lettre", "log", + "merge", "openssl", "percent-encoding", "rand 0.8.3", "regex", "reqwest", - "serde 1.0.123", + "serde", "serde_json", "strum", "strum_macros", @@ -2001,7 +1993,7 @@ dependencies = [ "log", "rand 0.8.3", "reqwest", - "serde 1.0.123", + "serde", "serde_json", "strum", "strum_macros", @@ -2020,46 +2012,23 @@ dependencies = [ "idna", "mime", "native-tls", - "nom 6.1.0", + "nom", "once_cell", "quoted_printable", "r2d2", "rand 0.8.3", "regex", - "serde 1.0.123", + "serde", "serde_json", "uuid", ] -[[package]] -name = "lexical-core" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" -dependencies = [ - "arrayvec", - "bitflags", - "cfg-if 0.1.10", - "ryu", - "static_assertions", -] - [[package]] name = "libc" version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cca32fa0182e8c0989459524dc356b8f2b5c10f1b9eb521b7d182c03cf8c5ff" -[[package]] -name = "linked-hash-map" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd" -dependencies = [ - "serde 0.8.23", - "serde_test", -] - [[package]] name = "linked-hash-map" version = "0.5.4" @@ -2102,7 +2071,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" dependencies = [ - "linked-hash-map 0.5.4", + "linked-hash-map", ] [[package]] @@ -2144,6 +2113,28 @@ dependencies = [ "autocfg", ] +[[package]] +name = "merge" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9" +dependencies = [ + "merge_derive", + "num-traits", +] + +[[package]] +name = "merge_derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "migrations_internals" version = "1.4.1" @@ -2271,17 +2262,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "lexical-core", - "memchr", - "version_check", -] - [[package]] name = "nom" version = "6.1.0" @@ -2301,7 +2281,7 @@ checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -2311,7 +2291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ "autocfg", - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -2322,7 +2302,7 @@ checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -2333,16 +2313,7 @@ checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.14", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -2597,6 +2568,30 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro-hack" version = "0.5.19" @@ -2838,7 +2833,7 @@ dependencies = [ "native-tls", "percent-encoding", "pin-project-lite 0.2.4", - "serde 1.0.123", + "serde", "serde_json", "serde_urlencoded", "tokio 0.2.25", @@ -3008,12 +3003,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "serde" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" - [[package]] name = "serde" version = "1.0.123" @@ -3023,19 +3012,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-hjson" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8" -dependencies = [ - "lazy_static", - "linked-hash-map 0.3.0", - "num-traits 0.1.43", - "regex", - "serde 0.8.23", -] - [[package]] name = "serde_derive" version = "1.0.123" @@ -3056,16 +3032,7 @@ dependencies = [ "indexmap", "itoa", "ryu", - "serde 1.0.123", -] - -[[package]] -name = "serde_test" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5" -dependencies = [ - "serde 0.8.23", + "serde", ] [[package]] @@ -3077,7 +3044,7 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.123", + "serde", ] [[package]] @@ -3147,7 +3114,7 @@ checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b" dependencies = [ "chrono", "num-bigint", - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -3188,12 +3155,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "stdweb" version = "0.4.20" @@ -3216,7 +3177,7 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ "proc-macro2", "quote", - "serde 1.0.123", + "serde", "serde_derive", "syn", ] @@ -3230,7 +3191,7 @@ dependencies = [ "base-x", "proc-macro2", "quote", - "serde 1.0.123", + "serde", "serde_derive", "serde_json", "sha1", @@ -3666,7 +3627,7 @@ dependencies = [ "idna", "matches", "percent-encoding", - "serde 1.0.123", + "serde", ] [[package]] @@ -3676,7 +3637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ "getrandom 0.2.2", - "serde 1.0.123", + "serde", ] [[package]] @@ -3720,7 +3681,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55c0f7123de74f0dab9b7d00fd614e7b19349cd1e2f5252bbe9b1754b59433be" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.123", + "serde", "serde_json", "wasm-bindgen-macro", ] diff --git a/crates/api/src/lib.rs b/crates/api/src/lib.rs index 5e9e1c16..779da57f 100644 --- a/crates/api/src/lib.rs +++ b/crates/api/src/lib.rs @@ -184,7 +184,7 @@ pub(crate) fn check_optional_url(item: &Option>) -> Result<(), Le pub(crate) async fn build_federated_instances( pool: &DbPool, ) -> Result, LemmyError> { - if Settings::get().federation.enabled { + if Settings::get().federation.unwrap_or_default().enabled { let distinct_communities = blocking(pool, move |conn| { Community::distinct_federated_communities(conn) }) @@ -199,7 +199,9 @@ pub(crate) async fn build_federated_instances( .collect::, LemmyError>>()?; linked.extend_from_slice(&allowed); - linked.retain(|a| !blocked.contains(a) && !a.eq("") && !a.eq(&Settings::get().hostname)); + linked.retain(|a| { + !blocked.contains(a) && !a.eq("") && !a.eq(&Settings::get().hostname.unwrap_or_default()) + }); // Sort and remove dupes linked.sort_unstable(); diff --git a/crates/api/src/user.rs b/crates/api/src/user.rs index 93d40bda..0d11065c 100644 --- a/crates/api/src/user.rs +++ b/crates/api/src/user.rs @@ -121,7 +121,7 @@ impl Perform for Login { // Return the jwt Ok(LoginResponse { - jwt: Claims::jwt(user.id, Settings::get().hostname)?, + jwt: Claims::jwt(user.id, Settings::get().hostname.unwrap_or_default())?, }) } } @@ -161,7 +161,7 @@ impl Perform for Register { .await??; // If its not the admin, check the captcha - if !no_admins && Settings::get().captcha.enabled { + if !no_admins && Settings::get().captcha.unwrap_or_default().enabled { let check = context .chat_server() .send(CheckCaptcha { @@ -303,7 +303,10 @@ impl Perform for Register { // Return the jwt Ok(LoginResponse { - jwt: Claims::jwt(inserted_user.id, Settings::get().hostname)?, + jwt: Claims::jwt( + inserted_user.id, + Settings::get().hostname.unwrap_or_default(), + )?, }) } } @@ -317,7 +320,7 @@ impl Perform for GetCaptcha { context: &Data, _websocket_id: Option, ) -> Result { - let captcha_settings = Settings::get().captcha; + let captcha_settings = Settings::get().captcha.unwrap_or_default(); if !captcha_settings.enabled { return Ok(GetCaptchaResponse { ok: None }); @@ -476,7 +479,10 @@ impl Perform for SaveUserSettings { // Return the jwt Ok(LoginResponse { - jwt: Claims::jwt(updated_user.id, Settings::get().hostname)?, + jwt: Claims::jwt( + updated_user.id, + Settings::get().hostname.unwrap_or_default(), + )?, }) } } @@ -1012,7 +1018,10 @@ impl Perform for PasswordChange { // Return the jwt Ok(LoginResponse { - jwt: Claims::jwt(updated_user.id, Settings::get().hostname)?, + jwt: Claims::jwt( + updated_user.id, + Settings::get().hostname.unwrap_or_default(), + )?, }) } } diff --git a/crates/apub/src/activity_queue.rs b/crates/apub/src/activity_queue.rs index c0c4ac46..b4ccac75 100644 --- a/crates/apub/src/activity_queue.rs +++ b/crates/apub/src/activity_queue.rs @@ -88,7 +88,7 @@ where .await? .iter() .unique() - .filter(|inbox| inbox.host_str() != Some(&Settings::get().hostname)) + .filter(|inbox| inbox.host_str() != Some(&Settings::get().hostname.unwrap_or_default())) .filter(|inbox| check_is_apub_id_valid(inbox).is_ok()) .map(|inbox| inbox.to_owned()) .collect(); @@ -215,7 +215,7 @@ where Kind: Serialize, >::Error: From + Send + Sync + 'static, { - if !Settings::get().federation.enabled || inboxes.is_empty() { + if !Settings::get().federation.unwrap_or_default().enabled || inboxes.is_empty() { return Ok(()); } diff --git a/crates/apub/src/inbox/mod.rs b/crates/apub/src/inbox/mod.rs index 765d5dff..75199296 100644 --- a/crates/apub/src/inbox/mod.rs +++ b/crates/apub/src/inbox/mod.rs @@ -167,7 +167,7 @@ where let id = activity.id_unchecked().context(location_info!())?; let activity_domain = id.domain().context(location_info!())?; - if activity_domain == Settings::get().hostname { + if activity_domain == Settings::get().hostname.unwrap_or_default() { return Err( anyhow!( "Error: received activity which was sent by local instance: {:?}", diff --git a/crates/apub/src/lib.rs b/crates/apub/src/lib.rs index 388d57e6..5d6744e3 100644 --- a/crates/apub/src/lib.rs +++ b/crates/apub/src/lib.rs @@ -64,7 +64,7 @@ fn check_is_apub_id_valid(apub_id: &Url) -> Result<(), LemmyError> { let domain = apub_id.domain().context(location_info!())?.to_string(); let local_instance = settings.get_hostname_without_port()?; - if !settings.federation.enabled { + if !settings.federation.unwrap_or_default().enabled { return if domain == local_instance { Ok(()) } else { diff --git a/crates/apub/src/objects/mod.rs b/crates/apub/src/objects/mod.rs index bf0ac24c..f6910cce 100644 --- a/crates/apub/src/objects/mod.rs +++ b/crates/apub/src/objects/mod.rs @@ -189,7 +189,7 @@ where let domain = object_id.domain().context(location_info!())?; // if its a local object, return it directly from the database - if Settings::get().hostname == domain { + if Settings::get().hostname.unwrap_or_default() == domain { let object = blocking(context.pool(), move |conn| { To::read_from_apub_id(conn, &object_id.into()) }) diff --git a/crates/apub/src/objects/user.rs b/crates/apub/src/objects/user.rs index 8a911de2..c23f4c50 100644 --- a/crates/apub/src/objects/user.rs +++ b/crates/apub/src/objects/user.rs @@ -99,7 +99,7 @@ impl FromApub for User_ { ) -> Result { let user_id = person.id_unchecked().context(location_info!())?.to_owned(); let domain = user_id.domain().context(location_info!())?; - if domain == Settings::get().hostname { + if domain == Settings::get().hostname.unwrap_or_default() { let user = blocking(context.pool(), move |conn| { User_::read_from_apub_id(conn, &user_id.into()) }) diff --git a/crates/apub/src/routes.rs b/crates/apub/src/routes.rs index 3717a894..ac946831 100644 --- a/crates/apub/src/routes.rs +++ b/crates/apub/src/routes.rs @@ -23,8 +23,11 @@ static APUB_JSON_CONTENT_TYPE_LONG: &str = "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\""; pub fn config(cfg: &mut web::ServiceConfig) { - if Settings::get().federation.enabled { - println!("federation enabled, host is {}", Settings::get().hostname); + if Settings::get().federation.unwrap_or_default().enabled { + println!( + "federation enabled, host is {}", + Settings::get().hostname.unwrap_or_default() + ); let digest_verifier = VerifyDigest::new(Sha256::new()); let header_guard_accept = guard::Any(guard::Header("Accept", APUB_JSON_CONTENT_TYPE)) diff --git a/crates/routes/src/feeds.rs b/crates/routes/src/feeds.rs index 837e1489..6e0ae8e1 100644 --- a/crates/routes/src/feeds.rs +++ b/crates/routes/src/feeds.rs @@ -163,7 +163,7 @@ fn get_feed_user( ) -> Result { let site_view = SiteView::read(&conn)?; let user = User_::find_by_username(&conn, &user_name)?; - let user_url = user.get_profile_url(&Settings::get().hostname); + let user_url = user.get_profile_url(&Settings::get().hostname.unwrap_or_default()); let posts = PostQueryBuilder::create(&conn) .listing_type(&ListingType::All) diff --git a/crates/routes/src/images.rs b/crates/routes/src/images.rs index 4d7656e1..e58f59e3 100644 --- a/crates/routes/src/images.rs +++ b/crates/routes/src/images.rs @@ -54,8 +54,10 @@ async fn upload( return Ok(HttpResponse::Unauthorized().finish()); }; - let mut client_req = - client.request_from(format!("{}/image", Settings::get().pictrs_url), req.head()); + let mut client_req = client.request_from( + format!("{}/image", Settings::get().pictrs_url.unwrap_or_default()), + req.head(), + ); if let Some(addr) = req.head().peer_addr { client_req = client_req.header("X-Forwarded-For", addr.to_string()) @@ -78,14 +80,18 @@ async fn full_res( // If there are no query params, the URL is original let url = if params.format.is_none() && params.thumbnail.is_none() { - format!("{}/image/original/{}", Settings::get().pictrs_url, name,) + format!( + "{}/image/original/{}", + Settings::get().pictrs_url.unwrap_or_default(), + name, + ) } else { // Use jpg as a default when none is given let format = params.format.unwrap_or_else(|| "jpg".to_string()); let mut url = format!( "{}/image/process.{}?src={}", - Settings::get().pictrs_url, + Settings::get().pictrs_url.unwrap_or_default(), format, name, ); @@ -134,7 +140,7 @@ async fn delete( let url = format!( "{}/image/delete/{}/{}", - Settings::get().pictrs_url, + Settings::get().pictrs_url.unwrap_or_default(), &token, &file ); diff --git a/crates/routes/src/nodeinfo.rs b/crates/routes/src/nodeinfo.rs index 46ef7ce4..b9768d9a 100644 --- a/crates/routes/src/nodeinfo.rs +++ b/crates/routes/src/nodeinfo.rs @@ -31,7 +31,7 @@ async fn node_info(context: web::Data) -> Result( &jwt, - &DecodingKey::from_secret(Settings::get().jwt_secret.as_ref()), + &DecodingKey::from_secret(Settings::get().jwt_secret.unwrap_or_default().as_ref()), &v, ) } @@ -31,7 +31,7 @@ impl Claims { encode( &Header::default(), &my_claims, - &EncodingKey::from_secret(Settings::get().jwt_secret.as_ref()), + &EncodingKey::from_secret(Settings::get().jwt_secret.unwrap_or_default().as_ref()), ) } } diff --git a/crates/utils/src/email.rs b/crates/utils/src/email.rs index 8e61500c..31ee4133 100644 --- a/crates/utils/src/email.rs +++ b/crates/utils/src/email.rs @@ -20,7 +20,7 @@ pub fn send_email( html: &str, ) -> Result<(), String> { let email_config = Settings::get().email.ok_or("no_email_setup")?; - let domain = Settings::get().hostname; + let domain = Settings::get().hostname.unwrap_or_default(); let (smtp_server, smtp_port) = { let email_and_port = email_config.smtp_server.split(':').collect::>(); diff --git a/crates/utils/src/lib.rs b/crates/utils/src/lib.rs index 6d8265aa..9fb56d4b 100644 --- a/crates/utils/src/lib.rs +++ b/crates/utils/src/lib.rs @@ -83,12 +83,12 @@ impl actix_web::error::ResponseError for LemmyError { lazy_static! { pub static ref WEBFINGER_COMMUNITY_REGEX: Regex = Regex::new(&format!( "^group:([a-z0-9_]{{3, 20}})@{}$", - Settings::get().hostname + Settings::get().hostname.unwrap_or_default() )) .unwrap(); pub static ref WEBFINGER_USER_REGEX: Regex = Regex::new(&format!( "^acct:([a-z0-9_]{{3, 20}})@{}$", - Settings::get().hostname + Settings::get().hostname.unwrap_or_default() )) .unwrap(); } diff --git a/crates/utils/src/rate_limit/mod.rs b/crates/utils/src/rate_limit/mod.rs index 5a18ffd5..f1c6e360 100644 --- a/crates/utils/src/rate_limit/mod.rs +++ b/crates/utils/src/rate_limit/mod.rs @@ -70,7 +70,7 @@ impl RateLimited { { // Does not need to be blocking because the RwLock in settings never held across await points, // and the operation here locks only long enough to clone - let rate_limit: RateLimitConfig = Settings::get().rate_limit; + let rate_limit: RateLimitConfig = Settings::get().rate_limit.unwrap_or_default(); // before { diff --git a/crates/utils/src/request.rs b/crates/utils/src/request.rs index 411d4342..805f1b13 100644 --- a/crates/utils/src/request.rs +++ b/crates/utils/src/request.rs @@ -58,7 +58,11 @@ pub(crate) async fn fetch_iframely( client: &Client, url: &str, ) -> Result { - let fetch_url = format!("{}/oembed?url={}", Settings::get().iframely_url, url); + let fetch_url = format!( + "{}/oembed?url={}", + Settings::get().iframely_url.unwrap_or_default(), + url + ); let response = retry(|| client.get(&fetch_url).send()).await?; @@ -89,7 +93,7 @@ pub(crate) async fn fetch_pictrs( let fetch_url = format!( "{}/image/download?url={}", - Settings::get().pictrs_url, + Settings::get().pictrs_url.unwrap_or_default(), utf8_percent_encode(image_url, NON_ALPHANUMERIC) // TODO this might not be needed ); diff --git a/crates/utils/src/settings.rs b/crates/utils/src/settings.rs index 8301dcee..6400264f 100644 --- a/crates/utils/src/settings.rs +++ b/crates/utils/src/settings.rs @@ -1,27 +1,53 @@ -use crate::location_info; +use crate::{location_info, LemmyError}; use anyhow::Context; -use config::{Config, ConfigError, Environment, File}; +use deser_hjson::from_str; +use merge::Merge; use serde::Deserialize; -use std::{env, fs, io::Error, net::IpAddr, sync::RwLock}; +use std::{ + env, + fs, + io::Error, + net::{IpAddr, Ipv4Addr}, + sync::RwLock, +}; -static CONFIG_FILE_DEFAULTS: &str = "config/defaults.hjson"; static CONFIG_FILE: &str = "config/config.hjson"; -#[derive(Debug, Deserialize, Clone)] +#[derive(Debug, Deserialize, Clone, Merge)] pub struct Settings { pub setup: Option, - pub database: DatabaseConfig, - pub hostname: String, - pub bind: IpAddr, - pub port: u16, - pub tls_enabled: bool, - pub jwt_secret: String, - pub pictrs_url: String, - pub iframely_url: String, - pub rate_limit: RateLimitConfig, + pub database: Option, + pub hostname: Option, + pub bind: Option, + pub port: Option, + pub tls_enabled: Option, + pub jwt_secret: Option, + pub pictrs_url: Option, + pub iframely_url: Option, + pub rate_limit: Option, pub email: Option, - pub federation: FederationConfig, - pub captcha: CaptchaConfig, + pub federation: Option, + pub captcha: Option, +} + +impl Default for Settings { + fn default() -> Self { + Self { + database: Some(DatabaseConfig::default()), + rate_limit: Some(RateLimitConfig::default()), + federation: Some(FederationConfig::default()), + captcha: Some(CaptchaConfig::default()), + email: None, + setup: None, + hostname: None, + bind: Some(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0))), + port: Some(8536), + tls_enabled: Some(true), + jwt_secret: Some("changeme".into()), + pictrs_url: Some("http://pictrs:8080".into()), + iframely_url: Some("http://iframely".into()), + } + } } #[derive(Debug, Deserialize, Clone)] @@ -44,6 +70,21 @@ pub struct RateLimitConfig { pub image_per_second: i32, } +impl Default for RateLimitConfig { + fn default() -> Self { + Self { + message: 180, + message_per_second: 60, + post: 6, + post_per_second: 600, + register: 3, + register_per_second: 3600, + image: 6, + image_per_second: 3600, + } + } +} + #[derive(Debug, Deserialize, Clone)] pub struct EmailConfig { pub smtp_server: String, @@ -56,7 +97,16 @@ pub struct EmailConfig { #[derive(Debug, Deserialize, Clone)] pub struct CaptchaConfig { pub enabled: bool, - pub difficulty: String, // easy, medium, or hard + pub difficulty: String, +} + +impl Default for CaptchaConfig { + fn default() -> Self { + Self { + enabled: true, + difficulty: "medium".into(), + } + } } #[derive(Debug, Deserialize, Clone)] @@ -69,6 +119,19 @@ pub struct DatabaseConfig { pub pool_size: u32, } +impl Default for DatabaseConfig { + fn default() -> Self { + Self { + user: "lemmy".into(), + password: "password".into(), + host: "localhost".into(), + port: 5432, + database: "lemmy".into(), + pool_size: 5, + } + } +} + #[derive(Debug, Deserialize, Clone)] pub struct FederationConfig { pub enabled: bool, @@ -76,6 +139,16 @@ pub struct FederationConfig { pub blocked_instances: String, } +impl Default for FederationConfig { + fn default() -> Self { + Self { + enabled: false, + allowed_instances: "".into(), + blocked_instances: "".into(), + } + } +} + lazy_static! { static ref SETTINGS: RwLock = RwLock::new(match Settings::init() { Ok(c) => c, @@ -91,21 +164,14 @@ impl Settings { /// /// Note: The env var `LEMMY_DATABASE_URL` is parsed in /// `lemmy_db_queries/src/lib.rs::get_database_url_from_env()` - fn init() -> Result { - let mut s = Config::new(); + fn init() -> Result { + // Read the config file + let mut custom_config = from_str::(&Self::read_config_file()?)?; - s.merge(File::with_name(&Self::get_config_defaults_location()))?; + // Merge with default + custom_config.merge(Settings::default()); - s.merge(File::with_name(&Self::get_config_location()).required(false))?; - - // Add in settings from the environment (with a prefix of LEMMY) - // Eg.. `LEMMY_DEBUG=1 ./target/app` would set the `debug` key - // Note: we need to use double underscore here, because otherwise variables containing - // underscore cant be set from environmnet. - // https://github.com/mehcode/config-rs/issues/73 - s.merge(Environment::with_prefix("LEMMY").separator("__"))?; - - s.try_into() + Ok(custom_config) } /// Returns the config as a struct. @@ -114,20 +180,13 @@ impl Settings { } pub fn get_database_url(&self) -> String { + let conf = self.database.to_owned().unwrap_or_default(); format!( "postgres://{}:{}@{}:{}/{}", - self.database.user, - self.database.password, - self.database.host, - self.database.port, - self.database.database + conf.user, conf.password, conf.host, conf.port, conf.database, ) } - pub fn get_config_defaults_location() -> String { - env::var("LEMMY_CONFIG_DEFAULTS_LOCATION").unwrap_or_else(|_| CONFIG_FILE_DEFAULTS.to_string()) - } - pub fn get_config_location() -> String { env::var("LEMMY_CONFIG_LOCATION").unwrap_or_else(|_| CONFIG_FILE.to_string()) } @@ -139,6 +198,8 @@ impl Settings { pub fn get_allowed_instances(&self) -> Vec { let mut allowed_instances: Vec = self .federation + .to_owned() + .unwrap_or_default() .allowed_instances .split(',') .map(|d| d.trim().to_string()) @@ -146,13 +207,14 @@ impl Settings { // The defaults.hjson config always returns a [""] allowed_instances.retain(|d| !d.eq("")); - allowed_instances } pub fn get_blocked_instances(&self) -> Vec { let mut blocked_instances: Vec = self .federation + .to_owned() + .unwrap_or_default() .blocked_instances .split(',') .map(|d| d.trim().to_string()) @@ -160,14 +222,17 @@ impl Settings { // The defaults.hjson config always returns a [""] blocked_instances.retain(|d| !d.eq("")); - blocked_instances } /// Returns either "http" or "https", depending on tls_enabled setting pub fn get_protocol_string(&self) -> &'static str { - if self.tls_enabled { - "https" + if let Some(tls_enabled) = self.tls_enabled { + if tls_enabled { + "https" + } else { + "http" + } } else { "http" } @@ -176,7 +241,11 @@ impl Settings { /// Returns something like `http://localhost` or `https://lemmy.ml`, /// with the correct protocol and hostname. pub fn get_protocol_and_hostname(&self) -> String { - format!("{}://{}", self.get_protocol_string(), self.hostname) + format!( + "{}://{}", + self.get_protocol_string(), + self.hostname.to_owned().unwrap_or_default() + ) } /// When running the federation test setup in `api_tests/` or `docker/federation`, the `hostname` @@ -186,6 +255,8 @@ impl Settings { Ok( self .hostname + .to_owned() + .unwrap_or_default() .split(':') .collect::>() .first() diff --git a/crates/utils/src/utils.rs b/crates/utils/src/utils.rs index 62974356..dc701b54 100644 --- a/crates/utils/src/utils.rs +++ b/crates/utils/src/utils.rs @@ -85,7 +85,10 @@ pub struct MentionData { impl MentionData { pub fn is_local(&self) -> bool { - Settings::get().hostname.eq(&self.domain) + Settings::get() + .hostname + .unwrap_or_default() + .eq(&self.domain) } pub fn full_name(&self) -> String { format!("@{}@{}", &self.name, &self.domain) diff --git a/docker/lemmy.hjson b/docker/lemmy.hjson index bea65d8f..bceb5f6c 100644 --- a/docker/lemmy.hjson +++ b/docker/lemmy.hjson @@ -29,6 +29,10 @@ password: "password" # host where postgres is running host: "postgres" + # port where postgres can be accessed + port: 5432 + # maximum number of active sql connections + pool_size: 5 } # # optional: email sending configuration # email: { diff --git a/src/main.rs b/src/main.rs index 4ebedb4f..6ca5253d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -37,7 +37,7 @@ async fn main() -> Result<(), LemmyError> { }; let manager = ConnectionManager::::new(&db_url); let pool = Pool::builder() - .max_size(settings.database.pool_size) + .max_size(settings.database.unwrap_or_default().pool_size) .build(manager) .unwrap_or_else(|_| panic!("Error connecting to {}", db_url)); @@ -61,7 +61,8 @@ async fn main() -> Result<(), LemmyError> { println!( "Starting http server at {}:{}", - settings.bind, settings.port + settings.bind.unwrap(), + settings.port.unwrap_or_default() ); let activity_queue = create_activity_queue(); @@ -94,7 +95,7 @@ async fn main() -> Result<(), LemmyError> { .configure(nodeinfo::config) .configure(webfinger::config) }) - .bind((settings.bind, settings.port))? + .bind((settings.bind.unwrap(), settings.port.unwrap_or_default()))? .run() .await?; diff --git a/tests/integration_test.rs b/tests/integration_test.rs index f205ceb5..6658cc72 100644 --- a/tests/integration_test.rs +++ b/tests/integration_test.rs @@ -58,7 +58,7 @@ fn create_context() -> LemmyContext { }; let manager = ConnectionManager::::new(&db_url); let pool = Pool::builder() - .max_size(settings.database.pool_size) + .max_size(settings.database.unwrap_or_default().pool_size) .build(manager) .unwrap(); embedded_migrations::run(&pool.get().unwrap()).unwrap(); -- 2.40.1 From cddf9a6a85998434716657c3352e0c6c71d19dc5 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 17 Feb 2021 11:12:20 -0500 Subject: [PATCH 2/8] Trying to fix tests, try 1 --- api_tests/prepare-drone-federation-test.sh | 44 ++++--------- crates/utils/src/settings.rs | 12 ++-- docker/dev/Dockerfile | 1 - docker/federation/docker-compose.yml | 75 +++------------------- docker/prod/Dockerfile | 1 - docker/prod/Dockerfile.arm | 1 - 6 files changed, 28 insertions(+), 106 deletions(-) diff --git a/api_tests/prepare-drone-federation-test.sh b/api_tests/prepare-drone-federation-test.sh index de9b7b84..32eb7513 100755 --- a/api_tests/prepare-drone-federation-test.sh +++ b/api_tests/prepare-drone-federation-test.sh @@ -1,13 +1,6 @@ #!/bin/bash set -e -export LEMMY_JWT_SECRET=changeme -export LEMMY_FEDERATION__ENABLED=true -export LEMMY_TLS_ENABLED=false -export LEMMY_SETUP__ADMIN_PASSWORD=lemmy -export LEMMY_RATE_LIMIT__POST=99999 -export LEMMY_RATE_LIMIT__REGISTER=99999 -export LEMMY_CAPTCHA__ENABLED=false export LEMMY_TEST_SEND_SYNC=1 export RUST_BACKTRACE=1 @@ -35,52 +28,39 @@ fi killall lemmy_server || true +echo "$PWD" + echo "start alpha" LEMMY_HOSTNAME=lemmy-alpha:8541 \ - LEMMY_PORT=8541 \ + LEMMY_CONFIG_LOCATION=./docker/federation/lemmy_alpha.hjson \ LEMMY_DATABASE_URL="${LEMMY_DATABASE_URL}/lemmy_alpha" \ - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon \ - LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha \ - LEMMY_SETUP__SITE_NAME=lemmy-alpha \ - target/lemmy_server >/dev/null 2>&1 & + target/lemmy_server >/tmp/lemmy_alpha.out 2>&1 & echo "start beta" LEMMY_HOSTNAME=lemmy-beta:8551 \ - LEMMY_PORT=8551 \ + LEMMY_CONFIG_LOCATION=./docker/federation/lemmy_beta.hjson \ LEMMY_DATABASE_URL="${LEMMY_DATABASE_URL}/lemmy_beta" \ - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon \ - LEMMY_SETUP__ADMIN_USERNAME=lemmy_beta \ - LEMMY_SETUP__SITE_NAME=lemmy-beta \ - target/lemmy_server >/dev/null 2>&1 & + target/lemmy_server >/tmp/lemmy_beta.out 2>&1 & echo "start gamma" LEMMY_HOSTNAME=lemmy-gamma:8561 \ - LEMMY_PORT=8561 \ + LEMMY_CONFIG_LOCATION=./docker/federation/lemmy_gamma.hjson \ LEMMY_DATABASE_URL="${LEMMY_DATABASE_URL}/lemmy_gamma" \ - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon \ - LEMMY_SETUP__ADMIN_USERNAME=lemmy_gamma \ - LEMMY_SETUP__SITE_NAME=lemmy-gamma \ - target/lemmy_server >/dev/null 2>&1 & + target/lemmy_server >/tmp/lemmy_gamma.out 2>&1 & echo "start delta" # An instance with only an allowlist for beta LEMMY_HOSTNAME=lemmy-delta:8571 \ - LEMMY_PORT=8571 \ + LEMMY_CONFIG_LOCATION=./docker/federation/lemmy_delta.hjson \ LEMMY_DATABASE_URL="${LEMMY_DATABASE_URL}/lemmy_delta" \ - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta \ - LEMMY_SETUP__ADMIN_USERNAME=lemmy_delta \ - LEMMY_SETUP__SITE_NAME=lemmy-delta \ - target/lemmy_server >/dev/null 2>&1 & + target/lemmy_server >/tmp/lemmy_delta.out 2>&1 & echo "start epsilon" # An instance who has a blocklist, with lemmy-alpha blocked LEMMY_HOSTNAME=lemmy-epsilon:8581 \ - LEMMY_PORT=8581 \ + LEMMY_CONFIG_LOCATION=./docker/federation/lemmy_epsilon.hjson \ LEMMY_DATABASE_URL="${LEMMY_DATABASE_URL}/lemmy_epsilon" \ - LEMMY_FEDERATION__BLOCKED_INSTANCES=lemmy-alpha \ - LEMMY_SETUP__ADMIN_USERNAME=lemmy_epsilon \ - LEMMY_SETUP__SITE_NAME=lemmy-epsilon \ - target/lemmy_server >/dev/null 2>&1 & + target/lemmy_server >/tmp/lemmy_epsilon.out 2>&1 & echo "wait for all instances to start" while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8541/api/v2/site')" != "200" ]]; do sleep 1; done diff --git a/crates/utils/src/settings.rs b/crates/utils/src/settings.rs index 6400264f..0a6859f9 100644 --- a/crates/utils/src/settings.rs +++ b/crates/utils/src/settings.rs @@ -135,16 +135,16 @@ impl Default for DatabaseConfig { #[derive(Debug, Deserialize, Clone)] pub struct FederationConfig { pub enabled: bool, - pub allowed_instances: String, - pub blocked_instances: String, + pub allowed_instances: Option, + pub blocked_instances: Option, } impl Default for FederationConfig { fn default() -> Self { Self { enabled: false, - allowed_instances: "".into(), - blocked_instances: "".into(), + allowed_instances: Some("".into()), + blocked_instances: Some("".into()), } } } @@ -201,11 +201,11 @@ impl Settings { .to_owned() .unwrap_or_default() .allowed_instances + .unwrap_or_default() .split(',') .map(|d| d.trim().to_string()) .collect(); - // The defaults.hjson config always returns a [""] allowed_instances.retain(|d| !d.eq("")); allowed_instances } @@ -216,11 +216,11 @@ impl Settings { .to_owned() .unwrap_or_default() .blocked_instances + .unwrap_or_default() .split(',') .map(|d| d.trim().to_string()) .collect(); - // The defaults.hjson config always returns a [""] blocked_instances.retain(|d| !d.eq("")); blocked_instances } diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index a2712f9f..d56a1fdc 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -56,7 +56,6 @@ RUN addgroup -g 1000 lemmy RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy # Copy resources -COPY --chown=lemmy:lemmy config/defaults.hjson /config/defaults.hjson COPY --chown=lemmy:lemmy --from=builder /app/lemmy_server /app/lemmy RUN chown lemmy:lemmy /app/lemmy diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index 72e6c5ce..ed662e44 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -38,20 +38,9 @@ services: - lemmy-alpha lemmy-alpha: image: lemmy-federation:latest + volumes: + - ./lemmy_alpha.hjson:/config/config.hjson environment: - - LEMMY_HOSTNAME=lemmy-alpha:8541 - - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy - - LEMMY_JWT_SECRET=changeme - - LEMMY_FEDERATION__ENABLED=true - - LEMMY_TLS_ENABLED=false - - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon - - LEMMY_PORT=8541 - - LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha - - LEMMY_SETUP__ADMIN_PASSWORD=lemmy - - LEMMY_SETUP__SITE_NAME=lemmy-alpha - - LEMMY_RATE_LIMIT__POST=99999 - - LEMMY_RATE_LIMIT__REGISTER=99999 - - LEMMY_CAPTCHA__ENABLED=false - LEMMY_TEST_SEND_SYNC=1 - RUST_BACKTRACE=1 - RUST_LOG=debug @@ -78,20 +67,9 @@ services: - lemmy-beta lemmy-beta: image: lemmy-federation:latest + volumes: + - ./lemmy_beta.hjson:/config/config.hjson environment: - - LEMMY_HOSTNAME=lemmy-beta:8551 - - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_beta:5432/lemmy - - LEMMY_JWT_SECRET=changeme - - LEMMY_FEDERATION__ENABLED=true - - LEMMY_TLS_ENABLED=false - - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon - - LEMMY_PORT=8551 - - LEMMY_SETUP__ADMIN_USERNAME=lemmy_beta - - LEMMY_SETUP__ADMIN_PASSWORD=lemmy - - LEMMY_SETUP__SITE_NAME=lemmy-beta - - LEMMY_RATE_LIMIT__POST=99999 - - LEMMY_RATE_LIMIT__REGISTER=99999 - - LEMMY_CAPTCHA__ENABLED=false - LEMMY_TEST_SEND_SYNC=1 - RUST_BACKTRACE=1 - RUST_LOG=debug @@ -118,20 +96,9 @@ services: - lemmy-gamma lemmy-gamma: image: lemmy-federation:latest + volumes: + - ./lemmy_gamma.hjson:/config/config.hjson environment: - - LEMMY_HOSTNAME=lemmy-gamma:8561 - - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_gamma:5432/lemmy - - LEMMY_JWT_SECRET=changeme - - LEMMY_FEDERATION__ENABLED=true - - LEMMY_TLS_ENABLED=false - - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon - - LEMMY_PORT=8561 - - LEMMY_SETUP__ADMIN_USERNAME=lemmy_gamma - - LEMMY_SETUP__ADMIN_PASSWORD=lemmy - - LEMMY_SETUP__SITE_NAME=lemmy-gamma - - LEMMY_RATE_LIMIT__POST=99999 - - LEMMY_RATE_LIMIT__REGISTER=99999 - - LEMMY_CAPTCHA__ENABLED=false - LEMMY_TEST_SEND_SYNC=1 - RUST_BACKTRACE=1 - RUST_LOG=debug @@ -159,20 +126,9 @@ services: - lemmy-delta lemmy-delta: image: lemmy-federation:latest + volumes: + - ./lemmy_delta.hjson:/config/config.hjson environment: - - LEMMY_HOSTNAME=lemmy-delta:8571 - - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_delta:5432/lemmy - - LEMMY_JWT_SECRET=changeme - - LEMMY_FEDERATION__ENABLED=true - - LEMMY_TLS_ENABLED=false - - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta - - LEMMY_PORT=8571 - - LEMMY_SETUP__ADMIN_USERNAME=lemmy_delta - - LEMMY_SETUP__ADMIN_PASSWORD=lemmy - - LEMMY_SETUP__SITE_NAME=lemmy-delta - - LEMMY_RATE_LIMIT__POST=99999 - - LEMMY_RATE_LIMIT__REGISTER=99999 - - LEMMY_CAPTCHA__ENABLED=false - LEMMY_TEST_SEND_SYNC=1 - RUST_BACKTRACE=1 - RUST_LOG=debug @@ -200,20 +156,9 @@ services: - lemmy-epsilon lemmy-epsilon: image: lemmy-federation:latest + volumes: + - ./lemmy_epsilon.hjson:/config/config.hjson environment: - - LEMMY_HOSTNAME=lemmy-epsilon:8581 - - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_epsilon:5432/lemmy - - LEMMY_JWT_SECRET=changeme - - LEMMY_FEDERATION__ENABLED=true - - LEMMY_TLS_ENABLED=false - - LEMMY_FEDERATION__BLOCKED_INSTANCES=lemmy-alpha - - LEMMY_PORT=8581 - - LEMMY_SETUP__ADMIN_USERNAME=lemmy_epsilon - - LEMMY_SETUP__ADMIN_PASSWORD=lemmy - - LEMMY_SETUP__SITE_NAME=lemmy-epsilon - - LEMMY_RATE_LIMIT__POST=99999 - - LEMMY_RATE_LIMIT__REGISTER=99999 - - LEMMY_CAPTCHA__ENABLED=false - LEMMY_TEST_SEND_SYNC=1 - RUST_BACKTRACE=1 - RUST_LOG=debug diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index 8f307bf6..c4f0358d 100644 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -56,7 +56,6 @@ RUN addgroup -g 1000 lemmy RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy # Copy resources -COPY --chown=lemmy:lemmy config/defaults.hjson /config/defaults.hjson COPY --chown=lemmy:lemmy --from=builder /app/lemmy_server /app/lemmy RUN chown lemmy:lemmy /app/lemmy diff --git a/docker/prod/Dockerfile.arm b/docker/prod/Dockerfile.arm index bcf59003..a6e698f0 100644 --- a/docker/prod/Dockerfile.arm +++ b/docker/prod/Dockerfile.arm @@ -31,7 +31,6 @@ RUN addgroup --gid 1000 lemmy RUN adduser --no-create-home --shell /bin/sh --uid 1000 --gid 1000 lemmy # Copy resources -COPY --chown=lemmy:lemmy config/defaults.hjson /config/defaults.hjson COPY --chown=lemmy:lemmy --from=builder /app/lemmy_server /app/lemmy RUN chown lemmy:lemmy /app/lemmy -- 2.40.1 From 1a02ab348227833ab96624d6a06880154ee0183b Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 17 Feb 2021 11:22:49 -0500 Subject: [PATCH 3/8] Trying to fix tests, try 2 --- docker/federation/lemmy_alpha.hjson | 37 +++++++++++++++++++++++++++ docker/federation/lemmy_beta.hjson | 37 +++++++++++++++++++++++++++ docker/federation/lemmy_delta.hjson | 37 +++++++++++++++++++++++++++ docker/federation/lemmy_epsilon.hjson | 37 +++++++++++++++++++++++++++ docker/federation/lemmy_gamma.hjson | 37 +++++++++++++++++++++++++++ 5 files changed, 185 insertions(+) create mode 100644 docker/federation/lemmy_alpha.hjson create mode 100644 docker/federation/lemmy_beta.hjson create mode 100644 docker/federation/lemmy_delta.hjson create mode 100644 docker/federation/lemmy_epsilon.hjson create mode 100644 docker/federation/lemmy_gamma.hjson diff --git a/docker/federation/lemmy_alpha.hjson b/docker/federation/lemmy_alpha.hjson new file mode 100644 index 00000000..3f8fc03d --- /dev/null +++ b/docker/federation/lemmy_alpha.hjson @@ -0,0 +1,37 @@ +{ + hostname: lemmy-alpha:8541 + port: 8541 + tls_enabled: false + jwt_secret: changeme + setup: { + admin_username: lemmy_alpha + admin_password: lemmy + site_name: lemmy-alpha + } + database: { + database: lemmy + user: lemmy + password: password + host: postgres_alpha + port: 5432 + pool_size: 5 + } + federation: { + enabled: true + allowed_instances: lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon + } + captcha: { + enabled: false + difficulty: medium + } + rate_limit: { + message: 180 + message_per_second: 60 + post: 99999 + post_per_second: 600 + register: 99999 + register_per_second: 3600 + image: 6 + image_per_second: 3600 + } +} diff --git a/docker/federation/lemmy_beta.hjson b/docker/federation/lemmy_beta.hjson new file mode 100644 index 00000000..f23d8f1c --- /dev/null +++ b/docker/federation/lemmy_beta.hjson @@ -0,0 +1,37 @@ +{ + hostname: lemmy-beta:8551 + port: 8551 + tls_enabled: false + jwt_secret: changeme + setup: { + admin_username: lemmy_beta + admin_password: lemmy + site_name: lemmy-beta + } + database: { + database: lemmy + user: lemmy + password: password + host: postgres_beta + port: 5432 + pool_size: 5 + } + federation: { + enabled: true + allowed_instances: lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon + } + captcha: { + enabled: false + difficulty: medium + } + rate_limit: { + message: 180 + message_per_second: 60 + post: 99999 + post_per_second: 600 + register: 99999 + register_per_second: 3600 + image: 6 + image_per_second: 3600 + } +} diff --git a/docker/federation/lemmy_delta.hjson b/docker/federation/lemmy_delta.hjson new file mode 100644 index 00000000..f4fb0ecc --- /dev/null +++ b/docker/federation/lemmy_delta.hjson @@ -0,0 +1,37 @@ +{ + hostname: lemmy-delta:8571 + port: 8571 + tls_enabled: false + jwt_secret: changeme + setup: { + admin_username: lemmy_delta + admin_password: lemmy + site_name: lemmy-delta + } + database: { + database: lemmy + user: lemmy + password: password + host: postgres_delta + port: 5432 + pool_size: 5 + } + federation: { + enabled: true + allowed_instances: lemmy-beta + } + captcha: { + enabled: false + difficulty: medium + } + rate_limit: { + message: 180 + message_per_second: 60 + post: 99999 + post_per_second: 600 + register: 99999 + register_per_second: 3600 + image: 6 + image_per_second: 3600 + } +} diff --git a/docker/federation/lemmy_epsilon.hjson b/docker/federation/lemmy_epsilon.hjson new file mode 100644 index 00000000..c04c3127 --- /dev/null +++ b/docker/federation/lemmy_epsilon.hjson @@ -0,0 +1,37 @@ +{ + hostname: lemmy-epsilon:8581 + port: 8581 + tls_enabled: false + jwt_secret: changeme + setup: { + admin_username: lemmy_epsilon + admin_password: lemmy + site_name: lemmy-epsilon + } + database: { + database: lemmy + user: lemmy + password: password + host: postgres_epsilon + port: 5432 + pool_size: 5 + } + federation: { + enabled: true + blocked_instances: lemmy-alpha + } + captcha: { + enabled: false + difficulty: medium + } + rate_limit: { + message: 180 + message_per_second: 60 + post: 99999 + post_per_second: 600 + register: 99999 + register_per_second: 3600 + image: 6 + image_per_second: 3600 + } +} diff --git a/docker/federation/lemmy_gamma.hjson b/docker/federation/lemmy_gamma.hjson new file mode 100644 index 00000000..f08e2e63 --- /dev/null +++ b/docker/federation/lemmy_gamma.hjson @@ -0,0 +1,37 @@ +{ + hostname: lemmy-gamma:8561 + port: 8561 + tls_enabled: false + jwt_secret: changeme + setup: { + admin_username: lemmy_gamma + admin_password: lemmy + site_name: lemmy-gamma + } + database: { + database: lemmy + user: lemmy + password: password + host: postgres_gamma + port: 5432 + pool_size: 5 + } + federation: { + enabled: true + allowed_instances: lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon + } + captcha: { + enabled: false + difficulty: medium + } + rate_limit: { + message: 180 + message_per_second: 60 + post: 99999 + post_per_second: 600 + register: 99999 + register_per_second: 3600 + image: 6 + image_per_second: 3600 + } +} -- 2.40.1 From f83b5590c73bef607281e6ec4c67958468a29127 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Fri, 19 Feb 2021 13:23:23 +0100 Subject: [PATCH 4/8] Split settings into multiple files --- crates/api/src/lib.rs | 8 +- crates/api/src/site.rs | 2 +- crates/api/src/user.rs | 2 +- crates/apub/src/activities/send/comment.rs | 2 +- crates/apub/src/activities/send/mod.rs | 2 +- crates/apub/src/activity_queue.rs | 2 +- crates/apub/src/fetcher/search.rs | 2 +- crates/apub/src/http/mod.rs | 2 +- crates/apub/src/inbox/mod.rs | 2 +- crates/apub/src/lib.rs | 2 +- crates/apub/src/objects/mod.rs | 7 +- crates/apub/src/objects/user.rs | 2 +- crates/apub/src/routes.rs | 2 +- crates/db_queries/src/source/user.rs | 2 +- crates/routes/src/feeds.rs | 7 +- crates/routes/src/images.rs | 2 +- crates/routes/src/nodeinfo.rs | 2 +- crates/routes/src/webfinger.rs | 2 +- crates/structs/src/lib.rs | 2 +- crates/utils/src/claims.rs | 2 +- crates/utils/src/email.rs | 2 +- crates/utils/src/lib.rs | 2 +- crates/utils/src/rate_limit/mod.rs | 2 +- crates/utils/src/request.rs | 2 +- crates/utils/src/settings/defaults.rs | 69 ++++++++ .../src/{settings.rs => settings/mod.rs} | 150 +----------------- crates/utils/src/settings/structs.rs | 72 +++++++++ crates/utils/src/utils.rs | 2 +- src/code_migrations.rs | 2 +- src/main.rs | 2 +- 30 files changed, 189 insertions(+), 172 deletions(-) create mode 100644 crates/utils/src/settings/defaults.rs rename crates/utils/src/{settings.rs => settings/mod.rs} (54%) create mode 100644 crates/utils/src/settings/structs.rs diff --git a/crates/api/src/lib.rs b/crates/api/src/lib.rs index 779da57f..d934d1ac 100644 --- a/crates/api/src/lib.rs +++ b/crates/api/src/lib.rs @@ -19,7 +19,13 @@ use lemmy_db_views_actor::{ community_view::CommunityView, }; use lemmy_structs::{blocking, comment::*, community::*, post::*, site::*, user::*, websocket::*}; -use lemmy_utils::{claims::Claims, settings::Settings, APIError, ConnectionId, LemmyError}; +use lemmy_utils::{ + claims::Claims, + settings::structs::Settings, + APIError, + ConnectionId, + LemmyError, +}; use lemmy_websocket::{serialize_websocket_message, LemmyContext, UserOperation}; use serde::Deserialize; use std::process::Command; diff --git a/crates/api/src/site.rs b/crates/api/src/site.rs index 1bdce91a..40108264 100644 --- a/crates/api/src/site.rs +++ b/crates/api/src/site.rs @@ -48,7 +48,7 @@ use lemmy_db_views_moderator::{ use lemmy_structs::{blocking, site::*, user::Register}; use lemmy_utils::{ location_info, - settings::Settings, + settings::structs::Settings, utils::{check_slurs, check_slurs_opt}, version, APIError, diff --git a/crates/api/src/user.rs b/crates/api/src/user.rs index 0d11065c..5994c241 100644 --- a/crates/api/src/user.rs +++ b/crates/api/src/user.rs @@ -71,7 +71,7 @@ use lemmy_utils::{ claims::Claims, email::send_email, location_info, - settings::Settings, + settings::structs::Settings, utils::{ check_slurs, generate_random_string, diff --git a/crates/apub/src/activities/send/comment.rs b/crates/apub/src/activities/send/comment.rs index f007cda4..be96b6c2 100644 --- a/crates/apub/src/activities/send/comment.rs +++ b/crates/apub/src/activities/send/comment.rs @@ -31,7 +31,7 @@ use lemmy_db_schema::source::{comment::Comment, community::Community, post::Post use lemmy_structs::{blocking, WebFingerResponse}; use lemmy_utils::{ request::{retry, RecvError}, - settings::Settings, + settings::structs::Settings, utils::{scrape_text_for_mentions, MentionData}, LemmyError, }; diff --git a/crates/apub/src/activities/send/mod.rs b/crates/apub/src/activities/send/mod.rs index 166855e2..2da0b48c 100644 --- a/crates/apub/src/activities/send/mod.rs +++ b/crates/apub/src/activities/send/mod.rs @@ -1,4 +1,4 @@ -use lemmy_utils::settings::Settings; +use lemmy_utils::settings::structs::Settings; use url::{ParseError, Url}; use uuid::Uuid; diff --git a/crates/apub/src/activity_queue.rs b/crates/apub/src/activity_queue.rs index b4ccac75..19f43308 100644 --- a/crates/apub/src/activity_queue.rs +++ b/crates/apub/src/activity_queue.rs @@ -22,7 +22,7 @@ use background_jobs::{ use itertools::Itertools; use lemmy_db_queries::DbPool; use lemmy_db_schema::source::{community::Community, user::User_}; -use lemmy_utils::{location_info, settings::Settings, LemmyError}; +use lemmy_utils::{location_info, settings::structs::Settings, LemmyError}; use lemmy_websocket::LemmyContext; use log::{debug, warn}; use reqwest::Client; diff --git a/crates/apub/src/fetcher/search.rs b/crates/apub/src/fetcher/search.rs index 9f465f76..2a6a9ef5 100644 --- a/crates/apub/src/fetcher/search.rs +++ b/crates/apub/src/fetcher/search.rs @@ -35,7 +35,7 @@ use lemmy_db_schema::source::{ use lemmy_db_views::{comment_view::CommentView, post_view::PostView}; use lemmy_db_views_actor::{community_view::CommunityView, user_view::UserViewSafe}; use lemmy_structs::{blocking, site::SearchResponse}; -use lemmy_utils::{settings::Settings, LemmyError}; +use lemmy_utils::{settings::structs::Settings, LemmyError}; use lemmy_websocket::LemmyContext; use log::debug; use url::Url; diff --git a/crates/apub/src/http/mod.rs b/crates/apub/src/http/mod.rs index f0ffbcb1..f2c8a208 100644 --- a/crates/apub/src/http/mod.rs +++ b/crates/apub/src/http/mod.rs @@ -4,7 +4,7 @@ use http::StatusCode; use lemmy_db_queries::source::activity::Activity_; use lemmy_db_schema::source::activity::Activity; use lemmy_structs::blocking; -use lemmy_utils::{settings::Settings, LemmyError}; +use lemmy_utils::{settings::structs::Settings, LemmyError}; use lemmy_websocket::LemmyContext; use serde::{Deserialize, Serialize}; diff --git a/crates/apub/src/inbox/mod.rs b/crates/apub/src/inbox/mod.rs index 75199296..db7225a8 100644 --- a/crates/apub/src/inbox/mod.rs +++ b/crates/apub/src/inbox/mod.rs @@ -19,7 +19,7 @@ use lemmy_db_queries::{ }; use lemmy_db_schema::source::{activity::Activity, community::Community, user::User_}; use lemmy_structs::blocking; -use lemmy_utils::{location_info, settings::Settings, LemmyError}; +use lemmy_utils::{location_info, settings::structs::Settings, LemmyError}; use lemmy_websocket::LemmyContext; use serde::Serialize; use std::fmt::Debug; diff --git a/crates/apub/src/lib.rs b/crates/apub/src/lib.rs index 5d6744e3..36ee9a7b 100644 --- a/crates/apub/src/lib.rs +++ b/crates/apub/src/lib.rs @@ -34,7 +34,7 @@ use lemmy_db_schema::source::{ user::User_, }; use lemmy_structs::blocking; -use lemmy_utils::{location_info, settings::Settings, LemmyError}; +use lemmy_utils::{location_info, settings::structs::Settings, LemmyError}; use lemmy_websocket::LemmyContext; use serde::Serialize; use std::net::IpAddr; diff --git a/crates/apub/src/objects/mod.rs b/crates/apub/src/objects/mod.rs index f6910cce..3000db51 100644 --- a/crates/apub/src/objects/mod.rs +++ b/crates/apub/src/objects/mod.rs @@ -15,7 +15,12 @@ use diesel::result::Error::NotFound; use lemmy_db_queries::{ApubObject, Crud, DbPool}; use lemmy_db_schema::source::community::Community; use lemmy_structs::blocking; -use lemmy_utils::{location_info, settings::Settings, utils::convert_datetime, LemmyError}; +use lemmy_utils::{ + location_info, + settings::structs::Settings, + utils::convert_datetime, + LemmyError, +}; use lemmy_websocket::LemmyContext; use url::Url; diff --git a/crates/apub/src/objects/user.rs b/crates/apub/src/objects/user.rs index c23f4c50..c979170f 100644 --- a/crates/apub/src/objects/user.rs +++ b/crates/apub/src/objects/user.rs @@ -26,7 +26,7 @@ use lemmy_db_schema::{ use lemmy_structs::blocking; use lemmy_utils::{ location_info, - settings::Settings, + settings::structs::Settings, utils::{check_slurs, check_slurs_opt, convert_datetime}, LemmyError, }; diff --git a/crates/apub/src/routes.rs b/crates/apub/src/routes.rs index ac946831..b040bb75 100644 --- a/crates/apub/src/routes.rs +++ b/crates/apub/src/routes.rs @@ -16,7 +16,7 @@ use crate::{ }; use actix_web::*; use http_signature_normalization_actix::digest::middleware::VerifyDigest; -use lemmy_utils::settings::Settings; +use lemmy_utils::settings::structs::Settings; use sha2::{Digest, Sha256}; static APUB_JSON_CONTENT_TYPE_LONG: &str = diff --git a/crates/db_queries/src/source/user.rs b/crates/db_queries/src/source/user.rs index 5f3fa6cb..5f175e1d 100644 --- a/crates/db_queries/src/source/user.rs +++ b/crates/db_queries/src/source/user.rs @@ -7,7 +7,7 @@ use lemmy_db_schema::{ source::user::{UserForm, UserSafeSettings, User_}, Url, }; -use lemmy_utils::settings::Settings; +use lemmy_utils::settings::structs::Settings; mod safe_type { use crate::ToSafe; diff --git a/crates/routes/src/feeds.rs b/crates/routes/src/feeds.rs index 6e0ae8e1..57a12264 100644 --- a/crates/routes/src/feeds.rs +++ b/crates/routes/src/feeds.rs @@ -15,7 +15,12 @@ use lemmy_db_views::{ }; use lemmy_db_views_actor::user_mention_view::{UserMentionQueryBuilder, UserMentionView}; use lemmy_structs::blocking; -use lemmy_utils::{claims::Claims, settings::Settings, utils::markdown_to_html, LemmyError}; +use lemmy_utils::{ + claims::Claims, + settings::structs::Settings, + utils::markdown_to_html, + LemmyError, +}; use lemmy_websocket::LemmyContext; use rss::{ extension::dublincore::DublinCoreExtensionBuilder, diff --git a/crates/routes/src/images.rs b/crates/routes/src/images.rs index e58f59e3..67220aec 100644 --- a/crates/routes/src/images.rs +++ b/crates/routes/src/images.rs @@ -1,7 +1,7 @@ use actix::clock::Duration; use actix_web::{body::BodyStream, http::StatusCode, *}; use awc::Client; -use lemmy_utils::{claims::Claims, rate_limit::RateLimit, settings::Settings}; +use lemmy_utils::{claims::Claims, rate_limit::RateLimit, settings::structs::Settings}; use serde::{Deserialize, Serialize}; pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimit) { diff --git a/crates/routes/src/nodeinfo.rs b/crates/routes/src/nodeinfo.rs index b9768d9a..e302b296 100644 --- a/crates/routes/src/nodeinfo.rs +++ b/crates/routes/src/nodeinfo.rs @@ -2,7 +2,7 @@ use actix_web::{body::Body, error::ErrorBadRequest, *}; use anyhow::anyhow; use lemmy_db_views::site_view::SiteView; use lemmy_structs::blocking; -use lemmy_utils::{settings::Settings, version, LemmyError}; +use lemmy_utils::{settings::structs::Settings, version, LemmyError}; use lemmy_websocket::LemmyContext; use serde::{Deserialize, Serialize}; use url::Url; diff --git a/crates/routes/src/webfinger.rs b/crates/routes/src/webfinger.rs index 1609d863..adc72642 100644 --- a/crates/routes/src/webfinger.rs +++ b/crates/routes/src/webfinger.rs @@ -4,7 +4,7 @@ use lemmy_db_queries::source::{community::Community_, user::User}; use lemmy_db_schema::source::{community::Community, user::User_}; use lemmy_structs::{blocking, WebFingerLink, WebFingerResponse}; use lemmy_utils::{ - settings::Settings, + settings::structs::Settings, LemmyError, WEBFINGER_COMMUNITY_REGEX, WEBFINGER_USER_REGEX, diff --git a/crates/structs/src/lib.rs b/crates/structs/src/lib.rs index 54c9586a..8c92403f 100644 --- a/crates/structs/src/lib.rs +++ b/crates/structs/src/lib.rs @@ -13,7 +13,7 @@ use lemmy_db_schema::source::{ user::User_, user_mention::{UserMention, UserMentionForm}, }; -use lemmy_utils::{email::send_email, settings::Settings, utils::MentionData, LemmyError}; +use lemmy_utils::{email::send_email, settings::structs::Settings, utils::MentionData, LemmyError}; use log::error; use serde::{Deserialize, Serialize}; use url::Url; diff --git a/crates/utils/src/claims.rs b/crates/utils/src/claims.rs index 1f940474..eac14833 100644 --- a/crates/utils/src/claims.rs +++ b/crates/utils/src/claims.rs @@ -1,4 +1,4 @@ -use crate::settings::Settings; +use crate::settings::structs::Settings; use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, TokenData, Validation}; use serde::{Deserialize, Serialize}; diff --git a/crates/utils/src/email.rs b/crates/utils/src/email.rs index 31ee4133..208d69f6 100644 --- a/crates/utils/src/email.rs +++ b/crates/utils/src/email.rs @@ -1,4 +1,4 @@ -use crate::settings::Settings; +use crate::settings::structs::Settings; use lettre::{ message::{header, Mailbox, MultiPart, SinglePart}, transport::smtp::{ diff --git a/crates/utils/src/lib.rs b/crates/utils/src/lib.rs index 9fb56d4b..8ec2b26c 100644 --- a/crates/utils/src/lib.rs +++ b/crates/utils/src/lib.rs @@ -14,7 +14,7 @@ mod test; pub mod utils; pub mod version; -use crate::settings::Settings; +use crate::settings::structs::Settings; use http::StatusCode; use regex::Regex; use thiserror::Error; diff --git a/crates/utils/src/rate_limit/mod.rs b/crates/utils/src/rate_limit/mod.rs index f1c6e360..fa45c3a4 100644 --- a/crates/utils/src/rate_limit/mod.rs +++ b/crates/utils/src/rate_limit/mod.rs @@ -1,5 +1,5 @@ use crate::{ - settings::{RateLimitConfig, Settings}, + settings::structs::{RateLimitConfig, Settings}, utils::get_ip, LemmyError, }; diff --git a/crates/utils/src/request.rs b/crates/utils/src/request.rs index 805f1b13..522b9cd9 100644 --- a/crates/utils/src/request.rs +++ b/crates/utils/src/request.rs @@ -1,4 +1,4 @@ -use crate::{settings::Settings, LemmyError}; +use crate::{settings::structs::Settings, LemmyError}; use anyhow::anyhow; use log::error; use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC}; diff --git a/crates/utils/src/settings/defaults.rs b/crates/utils/src/settings/defaults.rs new file mode 100644 index 00000000..e46b5235 --- /dev/null +++ b/crates/utils/src/settings/defaults.rs @@ -0,0 +1,69 @@ +use crate::settings::structs::*; +use std::net::{IpAddr, Ipv4Addr}; + +impl Default for Settings { + fn default() -> Self { + Self { + database: Some(DatabaseConfig::default()), + rate_limit: Some(RateLimitConfig::default()), + federation: Some(FederationConfig::default()), + captcha: Some(CaptchaConfig::default()), + email: None, + setup: None, + hostname: None, + bind: Some(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0))), + port: Some(8536), + tls_enabled: Some(true), + jwt_secret: Some("changeme".into()), + pictrs_url: Some("http://pictrs:8080".into()), + iframely_url: Some("http://iframely".into()), + } + } +} + +impl Default for RateLimitConfig { + fn default() -> Self { + Self { + message: 180, + message_per_second: 60, + post: 6, + post_per_second: 600, + register: 3, + register_per_second: 3600, + image: 6, + image_per_second: 3600, + } + } +} + +impl Default for CaptchaConfig { + fn default() -> Self { + Self { + enabled: true, + difficulty: "medium".into(), + } + } +} + +impl Default for DatabaseConfig { + fn default() -> Self { + Self { + user: "lemmy".into(), + password: "password".into(), + host: "localhost".into(), + port: 5432, + database: "lemmy".into(), + pool_size: 5, + } + } +} + +impl Default for FederationConfig { + fn default() -> Self { + Self { + enabled: false, + allowed_instances: Some("".into()), + blocked_instances: Some("".into()), + } + } +} diff --git a/crates/utils/src/settings.rs b/crates/utils/src/settings/mod.rs similarity index 54% rename from crates/utils/src/settings.rs rename to crates/utils/src/settings/mod.rs index 0a6859f9..0af0ecd6 100644 --- a/crates/utils/src/settings.rs +++ b/crates/utils/src/settings/mod.rs @@ -1,154 +1,14 @@ -use crate::{location_info, LemmyError}; +use crate::{location_info, settings::structs::Settings, LemmyError}; use anyhow::Context; use deser_hjson::from_str; use merge::Merge; -use serde::Deserialize; -use std::{ - env, - fs, - io::Error, - net::{IpAddr, Ipv4Addr}, - sync::RwLock, -}; +use std::{env, fs, io::Error, sync::RwLock}; + +pub mod defaults; +pub mod structs; static CONFIG_FILE: &str = "config/config.hjson"; -#[derive(Debug, Deserialize, Clone, Merge)] -pub struct Settings { - pub setup: Option, - pub database: Option, - pub hostname: Option, - pub bind: Option, - pub port: Option, - pub tls_enabled: Option, - pub jwt_secret: Option, - pub pictrs_url: Option, - pub iframely_url: Option, - pub rate_limit: Option, - pub email: Option, - pub federation: Option, - pub captcha: Option, -} - -impl Default for Settings { - fn default() -> Self { - Self { - database: Some(DatabaseConfig::default()), - rate_limit: Some(RateLimitConfig::default()), - federation: Some(FederationConfig::default()), - captcha: Some(CaptchaConfig::default()), - email: None, - setup: None, - hostname: None, - bind: Some(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0))), - port: Some(8536), - tls_enabled: Some(true), - jwt_secret: Some("changeme".into()), - pictrs_url: Some("http://pictrs:8080".into()), - iframely_url: Some("http://iframely".into()), - } - } -} - -#[derive(Debug, Deserialize, Clone)] -pub struct Setup { - pub admin_username: String, - pub admin_password: String, - pub admin_email: Option, - pub site_name: String, -} - -#[derive(Debug, Deserialize, Clone)] -pub struct RateLimitConfig { - pub message: i32, - pub message_per_second: i32, - pub post: i32, - pub post_per_second: i32, - pub register: i32, - pub register_per_second: i32, - pub image: i32, - pub image_per_second: i32, -} - -impl Default for RateLimitConfig { - fn default() -> Self { - Self { - message: 180, - message_per_second: 60, - post: 6, - post_per_second: 600, - register: 3, - register_per_second: 3600, - image: 6, - image_per_second: 3600, - } - } -} - -#[derive(Debug, Deserialize, Clone)] -pub struct EmailConfig { - pub smtp_server: String, - pub smtp_login: Option, - pub smtp_password: Option, - pub smtp_from_address: String, - pub use_tls: bool, -} - -#[derive(Debug, Deserialize, Clone)] -pub struct CaptchaConfig { - pub enabled: bool, - pub difficulty: String, -} - -impl Default for CaptchaConfig { - fn default() -> Self { - Self { - enabled: true, - difficulty: "medium".into(), - } - } -} - -#[derive(Debug, Deserialize, Clone)] -pub struct DatabaseConfig { - pub user: String, - pub password: String, - pub host: String, - pub port: i32, - pub database: String, - pub pool_size: u32, -} - -impl Default for DatabaseConfig { - fn default() -> Self { - Self { - user: "lemmy".into(), - password: "password".into(), - host: "localhost".into(), - port: 5432, - database: "lemmy".into(), - pool_size: 5, - } - } -} - -#[derive(Debug, Deserialize, Clone)] -pub struct FederationConfig { - pub enabled: bool, - pub allowed_instances: Option, - pub blocked_instances: Option, -} - -impl Default for FederationConfig { - fn default() -> Self { - Self { - enabled: false, - allowed_instances: Some("".into()), - blocked_instances: Some("".into()), - } - } -} - lazy_static! { static ref SETTINGS: RwLock = RwLock::new(match Settings::init() { Ok(c) => c, diff --git a/crates/utils/src/settings/structs.rs b/crates/utils/src/settings/structs.rs new file mode 100644 index 00000000..f0a6d679 --- /dev/null +++ b/crates/utils/src/settings/structs.rs @@ -0,0 +1,72 @@ +use merge::Merge; +use serde::Deserialize; +use std::net::IpAddr; + +#[derive(Debug, Deserialize, Clone, Merge)] +pub struct Settings { + pub setup: Option, + pub database: Option, + pub hostname: Option, + pub bind: Option, + pub port: Option, + pub tls_enabled: Option, + pub jwt_secret: Option, + pub pictrs_url: Option, + pub iframely_url: Option, + pub rate_limit: Option, + pub email: Option, + pub federation: Option, + pub captcha: Option, +} + +#[derive(Debug, Deserialize, Clone)] +pub struct Setup { + pub admin_username: String, + pub admin_password: String, + pub admin_email: Option, + pub site_name: String, +} + +#[derive(Debug, Deserialize, Clone)] +pub struct RateLimitConfig { + pub message: i32, + pub message_per_second: i32, + pub post: i32, + pub post_per_second: i32, + pub register: i32, + pub register_per_second: i32, + pub image: i32, + pub image_per_second: i32, +} + +#[derive(Debug, Deserialize, Clone)] +pub struct EmailConfig { + pub smtp_server: String, + pub smtp_login: Option, + pub smtp_password: Option, + pub smtp_from_address: String, + pub use_tls: bool, +} + +#[derive(Debug, Deserialize, Clone)] +pub struct CaptchaConfig { + pub enabled: bool, + pub difficulty: String, +} + +#[derive(Debug, Deserialize, Clone)] +pub struct DatabaseConfig { + pub user: String, + pub password: String, + pub host: String, + pub port: i32, + pub database: String, + pub pool_size: u32, +} + +#[derive(Debug, Deserialize, Clone)] +pub struct FederationConfig { + pub enabled: bool, + pub allowed_instances: Option, + pub blocked_instances: Option, +} diff --git a/crates/utils/src/utils.rs b/crates/utils/src/utils.rs index dc701b54..5cb66831 100644 --- a/crates/utils/src/utils.rs +++ b/crates/utils/src/utils.rs @@ -1,4 +1,4 @@ -use crate::{settings::Settings, APIError}; +use crate::{settings::structs::Settings, APIError}; use actix_web::dev::ConnectionInfo; use chrono::{DateTime, FixedOffset, NaiveDateTime}; use itertools::Itertools; diff --git a/src/code_migrations.rs b/src/code_migrations.rs index 7478d5af..d520664f 100644 --- a/src/code_migrations.rs +++ b/src/code_migrations.rs @@ -24,7 +24,7 @@ use lemmy_db_schema::{ user::{UserForm, User_}, }, }; -use lemmy_utils::{apub::generate_actor_keypair, settings::Settings, LemmyError}; +use lemmy_utils::{apub::generate_actor_keypair, settings::structs::Settings, LemmyError}; use log::info; pub fn run_advanced_migrations(conn: &PgConnection) -> Result<(), LemmyError> { diff --git a/src/main.rs b/src/main.rs index 6ca5253d..58a1a06b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,7 +15,7 @@ use lemmy_server::{code_migrations::run_advanced_migrations, scheduled_tasks}; use lemmy_structs::blocking; use lemmy_utils::{ rate_limit::{rate_limiter::RateLimiter, RateLimit}, - settings::Settings, + settings::structs::Settings, LemmyError, }; use lemmy_websocket::{chat_server::ChatServer, LemmyContext}; -- 2.40.1 From 1bc7317b2412fbd305383bfbb7285322fd0657ab Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Fri, 19 Feb 2021 15:28:08 +0100 Subject: [PATCH 5/8] Rewrite config implementation --- Cargo.lock | 59 +++--------- api_tests/prepare-drone-federation-test.sh | 44 ++++++--- crates/api/src/lib.rs | 6 +- crates/api/src/user.rs | 21 ++-- crates/apub/src/activity_queue.rs | 4 +- crates/apub/src/fetcher/search.rs | 2 +- crates/apub/src/inbox/mod.rs | 2 +- crates/apub/src/lib.rs | 2 +- crates/apub/src/objects/mod.rs | 2 +- crates/apub/src/objects/user.rs | 2 +- crates/apub/src/routes.rs | 7 +- crates/routes/src/feeds.rs | 2 +- crates/routes/src/images.rs | 16 +-- crates/routes/src/nodeinfo.rs | 2 +- crates/routes/src/webfinger.rs | 2 +- crates/structs/src/lib.rs | 2 +- crates/utils/Cargo.toml | 2 +- crates/utils/src/claims.rs | 4 +- crates/utils/src/email.rs | 2 +- crates/utils/src/lib.rs | 4 +- crates/utils/src/rate_limit/mod.rs | 2 +- crates/utils/src/request.rs | 8 +- crates/utils/src/settings/defaults.rs | 27 +++--- crates/utils/src/settings/merge.rs | 107 +++++++++++++++++++++ crates/utils/src/settings/mod.rs | 42 ++++---- crates/utils/src/settings/structs.rs | 30 +++--- crates/utils/src/settings/structs_opt.rs | 71 ++++++++++++++ crates/utils/src/utils.rs | 5 +- docker/dev/Dockerfile | 1 + docker/federation/docker-compose.yml | 75 +++++++++++++-- docker/federation/lemmy_alpha.hjson | 37 ------- docker/federation/lemmy_beta.hjson | 37 ------- docker/federation/lemmy_delta.hjson | 37 ------- docker/federation/lemmy_epsilon.hjson | 37 ------- docker/federation/lemmy_gamma.hjson | 37 ------- docker/lemmy.hjson | 4 - docker/prod/Dockerfile | 1 + docker/prod/Dockerfile.arm | 1 + docker/prod/docker-compose.yml | 2 +- src/main.rs | 7 +- tests/integration_test.rs | 4 +- 41 files changed, 383 insertions(+), 376 deletions(-) create mode 100644 crates/utils/src/settings/merge.rs create mode 100644 crates/utils/src/settings/structs_opt.rs delete mode 100644 docker/federation/lemmy_alpha.hjson delete mode 100644 docker/federation/lemmy_beta.hjson delete mode 100644 docker/federation/lemmy_delta.hjson delete mode 100644 docker/federation/lemmy_epsilon.hjson delete mode 100644 docker/federation/lemmy_gamma.hjson diff --git a/Cargo.lock b/Cargo.lock index ea7fdca3..f6421fad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "activitystreams" version = "0.7.0-alpha.10" @@ -1101,6 +1103,15 @@ dependencies = [ "termcolor", ] +[[package]] +name = "envy" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f47e0157f2cb54f5ae1bd371b30a2ae4311e1c028f575cd4e81de7353215965" +dependencies = [ + "serde", +] + [[package]] name = "event-listener" version = "2.5.1" @@ -1953,6 +1964,7 @@ dependencies = [ "comrak", "deser-hjson", "diesel", + "envy", "futures", "http", "itertools", @@ -1960,7 +1972,6 @@ dependencies = [ "lazy_static", "lettre", "log", - "merge", "openssl", "percent-encoding", "rand 0.8.3", @@ -2113,28 +2124,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "merge" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9" -dependencies = [ - "merge_derive", - "num-traits", -] - -[[package]] -name = "merge_derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "migrations_internals" version = "1.4.1" @@ -2568,30 +2557,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro-hack" version = "0.5.19" diff --git a/api_tests/prepare-drone-federation-test.sh b/api_tests/prepare-drone-federation-test.sh index 32eb7513..de9b7b84 100755 --- a/api_tests/prepare-drone-federation-test.sh +++ b/api_tests/prepare-drone-federation-test.sh @@ -1,6 +1,13 @@ #!/bin/bash set -e +export LEMMY_JWT_SECRET=changeme +export LEMMY_FEDERATION__ENABLED=true +export LEMMY_TLS_ENABLED=false +export LEMMY_SETUP__ADMIN_PASSWORD=lemmy +export LEMMY_RATE_LIMIT__POST=99999 +export LEMMY_RATE_LIMIT__REGISTER=99999 +export LEMMY_CAPTCHA__ENABLED=false export LEMMY_TEST_SEND_SYNC=1 export RUST_BACKTRACE=1 @@ -28,39 +35,52 @@ fi killall lemmy_server || true -echo "$PWD" - echo "start alpha" LEMMY_HOSTNAME=lemmy-alpha:8541 \ - LEMMY_CONFIG_LOCATION=./docker/federation/lemmy_alpha.hjson \ + LEMMY_PORT=8541 \ LEMMY_DATABASE_URL="${LEMMY_DATABASE_URL}/lemmy_alpha" \ - target/lemmy_server >/tmp/lemmy_alpha.out 2>&1 & + LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon \ + LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha \ + LEMMY_SETUP__SITE_NAME=lemmy-alpha \ + target/lemmy_server >/dev/null 2>&1 & echo "start beta" LEMMY_HOSTNAME=lemmy-beta:8551 \ - LEMMY_CONFIG_LOCATION=./docker/federation/lemmy_beta.hjson \ + LEMMY_PORT=8551 \ LEMMY_DATABASE_URL="${LEMMY_DATABASE_URL}/lemmy_beta" \ - target/lemmy_server >/tmp/lemmy_beta.out 2>&1 & + LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon \ + LEMMY_SETUP__ADMIN_USERNAME=lemmy_beta \ + LEMMY_SETUP__SITE_NAME=lemmy-beta \ + target/lemmy_server >/dev/null 2>&1 & echo "start gamma" LEMMY_HOSTNAME=lemmy-gamma:8561 \ - LEMMY_CONFIG_LOCATION=./docker/federation/lemmy_gamma.hjson \ + LEMMY_PORT=8561 \ LEMMY_DATABASE_URL="${LEMMY_DATABASE_URL}/lemmy_gamma" \ - target/lemmy_server >/tmp/lemmy_gamma.out 2>&1 & + LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon \ + LEMMY_SETUP__ADMIN_USERNAME=lemmy_gamma \ + LEMMY_SETUP__SITE_NAME=lemmy-gamma \ + target/lemmy_server >/dev/null 2>&1 & echo "start delta" # An instance with only an allowlist for beta LEMMY_HOSTNAME=lemmy-delta:8571 \ - LEMMY_CONFIG_LOCATION=./docker/federation/lemmy_delta.hjson \ + LEMMY_PORT=8571 \ LEMMY_DATABASE_URL="${LEMMY_DATABASE_URL}/lemmy_delta" \ - target/lemmy_server >/tmp/lemmy_delta.out 2>&1 & + LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta \ + LEMMY_SETUP__ADMIN_USERNAME=lemmy_delta \ + LEMMY_SETUP__SITE_NAME=lemmy-delta \ + target/lemmy_server >/dev/null 2>&1 & echo "start epsilon" # An instance who has a blocklist, with lemmy-alpha blocked LEMMY_HOSTNAME=lemmy-epsilon:8581 \ - LEMMY_CONFIG_LOCATION=./docker/federation/lemmy_epsilon.hjson \ + LEMMY_PORT=8581 \ LEMMY_DATABASE_URL="${LEMMY_DATABASE_URL}/lemmy_epsilon" \ - target/lemmy_server >/tmp/lemmy_epsilon.out 2>&1 & + LEMMY_FEDERATION__BLOCKED_INSTANCES=lemmy-alpha \ + LEMMY_SETUP__ADMIN_USERNAME=lemmy_epsilon \ + LEMMY_SETUP__SITE_NAME=lemmy-epsilon \ + target/lemmy_server >/dev/null 2>&1 & echo "wait for all instances to start" while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8541/api/v2/site')" != "200" ]]; do sleep 1; done diff --git a/crates/api/src/lib.rs b/crates/api/src/lib.rs index d934d1ac..7caaba3b 100644 --- a/crates/api/src/lib.rs +++ b/crates/api/src/lib.rs @@ -190,7 +190,7 @@ pub(crate) fn check_optional_url(item: &Option>) -> Result<(), Le pub(crate) async fn build_federated_instances( pool: &DbPool, ) -> Result, LemmyError> { - if Settings::get().federation.unwrap_or_default().enabled { + if Settings::get().federation.enabled { let distinct_communities = blocking(pool, move |conn| { Community::distinct_federated_communities(conn) }) @@ -205,9 +205,7 @@ pub(crate) async fn build_federated_instances( .collect::, LemmyError>>()?; linked.extend_from_slice(&allowed); - linked.retain(|a| { - !blocked.contains(a) && !a.eq("") && !a.eq(&Settings::get().hostname.unwrap_or_default()) - }); + linked.retain(|a| !blocked.contains(a) && !a.eq("") && !a.eq(&Settings::get().hostname)); // Sort and remove dupes linked.sort_unstable(); diff --git a/crates/api/src/user.rs b/crates/api/src/user.rs index 5994c241..df8d1263 100644 --- a/crates/api/src/user.rs +++ b/crates/api/src/user.rs @@ -121,7 +121,7 @@ impl Perform for Login { // Return the jwt Ok(LoginResponse { - jwt: Claims::jwt(user.id, Settings::get().hostname.unwrap_or_default())?, + jwt: Claims::jwt(user.id, Settings::get().hostname)?, }) } } @@ -161,7 +161,7 @@ impl Perform for Register { .await??; // If its not the admin, check the captcha - if !no_admins && Settings::get().captcha.unwrap_or_default().enabled { + if !no_admins && Settings::get().captcha.enabled { let check = context .chat_server() .send(CheckCaptcha { @@ -303,10 +303,7 @@ impl Perform for Register { // Return the jwt Ok(LoginResponse { - jwt: Claims::jwt( - inserted_user.id, - Settings::get().hostname.unwrap_or_default(), - )?, + jwt: Claims::jwt(inserted_user.id, Settings::get().hostname)?, }) } } @@ -320,7 +317,7 @@ impl Perform for GetCaptcha { context: &Data, _websocket_id: Option, ) -> Result { - let captcha_settings = Settings::get().captcha.unwrap_or_default(); + let captcha_settings = Settings::get().captcha; if !captcha_settings.enabled { return Ok(GetCaptchaResponse { ok: None }); @@ -479,10 +476,7 @@ impl Perform for SaveUserSettings { // Return the jwt Ok(LoginResponse { - jwt: Claims::jwt( - updated_user.id, - Settings::get().hostname.unwrap_or_default(), - )?, + jwt: Claims::jwt(updated_user.id, Settings::get().hostname)?, }) } } @@ -1018,10 +1012,7 @@ impl Perform for PasswordChange { // Return the jwt Ok(LoginResponse { - jwt: Claims::jwt( - updated_user.id, - Settings::get().hostname.unwrap_or_default(), - )?, + jwt: Claims::jwt(updated_user.id, Settings::get().hostname)?, }) } } diff --git a/crates/apub/src/activity_queue.rs b/crates/apub/src/activity_queue.rs index 19f43308..285c8c47 100644 --- a/crates/apub/src/activity_queue.rs +++ b/crates/apub/src/activity_queue.rs @@ -88,7 +88,7 @@ where .await? .iter() .unique() - .filter(|inbox| inbox.host_str() != Some(&Settings::get().hostname.unwrap_or_default())) + .filter(|inbox| inbox.host_str() != Some(&Settings::get().hostname)) .filter(|inbox| check_is_apub_id_valid(inbox).is_ok()) .map(|inbox| inbox.to_owned()) .collect(); @@ -215,7 +215,7 @@ where Kind: Serialize, >::Error: From + Send + Sync + 'static, { - if !Settings::get().federation.unwrap_or_default().enabled || inboxes.is_empty() { + if !Settings::get().federation.enabled || inboxes.is_empty() { return Ok(()); } diff --git a/crates/apub/src/fetcher/search.rs b/crates/apub/src/fetcher/search.rs index 2a6a9ef5..b7eb70cd 100644 --- a/crates/apub/src/fetcher/search.rs +++ b/crates/apub/src/fetcher/search.rs @@ -41,8 +41,8 @@ use log::debug; use url::Url; /// The types of ActivityPub objects that can be fetched directly by searching for their ID. -#[serde(untagged)] #[derive(serde::Deserialize, Debug)] +#[serde(untagged)] enum SearchAcceptedObjects { Person(Box), Group(Box), diff --git a/crates/apub/src/inbox/mod.rs b/crates/apub/src/inbox/mod.rs index db7225a8..6e90a2bc 100644 --- a/crates/apub/src/inbox/mod.rs +++ b/crates/apub/src/inbox/mod.rs @@ -167,7 +167,7 @@ where let id = activity.id_unchecked().context(location_info!())?; let activity_domain = id.domain().context(location_info!())?; - if activity_domain == Settings::get().hostname.unwrap_or_default() { + if activity_domain == Settings::get().hostname { return Err( anyhow!( "Error: received activity which was sent by local instance: {:?}", diff --git a/crates/apub/src/lib.rs b/crates/apub/src/lib.rs index 36ee9a7b..159e20cf 100644 --- a/crates/apub/src/lib.rs +++ b/crates/apub/src/lib.rs @@ -64,7 +64,7 @@ fn check_is_apub_id_valid(apub_id: &Url) -> Result<(), LemmyError> { let domain = apub_id.domain().context(location_info!())?.to_string(); let local_instance = settings.get_hostname_without_port()?; - if !settings.federation.unwrap_or_default().enabled { + if !settings.federation.enabled { return if domain == local_instance { Ok(()) } else { diff --git a/crates/apub/src/objects/mod.rs b/crates/apub/src/objects/mod.rs index 3000db51..014144de 100644 --- a/crates/apub/src/objects/mod.rs +++ b/crates/apub/src/objects/mod.rs @@ -194,7 +194,7 @@ where let domain = object_id.domain().context(location_info!())?; // if its a local object, return it directly from the database - if Settings::get().hostname.unwrap_or_default() == domain { + if Settings::get().hostname == domain { let object = blocking(context.pool(), move |conn| { To::read_from_apub_id(conn, &object_id.into()) }) diff --git a/crates/apub/src/objects/user.rs b/crates/apub/src/objects/user.rs index c979170f..de05398f 100644 --- a/crates/apub/src/objects/user.rs +++ b/crates/apub/src/objects/user.rs @@ -99,7 +99,7 @@ impl FromApub for User_ { ) -> Result { let user_id = person.id_unchecked().context(location_info!())?.to_owned(); let domain = user_id.domain().context(location_info!())?; - if domain == Settings::get().hostname.unwrap_or_default() { + if domain == Settings::get().hostname { let user = blocking(context.pool(), move |conn| { User_::read_from_apub_id(conn, &user_id.into()) }) diff --git a/crates/apub/src/routes.rs b/crates/apub/src/routes.rs index b040bb75..68700b9c 100644 --- a/crates/apub/src/routes.rs +++ b/crates/apub/src/routes.rs @@ -23,11 +23,8 @@ static APUB_JSON_CONTENT_TYPE_LONG: &str = "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\""; pub fn config(cfg: &mut web::ServiceConfig) { - if Settings::get().federation.unwrap_or_default().enabled { - println!( - "federation enabled, host is {}", - Settings::get().hostname.unwrap_or_default() - ); + if Settings::get().federation.enabled { + println!("federation enabled, host is {}", Settings::get().hostname); let digest_verifier = VerifyDigest::new(Sha256::new()); let header_guard_accept = guard::Any(guard::Header("Accept", APUB_JSON_CONTENT_TYPE)) diff --git a/crates/routes/src/feeds.rs b/crates/routes/src/feeds.rs index 57a12264..0f723fde 100644 --- a/crates/routes/src/feeds.rs +++ b/crates/routes/src/feeds.rs @@ -168,7 +168,7 @@ fn get_feed_user( ) -> Result { let site_view = SiteView::read(&conn)?; let user = User_::find_by_username(&conn, &user_name)?; - let user_url = user.get_profile_url(&Settings::get().hostname.unwrap_or_default()); + let user_url = user.get_profile_url(&Settings::get().hostname); let posts = PostQueryBuilder::create(&conn) .listing_type(&ListingType::All) diff --git a/crates/routes/src/images.rs b/crates/routes/src/images.rs index 67220aec..0177c7e9 100644 --- a/crates/routes/src/images.rs +++ b/crates/routes/src/images.rs @@ -54,10 +54,8 @@ async fn upload( return Ok(HttpResponse::Unauthorized().finish()); }; - let mut client_req = client.request_from( - format!("{}/image", Settings::get().pictrs_url.unwrap_or_default()), - req.head(), - ); + let mut client_req = + client.request_from(format!("{}/image", Settings::get().pictrs_url), req.head()); if let Some(addr) = req.head().peer_addr { client_req = client_req.header("X-Forwarded-For", addr.to_string()) @@ -80,18 +78,14 @@ async fn full_res( // If there are no query params, the URL is original let url = if params.format.is_none() && params.thumbnail.is_none() { - format!( - "{}/image/original/{}", - Settings::get().pictrs_url.unwrap_or_default(), - name, - ) + format!("{}/image/original/{}", Settings::get().pictrs_url, name,) } else { // Use jpg as a default when none is given let format = params.format.unwrap_or_else(|| "jpg".to_string()); let mut url = format!( "{}/image/process.{}?src={}", - Settings::get().pictrs_url.unwrap_or_default(), + Settings::get().pictrs_url, format, name, ); @@ -140,7 +134,7 @@ async fn delete( let url = format!( "{}/image/delete/{}/{}", - Settings::get().pictrs_url.unwrap_or_default(), + Settings::get().pictrs_url, &token, &file ); diff --git a/crates/routes/src/nodeinfo.rs b/crates/routes/src/nodeinfo.rs index e302b296..a3c2af5a 100644 --- a/crates/routes/src/nodeinfo.rs +++ b/crates/routes/src/nodeinfo.rs @@ -31,7 +31,7 @@ async fn node_info(context: web::Data) -> Result( &jwt, - &DecodingKey::from_secret(Settings::get().jwt_secret.unwrap_or_default().as_ref()), + &DecodingKey::from_secret(Settings::get().jwt_secret.as_ref()), &v, ) } @@ -31,7 +31,7 @@ impl Claims { encode( &Header::default(), &my_claims, - &EncodingKey::from_secret(Settings::get().jwt_secret.unwrap_or_default().as_ref()), + &EncodingKey::from_secret(Settings::get().jwt_secret.as_ref()), ) } } diff --git a/crates/utils/src/email.rs b/crates/utils/src/email.rs index 208d69f6..280ec41c 100644 --- a/crates/utils/src/email.rs +++ b/crates/utils/src/email.rs @@ -20,7 +20,7 @@ pub fn send_email( html: &str, ) -> Result<(), String> { let email_config = Settings::get().email.ok_or("no_email_setup")?; - let domain = Settings::get().hostname.unwrap_or_default(); + let domain = Settings::get().hostname; let (smtp_server, smtp_port) = { let email_and_port = email_config.smtp_server.split(':').collect::>(); diff --git a/crates/utils/src/lib.rs b/crates/utils/src/lib.rs index 8ec2b26c..051c776d 100644 --- a/crates/utils/src/lib.rs +++ b/crates/utils/src/lib.rs @@ -83,12 +83,12 @@ impl actix_web::error::ResponseError for LemmyError { lazy_static! { pub static ref WEBFINGER_COMMUNITY_REGEX: Regex = Regex::new(&format!( "^group:([a-z0-9_]{{3, 20}})@{}$", - Settings::get().hostname.unwrap_or_default() + Settings::get().hostname )) .unwrap(); pub static ref WEBFINGER_USER_REGEX: Regex = Regex::new(&format!( "^acct:([a-z0-9_]{{3, 20}})@{}$", - Settings::get().hostname.unwrap_or_default() + Settings::get().hostname )) .unwrap(); } diff --git a/crates/utils/src/rate_limit/mod.rs b/crates/utils/src/rate_limit/mod.rs index fa45c3a4..3c095be1 100644 --- a/crates/utils/src/rate_limit/mod.rs +++ b/crates/utils/src/rate_limit/mod.rs @@ -70,7 +70,7 @@ impl RateLimited { { // Does not need to be blocking because the RwLock in settings never held across await points, // and the operation here locks only long enough to clone - let rate_limit: RateLimitConfig = Settings::get().rate_limit.unwrap_or_default(); + let rate_limit: RateLimitConfig = Settings::get().rate_limit; // before { diff --git a/crates/utils/src/request.rs b/crates/utils/src/request.rs index 522b9cd9..7899dad7 100644 --- a/crates/utils/src/request.rs +++ b/crates/utils/src/request.rs @@ -58,11 +58,7 @@ pub(crate) async fn fetch_iframely( client: &Client, url: &str, ) -> Result { - let fetch_url = format!( - "{}/oembed?url={}", - Settings::get().iframely_url.unwrap_or_default(), - url - ); + let fetch_url = format!("{}/oembed?url={}", Settings::get().iframely_url, url); let response = retry(|| client.get(&fetch_url).send()).await?; @@ -93,7 +89,7 @@ pub(crate) async fn fetch_pictrs( let fetch_url = format!( "{}/image/download?url={}", - Settings::get().pictrs_url.unwrap_or_default(), + Settings::get().pictrs_url, utf8_percent_encode(image_url, NON_ALPHANUMERIC) // TODO this might not be needed ); diff --git a/crates/utils/src/settings/defaults.rs b/crates/utils/src/settings/defaults.rs index e46b5235..5b733028 100644 --- a/crates/utils/src/settings/defaults.rs +++ b/crates/utils/src/settings/defaults.rs @@ -4,19 +4,20 @@ use std::net::{IpAddr, Ipv4Addr}; impl Default for Settings { fn default() -> Self { Self { - database: Some(DatabaseConfig::default()), - rate_limit: Some(RateLimitConfig::default()), - federation: Some(FederationConfig::default()), - captcha: Some(CaptchaConfig::default()), + database: DatabaseConfig::default(), + rate_limit: RateLimitConfig::default(), + federation: FederationConfig::default(), + captcha: CaptchaConfig::default(), email: None, setup: None, - hostname: None, - bind: Some(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0))), - port: Some(8536), - tls_enabled: Some(true), - jwt_secret: Some("changeme".into()), - pictrs_url: Some("http://pictrs:8080".into()), - iframely_url: Some("http://iframely".into()), + // TODO: not sure how to handle this, its mandatory but not provided by defaults + hostname: "hostname_not_set".into(), + bind: IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), + port: 8536, + tls_enabled: true, + jwt_secret: "changeme".into(), + pictrs_url: "http://pictrs:8080".into(), + iframely_url: "http://iframely".into(), } } } @@ -62,8 +63,8 @@ impl Default for FederationConfig { fn default() -> Self { Self { enabled: false, - allowed_instances: Some("".into()), - blocked_instances: Some("".into()), + allowed_instances: "".into(), + blocked_instances: "".into(), } } } diff --git a/crates/utils/src/settings/merge.rs b/crates/utils/src/settings/merge.rs new file mode 100644 index 00000000..7cd1762f --- /dev/null +++ b/crates/utils/src/settings/merge.rs @@ -0,0 +1,107 @@ +use crate::settings::{structs::*, structs_opt::*}; + +pub(in crate::settings) trait Merge { + fn merge(&mut self, opt: T); +} + +impl Merge for Settings { + fn merge(&mut self, opt: SettingsOpt) { + overwrite_if_some(&mut self.hostname, opt.hostname); + overwrite_if_some(&mut self.bind, opt.bind); + overwrite_if_some(&mut self.port, opt.port); + overwrite_if_some(&mut self.tls_enabled, opt.tls_enabled); + overwrite_if_some(&mut self.jwt_secret, opt.jwt_secret); + overwrite_if_some(&mut self.pictrs_url, opt.pictrs_url); + overwrite_if_some(&mut self.iframely_url, opt.iframely_url); + merge_if_some(&mut self.captcha, opt.captcha); + merge_if_some(&mut self.rate_limit, opt.rate_limit); + merge_if_some_opt(&mut self.email, opt.email); + merge_if_some_opt(&mut self.setup, opt.setup); + merge_if_some(&mut self.federation, opt.federation); + merge_if_some(&mut self.database, opt.database); + } +} + +impl Merge for RateLimitConfig { + fn merge(&mut self, opt: RateLimitConfigOpt) { + overwrite_if_some(&mut self.message, opt.message); + overwrite_if_some(&mut self.message_per_second, opt.message_per_second); + overwrite_if_some(&mut self.post, opt.post); + overwrite_if_some(&mut self.post_per_second, opt.post_per_second); + overwrite_if_some(&mut self.register, opt.register); + overwrite_if_some(&mut self.register_per_second, opt.register_per_second); + overwrite_if_some(&mut self.image, opt.image); + overwrite_if_some(&mut self.image_per_second, opt.image_per_second); + } +} + +impl Merge for Setup { + fn merge(&mut self, opt: SetupOpt) { + overwrite_if_some(&mut self.admin_username, opt.admin_username); + overwrite_if_some(&mut self.admin_password, opt.admin_password); + overwrite_if_some(&mut self.admin_email, opt.admin_email); + overwrite_if_some(&mut self.site_name, opt.site_name); + } +} + +impl Merge for EmailConfig { + fn merge(&mut self, opt: EmailConfigOpt) { + overwrite_if_some(&mut self.smtp_server, opt.smtp_server); + overwrite_if_some(&mut self.smtp_login, opt.smtp_login); + overwrite_if_some(&mut self.smtp_password, opt.smtp_password); + overwrite_if_some(&mut self.smtp_from_address, opt.smtp_from_address); + overwrite_if_some(&mut self.use_tls, opt.use_tls); + } +} + +impl Merge for DatabaseConfig { + fn merge(&mut self, opt: DatabaseConfigOpt) { + overwrite_if_some(&mut self.user, opt.user); + overwrite_if_some(&mut self.password, opt.password); + overwrite_if_some(&mut self.host, opt.host); + overwrite_if_some(&mut self.port, opt.port); + overwrite_if_some(&mut self.database, opt.database); + overwrite_if_some(&mut self.pool_size, opt.pool_size); + } +} + +impl Merge for FederationConfig { + fn merge(&mut self, opt: FederationConfigOpt) { + overwrite_if_some(&mut self.enabled, opt.enabled); + overwrite_if_some(&mut self.allowed_instances, opt.allowed_instances); + overwrite_if_some(&mut self.blocked_instances, opt.blocked_instances); + } +} + +impl Merge for CaptchaConfig { + fn merge(&mut self, opt: CaptchaConfigOpt) { + overwrite_if_some(&mut self.enabled, opt.enabled); + overwrite_if_some(&mut self.difficulty, opt.difficulty); + } +} + +fn overwrite_if_some(lhs: &mut T, rhs: Option) { + if let Some(x) = rhs { + *lhs = x; + } +} + +fn merge_if_some(lhs: &mut T, rhs: Option) +where + T: Merge, +{ + if let Some(x) = rhs { + lhs.merge(x); + } +} + +fn merge_if_some_opt(lhs: &mut Option, rhs: Option) +where + T: Merge, +{ + if let Some(x) = rhs { + if let Some(y) = lhs { + y.merge(x) + } + } +} diff --git a/crates/utils/src/settings/mod.rs b/crates/utils/src/settings/mod.rs index 0af0ecd6..4345d4f1 100644 --- a/crates/utils/src/settings/mod.rs +++ b/crates/utils/src/settings/mod.rs @@ -1,11 +1,16 @@ -use crate::{location_info, settings::structs::Settings, LemmyError}; -use anyhow::Context; +use crate::{ + location_info, + settings::{merge::Merge, structs::Settings, structs_opt::SettingsOpt}, + LemmyError, +}; +use anyhow::{anyhow, Context}; use deser_hjson::from_str; -use merge::Merge; use std::{env, fs, io::Error, sync::RwLock}; pub mod defaults; +mod merge; pub mod structs; +mod structs_opt; static CONFIG_FILE: &str = "config/config.hjson"; @@ -25,13 +30,19 @@ impl Settings { /// Note: The env var `LEMMY_DATABASE_URL` is parsed in /// `lemmy_db_queries/src/lib.rs::get_database_url_from_env()` fn init() -> Result { + let mut config = Settings::default(); + // Read the config file - let mut custom_config = from_str::(&Self::read_config_file()?)?; + config.merge(from_str::(&Self::read_config_file()?)?); - // Merge with default - custom_config.merge(Settings::default()); + // Read env vars + config.merge(envy::prefixed("LEMMY_").from_env::()?); - Ok(custom_config) + if config.hostname == Settings::default().hostname { + return Err(anyhow!("Hostname variable is not set!").into()); + } + + Ok(config) } /// Returns the config as a struct. @@ -40,7 +51,7 @@ impl Settings { } pub fn get_database_url(&self) -> String { - let conf = self.database.to_owned().unwrap_or_default(); + let conf = self.database.to_owned(); format!( "postgres://{}:{}@{}:{}/{}", conf.user, conf.password, conf.host, conf.port, conf.database, @@ -59,9 +70,7 @@ impl Settings { let mut allowed_instances: Vec = self .federation .to_owned() - .unwrap_or_default() .allowed_instances - .unwrap_or_default() .split(',') .map(|d| d.trim().to_string()) .collect(); @@ -74,9 +83,7 @@ impl Settings { let mut blocked_instances: Vec = self .federation .to_owned() - .unwrap_or_default() .blocked_instances - .unwrap_or_default() .split(',') .map(|d| d.trim().to_string()) .collect(); @@ -87,12 +94,8 @@ impl Settings { /// Returns either "http" or "https", depending on tls_enabled setting pub fn get_protocol_string(&self) -> &'static str { - if let Some(tls_enabled) = self.tls_enabled { - if tls_enabled { - "https" - } else { - "http" - } + if self.tls_enabled { + "https" } else { "http" } @@ -104,7 +107,7 @@ impl Settings { format!( "{}://{}", self.get_protocol_string(), - self.hostname.to_owned().unwrap_or_default() + self.hostname.to_owned() ) } @@ -116,7 +119,6 @@ impl Settings { self .hostname .to_owned() - .unwrap_or_default() .split(':') .collect::>() .first() diff --git a/crates/utils/src/settings/structs.rs b/crates/utils/src/settings/structs.rs index f0a6d679..1e92e93d 100644 --- a/crates/utils/src/settings/structs.rs +++ b/crates/utils/src/settings/structs.rs @@ -1,22 +1,21 @@ -use merge::Merge; use serde::Deserialize; use std::net::IpAddr; -#[derive(Debug, Deserialize, Clone, Merge)] +#[derive(Debug, Deserialize, Clone)] pub struct Settings { pub setup: Option, - pub database: Option, - pub hostname: Option, - pub bind: Option, - pub port: Option, - pub tls_enabled: Option, - pub jwt_secret: Option, - pub pictrs_url: Option, - pub iframely_url: Option, - pub rate_limit: Option, + pub database: DatabaseConfig, + pub hostname: String, + pub bind: IpAddr, + pub port: u16, + pub tls_enabled: bool, + pub jwt_secret: String, + pub pictrs_url: String, + pub iframely_url: String, + pub rate_limit: RateLimitConfig, pub email: Option, - pub federation: Option, - pub captcha: Option, + pub federation: FederationConfig, + pub captcha: CaptchaConfig, } #[derive(Debug, Deserialize, Clone)] @@ -51,6 +50,7 @@ pub struct EmailConfig { #[derive(Debug, Deserialize, Clone)] pub struct CaptchaConfig { pub enabled: bool, + // TODO: use enum for this pub difficulty: String, } @@ -67,6 +67,6 @@ pub struct DatabaseConfig { #[derive(Debug, Deserialize, Clone)] pub struct FederationConfig { pub enabled: bool, - pub allowed_instances: Option, - pub blocked_instances: Option, + pub allowed_instances: String, + pub blocked_instances: String, } diff --git a/crates/utils/src/settings/structs_opt.rs b/crates/utils/src/settings/structs_opt.rs new file mode 100644 index 00000000..1635c090 --- /dev/null +++ b/crates/utils/src/settings/structs_opt.rs @@ -0,0 +1,71 @@ +use serde::Deserialize; +use std::net::IpAddr; + +#[derive(Debug, Deserialize, Clone)] +pub struct SettingsOpt { + pub setup: Option, + pub database: Option, + pub hostname: Option, + pub bind: Option, + pub port: Option, + pub tls_enabled: Option, + pub jwt_secret: Option, + pub pictrs_url: Option, + pub iframely_url: Option, + pub rate_limit: Option, + pub email: Option, + pub federation: Option, + pub captcha: Option, +} + +#[derive(Debug, Deserialize, Clone)] +pub struct SetupOpt { + pub admin_username: Option, + pub admin_password: Option, + pub admin_email: Option>, + pub site_name: Option, +} + +#[derive(Debug, Deserialize, Clone)] +pub struct RateLimitConfigOpt { + pub message: Option, + pub message_per_second: Option, + pub post: Option, + pub post_per_second: Option, + pub register: Option, + pub register_per_second: Option, + pub image: Option, + pub image_per_second: Option, +} + +#[derive(Debug, Deserialize, Clone)] +pub struct EmailConfigOpt { + pub smtp_server: Option, + pub smtp_login: Option>, + pub smtp_password: Option>, + pub smtp_from_address: Option, + pub use_tls: Option, +} + +#[derive(Debug, Deserialize, Clone)] +pub struct CaptchaConfigOpt { + pub enabled: Option, + pub difficulty: Option, +} + +#[derive(Debug, Deserialize, Clone)] +pub struct DatabaseConfigOpt { + pub user: Option, + pub password: Option, + pub host: Option, + pub port: Option, + pub database: Option, + pub pool_size: Option, +} + +#[derive(Debug, Deserialize, Clone)] +pub struct FederationConfigOpt { + pub enabled: Option, + pub allowed_instances: Option, + pub blocked_instances: Option, +} diff --git a/crates/utils/src/utils.rs b/crates/utils/src/utils.rs index 5cb66831..9ce4c3d9 100644 --- a/crates/utils/src/utils.rs +++ b/crates/utils/src/utils.rs @@ -85,10 +85,7 @@ pub struct MentionData { impl MentionData { pub fn is_local(&self) -> bool { - Settings::get() - .hostname - .unwrap_or_default() - .eq(&self.domain) + Settings::get().hostname.eq(&self.domain) } pub fn full_name(&self) -> String { format!("@{}@{}", &self.name, &self.domain) diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index d56a1fdc..a2712f9f 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -56,6 +56,7 @@ RUN addgroup -g 1000 lemmy RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy # Copy resources +COPY --chown=lemmy:lemmy config/defaults.hjson /config/defaults.hjson COPY --chown=lemmy:lemmy --from=builder /app/lemmy_server /app/lemmy RUN chown lemmy:lemmy /app/lemmy diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index ed662e44..72e6c5ce 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -38,9 +38,20 @@ services: - lemmy-alpha lemmy-alpha: image: lemmy-federation:latest - volumes: - - ./lemmy_alpha.hjson:/config/config.hjson environment: + - LEMMY_HOSTNAME=lemmy-alpha:8541 + - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy + - LEMMY_JWT_SECRET=changeme + - LEMMY_FEDERATION__ENABLED=true + - LEMMY_TLS_ENABLED=false + - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon + - LEMMY_PORT=8541 + - LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha + - LEMMY_SETUP__ADMIN_PASSWORD=lemmy + - LEMMY_SETUP__SITE_NAME=lemmy-alpha + - LEMMY_RATE_LIMIT__POST=99999 + - LEMMY_RATE_LIMIT__REGISTER=99999 + - LEMMY_CAPTCHA__ENABLED=false - LEMMY_TEST_SEND_SYNC=1 - RUST_BACKTRACE=1 - RUST_LOG=debug @@ -67,9 +78,20 @@ services: - lemmy-beta lemmy-beta: image: lemmy-federation:latest - volumes: - - ./lemmy_beta.hjson:/config/config.hjson environment: + - LEMMY_HOSTNAME=lemmy-beta:8551 + - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_beta:5432/lemmy + - LEMMY_JWT_SECRET=changeme + - LEMMY_FEDERATION__ENABLED=true + - LEMMY_TLS_ENABLED=false + - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon + - LEMMY_PORT=8551 + - LEMMY_SETUP__ADMIN_USERNAME=lemmy_beta + - LEMMY_SETUP__ADMIN_PASSWORD=lemmy + - LEMMY_SETUP__SITE_NAME=lemmy-beta + - LEMMY_RATE_LIMIT__POST=99999 + - LEMMY_RATE_LIMIT__REGISTER=99999 + - LEMMY_CAPTCHA__ENABLED=false - LEMMY_TEST_SEND_SYNC=1 - RUST_BACKTRACE=1 - RUST_LOG=debug @@ -96,9 +118,20 @@ services: - lemmy-gamma lemmy-gamma: image: lemmy-federation:latest - volumes: - - ./lemmy_gamma.hjson:/config/config.hjson environment: + - LEMMY_HOSTNAME=lemmy-gamma:8561 + - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_gamma:5432/lemmy + - LEMMY_JWT_SECRET=changeme + - LEMMY_FEDERATION__ENABLED=true + - LEMMY_TLS_ENABLED=false + - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon + - LEMMY_PORT=8561 + - LEMMY_SETUP__ADMIN_USERNAME=lemmy_gamma + - LEMMY_SETUP__ADMIN_PASSWORD=lemmy + - LEMMY_SETUP__SITE_NAME=lemmy-gamma + - LEMMY_RATE_LIMIT__POST=99999 + - LEMMY_RATE_LIMIT__REGISTER=99999 + - LEMMY_CAPTCHA__ENABLED=false - LEMMY_TEST_SEND_SYNC=1 - RUST_BACKTRACE=1 - RUST_LOG=debug @@ -126,9 +159,20 @@ services: - lemmy-delta lemmy-delta: image: lemmy-federation:latest - volumes: - - ./lemmy_delta.hjson:/config/config.hjson environment: + - LEMMY_HOSTNAME=lemmy-delta:8571 + - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_delta:5432/lemmy + - LEMMY_JWT_SECRET=changeme + - LEMMY_FEDERATION__ENABLED=true + - LEMMY_TLS_ENABLED=false + - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta + - LEMMY_PORT=8571 + - LEMMY_SETUP__ADMIN_USERNAME=lemmy_delta + - LEMMY_SETUP__ADMIN_PASSWORD=lemmy + - LEMMY_SETUP__SITE_NAME=lemmy-delta + - LEMMY_RATE_LIMIT__POST=99999 + - LEMMY_RATE_LIMIT__REGISTER=99999 + - LEMMY_CAPTCHA__ENABLED=false - LEMMY_TEST_SEND_SYNC=1 - RUST_BACKTRACE=1 - RUST_LOG=debug @@ -156,9 +200,20 @@ services: - lemmy-epsilon lemmy-epsilon: image: lemmy-federation:latest - volumes: - - ./lemmy_epsilon.hjson:/config/config.hjson environment: + - LEMMY_HOSTNAME=lemmy-epsilon:8581 + - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_epsilon:5432/lemmy + - LEMMY_JWT_SECRET=changeme + - LEMMY_FEDERATION__ENABLED=true + - LEMMY_TLS_ENABLED=false + - LEMMY_FEDERATION__BLOCKED_INSTANCES=lemmy-alpha + - LEMMY_PORT=8581 + - LEMMY_SETUP__ADMIN_USERNAME=lemmy_epsilon + - LEMMY_SETUP__ADMIN_PASSWORD=lemmy + - LEMMY_SETUP__SITE_NAME=lemmy-epsilon + - LEMMY_RATE_LIMIT__POST=99999 + - LEMMY_RATE_LIMIT__REGISTER=99999 + - LEMMY_CAPTCHA__ENABLED=false - LEMMY_TEST_SEND_SYNC=1 - RUST_BACKTRACE=1 - RUST_LOG=debug diff --git a/docker/federation/lemmy_alpha.hjson b/docker/federation/lemmy_alpha.hjson deleted file mode 100644 index 3f8fc03d..00000000 --- a/docker/federation/lemmy_alpha.hjson +++ /dev/null @@ -1,37 +0,0 @@ -{ - hostname: lemmy-alpha:8541 - port: 8541 - tls_enabled: false - jwt_secret: changeme - setup: { - admin_username: lemmy_alpha - admin_password: lemmy - site_name: lemmy-alpha - } - database: { - database: lemmy - user: lemmy - password: password - host: postgres_alpha - port: 5432 - pool_size: 5 - } - federation: { - enabled: true - allowed_instances: lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon - } - captcha: { - enabled: false - difficulty: medium - } - rate_limit: { - message: 180 - message_per_second: 60 - post: 99999 - post_per_second: 600 - register: 99999 - register_per_second: 3600 - image: 6 - image_per_second: 3600 - } -} diff --git a/docker/federation/lemmy_beta.hjson b/docker/federation/lemmy_beta.hjson deleted file mode 100644 index f23d8f1c..00000000 --- a/docker/federation/lemmy_beta.hjson +++ /dev/null @@ -1,37 +0,0 @@ -{ - hostname: lemmy-beta:8551 - port: 8551 - tls_enabled: false - jwt_secret: changeme - setup: { - admin_username: lemmy_beta - admin_password: lemmy - site_name: lemmy-beta - } - database: { - database: lemmy - user: lemmy - password: password - host: postgres_beta - port: 5432 - pool_size: 5 - } - federation: { - enabled: true - allowed_instances: lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon - } - captcha: { - enabled: false - difficulty: medium - } - rate_limit: { - message: 180 - message_per_second: 60 - post: 99999 - post_per_second: 600 - register: 99999 - register_per_second: 3600 - image: 6 - image_per_second: 3600 - } -} diff --git a/docker/federation/lemmy_delta.hjson b/docker/federation/lemmy_delta.hjson deleted file mode 100644 index f4fb0ecc..00000000 --- a/docker/federation/lemmy_delta.hjson +++ /dev/null @@ -1,37 +0,0 @@ -{ - hostname: lemmy-delta:8571 - port: 8571 - tls_enabled: false - jwt_secret: changeme - setup: { - admin_username: lemmy_delta - admin_password: lemmy - site_name: lemmy-delta - } - database: { - database: lemmy - user: lemmy - password: password - host: postgres_delta - port: 5432 - pool_size: 5 - } - federation: { - enabled: true - allowed_instances: lemmy-beta - } - captcha: { - enabled: false - difficulty: medium - } - rate_limit: { - message: 180 - message_per_second: 60 - post: 99999 - post_per_second: 600 - register: 99999 - register_per_second: 3600 - image: 6 - image_per_second: 3600 - } -} diff --git a/docker/federation/lemmy_epsilon.hjson b/docker/federation/lemmy_epsilon.hjson deleted file mode 100644 index c04c3127..00000000 --- a/docker/federation/lemmy_epsilon.hjson +++ /dev/null @@ -1,37 +0,0 @@ -{ - hostname: lemmy-epsilon:8581 - port: 8581 - tls_enabled: false - jwt_secret: changeme - setup: { - admin_username: lemmy_epsilon - admin_password: lemmy - site_name: lemmy-epsilon - } - database: { - database: lemmy - user: lemmy - password: password - host: postgres_epsilon - port: 5432 - pool_size: 5 - } - federation: { - enabled: true - blocked_instances: lemmy-alpha - } - captcha: { - enabled: false - difficulty: medium - } - rate_limit: { - message: 180 - message_per_second: 60 - post: 99999 - post_per_second: 600 - register: 99999 - register_per_second: 3600 - image: 6 - image_per_second: 3600 - } -} diff --git a/docker/federation/lemmy_gamma.hjson b/docker/federation/lemmy_gamma.hjson deleted file mode 100644 index f08e2e63..00000000 --- a/docker/federation/lemmy_gamma.hjson +++ /dev/null @@ -1,37 +0,0 @@ -{ - hostname: lemmy-gamma:8561 - port: 8561 - tls_enabled: false - jwt_secret: changeme - setup: { - admin_username: lemmy_gamma - admin_password: lemmy - site_name: lemmy-gamma - } - database: { - database: lemmy - user: lemmy - password: password - host: postgres_gamma - port: 5432 - pool_size: 5 - } - federation: { - enabled: true - allowed_instances: lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon - } - captcha: { - enabled: false - difficulty: medium - } - rate_limit: { - message: 180 - message_per_second: 60 - post: 99999 - post_per_second: 600 - register: 99999 - register_per_second: 3600 - image: 6 - image_per_second: 3600 - } -} diff --git a/docker/lemmy.hjson b/docker/lemmy.hjson index bceb5f6c..bea65d8f 100644 --- a/docker/lemmy.hjson +++ b/docker/lemmy.hjson @@ -29,10 +29,6 @@ password: "password" # host where postgres is running host: "postgres" - # port where postgres can be accessed - port: 5432 - # maximum number of active sql connections - pool_size: 5 } # # optional: email sending configuration # email: { diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index c4f0358d..8f307bf6 100644 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -56,6 +56,7 @@ RUN addgroup -g 1000 lemmy RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy # Copy resources +COPY --chown=lemmy:lemmy config/defaults.hjson /config/defaults.hjson COPY --chown=lemmy:lemmy --from=builder /app/lemmy_server /app/lemmy RUN chown lemmy:lemmy /app/lemmy diff --git a/docker/prod/Dockerfile.arm b/docker/prod/Dockerfile.arm index a6e698f0..bcf59003 100644 --- a/docker/prod/Dockerfile.arm +++ b/docker/prod/Dockerfile.arm @@ -31,6 +31,7 @@ RUN addgroup --gid 1000 lemmy RUN adduser --no-create-home --shell /bin/sh --uid 1000 --gid 1000 lemmy # Copy resources +COPY --chown=lemmy:lemmy config/defaults.hjson /config/defaults.hjson COPY --chown=lemmy:lemmy --from=builder /app/lemmy_server /app/lemmy RUN chown lemmy:lemmy /app/lemmy diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 78a8484e..6b0519d0 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -28,7 +28,7 @@ services: lemmy-ui: image: dessalines/lemmy-ui:0.9.7 ports: - - "1235:1234" + - "127.0.0.1:1235:1234" restart: always environment: - LEMMY_INTERNAL_HOST=lemmy:8536 diff --git a/src/main.rs b/src/main.rs index 58a1a06b..21c4e457 100644 --- a/src/main.rs +++ b/src/main.rs @@ -37,7 +37,7 @@ async fn main() -> Result<(), LemmyError> { }; let manager = ConnectionManager::::new(&db_url); let pool = Pool::builder() - .max_size(settings.database.unwrap_or_default().pool_size) + .max_size(settings.database.pool_size) .build(manager) .unwrap_or_else(|_| panic!("Error connecting to {}", db_url)); @@ -61,8 +61,7 @@ async fn main() -> Result<(), LemmyError> { println!( "Starting http server at {}:{}", - settings.bind.unwrap(), - settings.port.unwrap_or_default() + settings.bind, settings.port ); let activity_queue = create_activity_queue(); @@ -95,7 +94,7 @@ async fn main() -> Result<(), LemmyError> { .configure(nodeinfo::config) .configure(webfinger::config) }) - .bind((settings.bind.unwrap(), settings.port.unwrap_or_default()))? + .bind((settings.bind, settings.port))? .run() .await?; diff --git a/tests/integration_test.rs b/tests/integration_test.rs index 6658cc72..e82ac9e2 100644 --- a/tests/integration_test.rs +++ b/tests/integration_test.rs @@ -39,7 +39,7 @@ use lemmy_server::code_migrations::run_advanced_migrations; use lemmy_utils::{ apub::generate_actor_keypair, rate_limit::{rate_limiter::RateLimiter, RateLimit}, - settings::Settings, + settings::structs::Settings, }; use lemmy_websocket::{chat_server::ChatServer, LemmyContext}; use reqwest::Client; @@ -58,7 +58,7 @@ fn create_context() -> LemmyContext { }; let manager = ConnectionManager::::new(&db_url); let pool = Pool::builder() - .max_size(settings.database.unwrap_or_default().pool_size) + .max_size(settings.database.pool_size) .build(manager) .unwrap(); embedded_migrations::run(&pool.get().unwrap()).unwrap(); -- 2.40.1 From 62c9be5b5662fbea787169f1335b7ae7fbae8feb Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Fri, 19 Feb 2021 19:37:04 +0100 Subject: [PATCH 6/8] Add support for env vars --- Cargo.lock | 10 ---- crates/utils/Cargo.toml | 1 - crates/utils/src/settings/environment.rs | 73 ++++++++++++++++++++++++ crates/utils/src/settings/mod.rs | 10 +++- 4 files changed, 81 insertions(+), 13 deletions(-) create mode 100644 crates/utils/src/settings/environment.rs diff --git a/Cargo.lock b/Cargo.lock index f6421fad..47ee01e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1103,15 +1103,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "envy" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f47e0157f2cb54f5ae1bd371b30a2ae4311e1c028f575cd4e81de7353215965" -dependencies = [ - "serde", -] - [[package]] name = "event-listener" version = "2.5.1" @@ -1964,7 +1955,6 @@ dependencies = [ "comrak", "deser-hjson", "diesel", - "envy", "futures", "http", "itertools", diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index 44218060..50a41fb7 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -34,4 +34,3 @@ diesel = "1.4.5" http = "0.2.3" jsonwebtoken = "7.2.0" deser-hjson = "0.1.12" -envy = "0.4" diff --git a/crates/utils/src/settings/environment.rs b/crates/utils/src/settings/environment.rs new file mode 100644 index 00000000..89ae2866 --- /dev/null +++ b/crates/utils/src/settings/environment.rs @@ -0,0 +1,73 @@ +use crate::settings::structs_opt::{ + CaptchaConfigOpt, + DatabaseConfigOpt, + EmailConfigOpt, + FederationConfigOpt, + RateLimitConfigOpt, + SettingsOpt, + SetupOpt, +}; +use std::{env, str::FromStr}; + +pub(in crate::settings) fn parse_from_env() -> SettingsOpt { + SettingsOpt { + hostname: env_var("HOSTNAME"), + bind: env_var("BIND"), + port: env_var("PORT"), + tls_enabled: env_var("TLS_ENABLED"), + jwt_secret: env_var("JWT_SECRET"), + pictrs_url: env_var("PICTRS_URL"), + iframely_url: env_var("IFRAMELY_URL"), + rate_limit: Some(RateLimitConfigOpt { + message: env_var("RATE_LIMIT__MESSAGE"), + message_per_second: env_var("RATE_LIMIT__MESSAGE_PER_SECOND"), + post: env_var("RATE_LIMIT__POST"), + post_per_second: env_var("RATE_LIMIT__POST_PER_SECOND"), + register: env_var("RATE_LIMIT__REGISTER"), + register_per_second: env_var("RATE_LIMIT__REGISTER_PER_SECOND"), + image: env_var("RATE_LIMIT__IMAGE"), + image_per_second: env_var("RATE_LIMIT__IMAGE_PER_SECOND"), + }), + email: Some(EmailConfigOpt { + smtp_server: env_var("EMAIL__SMTP_SERVER"), + smtp_login: Some(env_var("EMAIL__SMTP_LOGIN")), + smtp_password: Some(env_var("EMAIL__SMTP_PASSWORD")), + smtp_from_address: env_var("EMAIL__SMTP_FROM_ADDRESS"), + use_tls: env_var("EMAIL__USE_TLS"), + }), + federation: Some(FederationConfigOpt { + enabled: env_var("FEDERATION__ENABLED"), + allowed_instances: env_var("FEDERATION__ALLOWED_INSTANCES"), + blocked_instances: env_var("FEDERATION__BLOCKED_INSTANCES"), + }), + captcha: Some(CaptchaConfigOpt { + enabled: env_var("CAPTCHA__ENABLED"), + difficulty: env_var("CAPTCHA__DIFFICULTY"), + }), + setup: Some(SetupOpt { + admin_username: env_var("SETUP__ADMIN_USERNAME"), + admin_password: env_var("SETUP__ADMIN_PASSWORD"), + admin_email: Some(env_var("SETUP__ADMIN_EMAIL")), + site_name: env_var("SETUP__ADMIN_SITE_NAME"), + }), + database: Some(DatabaseConfigOpt { + user: env_var("DATABASE__USER"), + password: env_var("DATABASE__PASSWORD"), + host: env_var("DATABASE__HOST"), + port: env_var("DATABASE__PORT"), + database: env_var("DATABASE__DATABASE"), + pool_size: env_var("DATABASE__POOL_SIZE"), + }), + } +} + +fn env_var(name: &str) -> Option +where + T: FromStr, + ::Err: std::fmt::Debug, +{ + // TODO: probably remove the unwrap + env::var(format!("LEMMY_{}", name)) + .ok() + .map(|v| T::from_str(&v).unwrap()) +} diff --git a/crates/utils/src/settings/mod.rs b/crates/utils/src/settings/mod.rs index 4345d4f1..2111213a 100644 --- a/crates/utils/src/settings/mod.rs +++ b/crates/utils/src/settings/mod.rs @@ -1,6 +1,11 @@ use crate::{ location_info, - settings::{merge::Merge, structs::Settings, structs_opt::SettingsOpt}, + settings::{ + environment::parse_from_env, + merge::Merge, + structs::Settings, + structs_opt::SettingsOpt, + }, LemmyError, }; use anyhow::{anyhow, Context}; @@ -8,6 +13,7 @@ use deser_hjson::from_str; use std::{env, fs, io::Error, sync::RwLock}; pub mod defaults; +mod environment; mod merge; pub mod structs; mod structs_opt; @@ -36,7 +42,7 @@ impl Settings { config.merge(from_str::(&Self::read_config_file()?)?); // Read env vars - config.merge(envy::prefixed("LEMMY_").from_env::()?); + config.merge(parse_from_env()); if config.hostname == Settings::default().hostname { return Err(anyhow!("Hostname variable is not set!").into()); -- 2.40.1 From 59cce4a1f58d1da9c9e89e57ba42cdbe0f267634 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Mon, 22 Feb 2021 18:57:15 +0100 Subject: [PATCH 7/8] Rewrite merge code to fix tests --- crates/api/src/site.rs | 4 +- crates/utils/src/settings/environment.rs | 2 +- crates/utils/src/settings/merge.rs | 186 +++++++++++-------- crates/utils/src/settings/mod.rs | 16 +- docker/federation/docker-compose.yml | 1 + docker/federation/start-local-instances.bash | 3 +- 6 files changed, 126 insertions(+), 86 deletions(-) diff --git a/crates/api/src/site.rs b/crates/api/src/site.rs index 40108264..83037d65 100644 --- a/crates/api/src/site.rs +++ b/crates/api/src/site.rs @@ -583,7 +583,9 @@ impl Perform for GetSiteConfig { // Only let admins read this is_admin(context.pool(), user.id).await?; - let config_hjson = Settings::read_config_file()?; + // TODO: should make the response field optional? + // or include env vars, but then we cant really save it + let config_hjson = Settings::read_config_file().unwrap_or("".to_string()); Ok(GetSiteConfigResponse { config_hjson }) } diff --git a/crates/utils/src/settings/environment.rs b/crates/utils/src/settings/environment.rs index 89ae2866..9721212f 100644 --- a/crates/utils/src/settings/environment.rs +++ b/crates/utils/src/settings/environment.rs @@ -48,7 +48,7 @@ pub(in crate::settings) fn parse_from_env() -> SettingsOpt { admin_username: env_var("SETUP__ADMIN_USERNAME"), admin_password: env_var("SETUP__ADMIN_PASSWORD"), admin_email: Some(env_var("SETUP__ADMIN_EMAIL")), - site_name: env_var("SETUP__ADMIN_SITE_NAME"), + site_name: env_var("SETUP__SITE_NAME"), }), database: Some(DatabaseConfigOpt { user: env_var("DATABASE__USER"), diff --git a/crates/utils/src/settings/merge.rs b/crates/utils/src/settings/merge.rs index 7cd1762f..189fc546 100644 --- a/crates/utils/src/settings/merge.rs +++ b/crates/utils/src/settings/merge.rs @@ -1,107 +1,141 @@ use crate::settings::{structs::*, structs_opt::*}; pub(in crate::settings) trait Merge { - fn merge(&mut self, opt: T); + fn merge(self, opt: T) -> Self; } impl Merge for Settings { - fn merge(&mut self, opt: SettingsOpt) { - overwrite_if_some(&mut self.hostname, opt.hostname); - overwrite_if_some(&mut self.bind, opt.bind); - overwrite_if_some(&mut self.port, opt.port); - overwrite_if_some(&mut self.tls_enabled, opt.tls_enabled); - overwrite_if_some(&mut self.jwt_secret, opt.jwt_secret); - overwrite_if_some(&mut self.pictrs_url, opt.pictrs_url); - overwrite_if_some(&mut self.iframely_url, opt.iframely_url); - merge_if_some(&mut self.captcha, opt.captcha); - merge_if_some(&mut self.rate_limit, opt.rate_limit); - merge_if_some_opt(&mut self.email, opt.email); - merge_if_some_opt(&mut self.setup, opt.setup); - merge_if_some(&mut self.federation, opt.federation); - merge_if_some(&mut self.database, opt.database); + fn merge(self, opt: SettingsOpt) -> Self { + Settings { + setup: merge_structs(self.setup, opt.setup), + database: merge_structs(self.database, opt.database), + hostname: opt.hostname.unwrap_or(self.hostname), + bind: opt.bind.unwrap_or(self.bind), + port: opt.port.unwrap_or(self.port), + tls_enabled: opt.tls_enabled.unwrap_or(self.tls_enabled), + jwt_secret: opt.jwt_secret.unwrap_or(self.jwt_secret), + pictrs_url: opt.pictrs_url.unwrap_or(self.pictrs_url), + iframely_url: opt.iframely_url.unwrap_or(self.iframely_url), + rate_limit: merge_structs(self.rate_limit, opt.rate_limit), + email: merge_structs(self.email, opt.email), + federation: merge_structs(self.federation, opt.federation), + captcha: merge_structs(self.captcha, opt.captcha), + } } } impl Merge for RateLimitConfig { - fn merge(&mut self, opt: RateLimitConfigOpt) { - overwrite_if_some(&mut self.message, opt.message); - overwrite_if_some(&mut self.message_per_second, opt.message_per_second); - overwrite_if_some(&mut self.post, opt.post); - overwrite_if_some(&mut self.post_per_second, opt.post_per_second); - overwrite_if_some(&mut self.register, opt.register); - overwrite_if_some(&mut self.register_per_second, opt.register_per_second); - overwrite_if_some(&mut self.image, opt.image); - overwrite_if_some(&mut self.image_per_second, opt.image_per_second); + fn merge(self, opt: RateLimitConfigOpt) -> Self { + RateLimitConfig { + message: opt.message.unwrap_or(self.message), + message_per_second: opt.message_per_second.unwrap_or(self.message_per_second), + post: opt.post.unwrap_or(self.post), + post_per_second: opt.post_per_second.unwrap_or(self.post_per_second), + register: opt.register.unwrap_or(self.register), + register_per_second: opt.register_per_second.unwrap_or(self.register_per_second), + image: opt.image.unwrap_or(self.image), + image_per_second: opt.image_per_second.unwrap_or(self.image_per_second), + } } } -impl Merge for Setup { - fn merge(&mut self, opt: SetupOpt) { - overwrite_if_some(&mut self.admin_username, opt.admin_username); - overwrite_if_some(&mut self.admin_password, opt.admin_password); - overwrite_if_some(&mut self.admin_email, opt.admin_email); - overwrite_if_some(&mut self.site_name, opt.site_name); +impl Merge for Option { + fn merge(self, opt: SetupOpt) -> Self { + if let Some(setup) = self { + Some(Setup { + admin_username: opt.admin_username.unwrap_or(setup.admin_username), + admin_password: opt.admin_password.unwrap_or(setup.admin_password), + admin_email: opt.admin_email.unwrap_or(setup.admin_email), + site_name: opt.site_name.unwrap_or(setup.site_name), + }) + } else if let (Some(admin_username), Some(admin_password), Some(site_name)) = + (opt.admin_username, opt.admin_password, opt.site_name) + { + Some(Setup { + admin_username, + admin_password, + admin_email: opt.admin_email.flatten(), + site_name, + }) + } else { + None + } } } -impl Merge for EmailConfig { - fn merge(&mut self, opt: EmailConfigOpt) { - overwrite_if_some(&mut self.smtp_server, opt.smtp_server); - overwrite_if_some(&mut self.smtp_login, opt.smtp_login); - overwrite_if_some(&mut self.smtp_password, opt.smtp_password); - overwrite_if_some(&mut self.smtp_from_address, opt.smtp_from_address); - overwrite_if_some(&mut self.use_tls, opt.use_tls); +impl Merge for Option { + fn merge(self, opt: EmailConfigOpt) -> Self { + if let Some(email_config) = self { + Some(EmailConfig { + smtp_server: opt.smtp_server.unwrap_or(email_config.smtp_server), + smtp_login: opt.smtp_login.unwrap_or(email_config.smtp_login), + smtp_password: opt.smtp_password.unwrap_or(email_config.smtp_password), + smtp_from_address: opt + .smtp_from_address + .unwrap_or(email_config.smtp_from_address), + use_tls: opt.use_tls.unwrap_or(email_config.use_tls), + }) + } else if let (Some(smtp_server), Some(smtp_from_address), Some(use_tls)) = + (opt.smtp_server, opt.smtp_from_address, opt.use_tls) + { + Some(EmailConfig { + smtp_server, + smtp_login: opt + .smtp_login + .or(self.clone().map(|s| s.smtp_login)) + .flatten(), + smtp_password: opt + .smtp_password + .or(self.map(|s| s.smtp_password)) + .flatten(), + smtp_from_address, + use_tls, + }) + } else { + None + } } } impl Merge for DatabaseConfig { - fn merge(&mut self, opt: DatabaseConfigOpt) { - overwrite_if_some(&mut self.user, opt.user); - overwrite_if_some(&mut self.password, opt.password); - overwrite_if_some(&mut self.host, opt.host); - overwrite_if_some(&mut self.port, opt.port); - overwrite_if_some(&mut self.database, opt.database); - overwrite_if_some(&mut self.pool_size, opt.pool_size); + fn merge(self, opt: DatabaseConfigOpt) -> Self { + DatabaseConfig { + user: opt.user.unwrap_or(self.user), + password: opt.password.unwrap_or(self.password), + host: opt.host.unwrap_or(self.host), + port: opt.port.unwrap_or(self.port), + database: opt.database.unwrap_or(self.database), + pool_size: opt.pool_size.unwrap_or(self.pool_size), + } } } impl Merge for FederationConfig { - fn merge(&mut self, opt: FederationConfigOpt) { - overwrite_if_some(&mut self.enabled, opt.enabled); - overwrite_if_some(&mut self.allowed_instances, opt.allowed_instances); - overwrite_if_some(&mut self.blocked_instances, opt.blocked_instances); + fn merge(self, opt: FederationConfigOpt) -> Self { + FederationConfig { + enabled: opt.enabled.unwrap_or(self.enabled), + allowed_instances: opt.allowed_instances.unwrap_or(self.allowed_instances), + blocked_instances: opt.blocked_instances.unwrap_or(self.blocked_instances), + } } } impl Merge for CaptchaConfig { - fn merge(&mut self, opt: CaptchaConfigOpt) { - overwrite_if_some(&mut self.enabled, opt.enabled); - overwrite_if_some(&mut self.difficulty, opt.difficulty); - } -} - -fn overwrite_if_some(lhs: &mut T, rhs: Option) { - if let Some(x) = rhs { - *lhs = x; - } -} - -fn merge_if_some(lhs: &mut T, rhs: Option) -where - T: Merge, -{ - if let Some(x) = rhs { - lhs.merge(x); - } -} - -fn merge_if_some_opt(lhs: &mut Option, rhs: Option) -where - T: Merge, -{ - if let Some(x) = rhs { - if let Some(y) = lhs { - y.merge(x) + fn merge(self, opt: CaptchaConfigOpt) -> Self { + CaptchaConfig { + enabled: opt.enabled.unwrap_or(self.enabled), + difficulty: opt.difficulty.unwrap_or(self.difficulty), } } } + +fn merge_structs(lhs: T, rhs: Option) -> T +where + T: Merge + std::clone::Clone, +{ + if let Some(x) = rhs { + lhs.merge(x) + } else { + lhs.to_owned() + } +} diff --git a/crates/utils/src/settings/mod.rs b/crates/utils/src/settings/mod.rs index 2111213a..db3ebe89 100644 --- a/crates/utils/src/settings/mod.rs +++ b/crates/utils/src/settings/mod.rs @@ -10,7 +10,7 @@ use crate::{ }; use anyhow::{anyhow, Context}; use deser_hjson::from_str; -use std::{env, fs, io::Error, sync::RwLock}; +use std::{env, fs, sync::RwLock}; pub mod defaults; mod environment; @@ -39,10 +39,12 @@ impl Settings { let mut config = Settings::default(); // Read the config file - config.merge(from_str::(&Self::read_config_file()?)?); + if let Some(config_file) = &Self::read_config_file() { + config = config.merge(from_str::(config_file)?); + } // Read env vars - config.merge(parse_from_env()); + config = config.merge(parse_from_env()); if config.hostname == Settings::default().hostname { return Err(anyhow!("Hostname variable is not set!").into()); @@ -68,8 +70,8 @@ impl Settings { env::var("LEMMY_CONFIG_LOCATION").unwrap_or_else(|_| CONFIG_FILE.to_string()) } - pub fn read_config_file() -> Result { - fs::read_to_string(Self::get_config_location()) + pub fn read_config_file() -> Option { + fs::read_to_string(Self::get_config_location()).ok() } pub fn get_allowed_instances(&self) -> Vec { @@ -133,7 +135,7 @@ impl Settings { ) } - pub fn save_config_file(data: &str) -> Result { + pub fn save_config_file(data: &str) -> Result { fs::write(CONFIG_FILE, data)?; // Reload the new settings @@ -144,6 +146,6 @@ impl Settings { Err(e) => panic!("{}", e), }; - Self::read_config_file() + Self::read_config_file().ok_or(anyhow!("Failed to read config").into()) } } diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index 72e6c5ce..6f47572c 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -39,6 +39,7 @@ services: lemmy-alpha: image: lemmy-federation:latest environment: + - RUST_BACKTRACE=full - LEMMY_HOSTNAME=lemmy-alpha:8541 - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy - LEMMY_JWT_SECRET=changeme diff --git a/docker/federation/start-local-instances.bash b/docker/federation/start-local-instances.bash index e963792a..8de4348a 100755 --- a/docker/federation/start-local-instances.bash +++ b/docker/federation/start-local-instances.bash @@ -8,4 +8,5 @@ for Item in alpha beta gamma delta epsilon ; do sudo chown -R 991:991 volumes/pictrs_$Item done -sudo docker-compose up +sudo docker-compose up -d +sudo docker-compose logs -f lemmy-alpha -- 2.40.1 From b4bbb06e137025dcaa9554a1450afe83691b0dbe Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Tue, 23 Feb 2021 18:07:22 +0100 Subject: [PATCH 8/8] cleanup --- docker/federation/docker-compose.yml | 1 - docker/federation/start-local-instances.bash | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index 6f47572c..72e6c5ce 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -39,7 +39,6 @@ services: lemmy-alpha: image: lemmy-federation:latest environment: - - RUST_BACKTRACE=full - LEMMY_HOSTNAME=lemmy-alpha:8541 - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy - LEMMY_JWT_SECRET=changeme diff --git a/docker/federation/start-local-instances.bash b/docker/federation/start-local-instances.bash index 8de4348a..e963792a 100755 --- a/docker/federation/start-local-instances.bash +++ b/docker/federation/start-local-instances.bash @@ -8,5 +8,4 @@ for Item in alpha beta gamma delta epsilon ; do sudo chown -R 991:991 volumes/pictrs_$Item done -sudo docker-compose up -d -sudo docker-compose logs -f lemmy-alpha +sudo docker-compose up -- 2.40.1