From 89877499f0132e0f348cd7bf86486e7e3703a99c Mon Sep 17 00:00:00 2001 From: cpprian Date: Mon, 5 Aug 2024 09:21:58 +0200 Subject: [PATCH 01/10] add info log that proxy has been disconnected from core --- src/grpc/mod.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/grpc/mod.rs b/src/grpc/mod.rs index 784b40ce89..889fd737c9 100644 --- a/src/grpc/mod.rs +++ b/src/grpc/mod.rs @@ -514,6 +514,7 @@ pub async fn run_grpc_bidi_stream( tx.send(req).unwrap(); } Err(err) => { + info!("Disconnected from proxy at {}", endpoint.uri()); error!("stream error: {err}"); debug!("waiting 10s to re-establish the connection"); sleep(TEN_SECS).await; From 47fb2fe648f7994104fcb4481572b55e376b650f Mon Sep 17 00:00:00 2001 From: cpprian Date: Wed, 7 Aug 2024 13:13:39 +0200 Subject: [PATCH 02/10] move WireguardPeerStatus stats log to debug from info --- .env | 4 ++-- ...72929d6a612846acf4a5489c36a04cb57de59.json | 22 ------------------- ...ab52c14293fa64d260db812c89ed43a5a7cc8.json | 15 ------------- src/grpc/gateway.rs | 3 ++- 4 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 .sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json delete mode 100644 .sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json diff --git a/.env b/.env index 60c27c65ab..ee64972fe3 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ DEFGUARD_AUTH_SECRET=defguard-auth-secret DEFGUARD_GATEWAY_SECRET=defguard-gateway-secret DEFGUARD_YUBIBRIDGE_SECRET=defguard-yubibridge-secret -DEFGUARD_SECRET_KEY=defguard-secret-key +DEFGUARD_SECRET_KEY=6qHHYKRgCxu+53JY+z0/57CSw/uYLYRm+rKCi+KrJJFpVmcXNWWeHICwDw2HXHft DEFGUARD_URL=http://localhost:8000 # How long auth session lives in seconds DEFGUARD_AUTH_SESSION_LIFETIME=604800 @@ -13,7 +13,7 @@ DEFGUARD_DEFAULT_ADMIN_PASSWORD=pass123 ### Proxy configuration ### # Optional. URL of proxy gRPC server -# DEFGUARD_PROXY_URL=http://localhost:50051 +DEFGUARD_PROXY_URL=http://localhost:50051 ### LDAP configuration ### DEFGUARD_LDAP_URL=ldap://localhost:389 diff --git a/.sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json b/.sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json deleted file mode 100644 index ce67e42930..0000000000 --- a/.sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT recovery_codes FROM \"user\" WHERE id = $1", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "recovery_codes", - "type_info": "TextArray" - } - ], - "parameters": { - "Left": [ - "Int8" - ] - }, - "nullable": [ - false - ] - }, - "hash": "0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59" -} diff --git a/.sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json b/.sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json deleted file mode 100644 index 8d314a5faa..0000000000 --- a/.sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "UPDATE session SET expires = $1 WHERE id = $2", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Timestamp", - "Text" - ] - }, - "nullable": [] - }, - "hash": "1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8" -} diff --git a/src/grpc/gateway.rs b/src/grpc/gateway.rs index f97b1d8491..9e637e41cd 100644 --- a/src/grpc/gateway.rs +++ b/src/grpc/gateway.rs @@ -539,7 +539,8 @@ impl gateway_service_server::GatewayService for GatewayServer { format!("Saving WireGuard peer stats to db failed: {err}"), )); } - info!("Saved WireGuard peer stats to db: {stats:?}"); + info!("Saved WireGuard peer stats to db."); + debug!("WireGuard peer stats: {stats:?}"); } Ok(Response::new(())) } From c513691ed09b8c4da3a5d78a3750c8b5f129976d Mon Sep 17 00:00:00 2001 From: cpprian Date: Wed, 7 Aug 2024 13:15:01 +0200 Subject: [PATCH 03/10] del .env config --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index ee64972fe3..60c27c65ab 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ DEFGUARD_AUTH_SECRET=defguard-auth-secret DEFGUARD_GATEWAY_SECRET=defguard-gateway-secret DEFGUARD_YUBIBRIDGE_SECRET=defguard-yubibridge-secret -DEFGUARD_SECRET_KEY=6qHHYKRgCxu+53JY+z0/57CSw/uYLYRm+rKCi+KrJJFpVmcXNWWeHICwDw2HXHft +DEFGUARD_SECRET_KEY=defguard-secret-key DEFGUARD_URL=http://localhost:8000 # How long auth session lives in seconds DEFGUARD_AUTH_SESSION_LIFETIME=604800 @@ -13,7 +13,7 @@ DEFGUARD_DEFAULT_ADMIN_PASSWORD=pass123 ### Proxy configuration ### # Optional. URL of proxy gRPC server -DEFGUARD_PROXY_URL=http://localhost:50051 +# DEFGUARD_PROXY_URL=http://localhost:50051 ### LDAP configuration ### DEFGUARD_LDAP_URL=ldap://localhost:389 From 6e0675e298fe63de9fea5b99124df9e72f69e6bb Mon Sep 17 00:00:00 2001 From: cpprian Date: Wed, 7 Aug 2024 13:37:15 +0200 Subject: [PATCH 04/10] set SQLX_OFFLINE to false --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f67d5a44cc..cca2cb222b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,5 +59,5 @@ jobs: DEFGUARD_DB_USER: defguard DEFGUARD_DB_PASSWORD: defguard DATABASE_URL: "postgresql://defguard:defguard@postgres/defguard" - SQLX_OFFLINE: true + SQLX_OFFLINE: false run: cargo test --locked --no-fail-fast From b5cbe00aef09f4bdb3bc68fb945c5ae8c1ea63ff Mon Sep 17 00:00:00 2001 From: cpprian Date: Wed, 7 Aug 2024 13:40:08 +0200 Subject: [PATCH 05/10] undo last commit --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cca2cb222b..f67d5a44cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,5 +59,5 @@ jobs: DEFGUARD_DB_USER: defguard DEFGUARD_DB_PASSWORD: defguard DATABASE_URL: "postgresql://defguard:defguard@postgres/defguard" - SQLX_OFFLINE: false + SQLX_OFFLINE: true run: cargo test --locked --no-fail-fast From 8ea3f2d9886fab63f46a0e2793c5aef24d696d9c Mon Sep 17 00:00:00 2001 From: cpprian Date: Wed, 7 Aug 2024 13:56:38 +0200 Subject: [PATCH 06/10] update sqlx --- ...72929d6a612846acf4a5489c36a04cb57de59.json | 22 +++++++++++++++++++ ...ab52c14293fa64d260db812c89ed43a5a7cc8.json | 15 +++++++++++++ Cargo.toml | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 .sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json create mode 100644 .sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json diff --git a/.sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json b/.sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json new file mode 100644 index 0000000000..ce67e42930 --- /dev/null +++ b/.sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json @@ -0,0 +1,22 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT recovery_codes FROM \"user\" WHERE id = $1", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "recovery_codes", + "type_info": "TextArray" + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false + ] + }, + "hash": "0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59" +} diff --git a/.sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json b/.sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json new file mode 100644 index 0000000000..8d314a5faa --- /dev/null +++ b/.sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE session SET expires = $1 WHERE id = $2", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Timestamp", + "Text" + ] + }, + "nullable": [] + }, + "hash": "1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8" +} diff --git a/Cargo.toml b/Cargo.toml index 0a3808be0e..6549b8b09f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,7 +64,7 @@ serde_cbor = { version = "0.12.0-dev", package = "serde_cbor_2" } serde_json = "1.0" serde_urlencoded = "0.7" sha-1 = "0.10" -sqlx = { version = "0.7", features = [ +sqlx = { version = "0.7.4", features = [ "chrono", "ipnetwork", "runtime-tokio-native-tls", From 964246f18d7c2d654aaa6a7bbfa53e611d9cff74 Mon Sep 17 00:00:00 2001 From: cpprian Date: Wed, 7 Aug 2024 13:58:20 +0200 Subject: [PATCH 07/10] run cargo sqlx prepare --- ...72929d6a612846acf4a5489c36a04cb57de59.json | 22 ------------------- ...ab52c14293fa64d260db812c89ed43a5a7cc8.json | 15 ------------- 2 files changed, 37 deletions(-) delete mode 100644 .sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json delete mode 100644 .sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json diff --git a/.sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json b/.sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json deleted file mode 100644 index ce67e42930..0000000000 --- a/.sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT recovery_codes FROM \"user\" WHERE id = $1", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "recovery_codes", - "type_info": "TextArray" - } - ], - "parameters": { - "Left": [ - "Int8" - ] - }, - "nullable": [ - false - ] - }, - "hash": "0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59" -} diff --git a/.sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json b/.sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json deleted file mode 100644 index 8d314a5faa..0000000000 --- a/.sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "UPDATE session SET expires = $1 WHERE id = $2", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Timestamp", - "Text" - ] - }, - "nullable": [] - }, - "hash": "1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8" -} From 5dc3590231a92d5809841fbcc388523d8aadf4b0 Mon Sep 17 00:00:00 2001 From: cpprian Date: Wed, 7 Aug 2024 14:22:19 +0200 Subject: [PATCH 08/10] add for test purpose sqlx::test --- tests/auth.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/auth.rs b/tests/auth.rs index 8267e1ac85..558a63db38 100644 --- a/tests/auth.rs +++ b/tests/auth.rs @@ -455,6 +455,7 @@ async fn test_email_mfa() { } #[tokio::test] +#[sqlx::test] async fn test_webauthn() { let (client, pool) = make_client_with_db().await; From 22605ddd1ce341b19d684d39ee78562ec128f247 Mon Sep 17 00:00:00 2001 From: cpprian Date: Wed, 7 Aug 2024 14:32:29 +0200 Subject: [PATCH 09/10] sqlx prepare for all targets --- ...72929d6a612846acf4a5489c36a04cb57de59.json | 22 +++++++++++++++++++ ...ab52c14293fa64d260db812c89ed43a5a7cc8.json | 15 +++++++++++++ tests/auth.rs | 1 - 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 .sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json create mode 100644 .sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json diff --git a/.sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json b/.sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json new file mode 100644 index 0000000000..ce67e42930 --- /dev/null +++ b/.sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json @@ -0,0 +1,22 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT recovery_codes FROM \"user\" WHERE id = $1", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "recovery_codes", + "type_info": "TextArray" + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false + ] + }, + "hash": "0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59" +} diff --git a/.sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json b/.sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json new file mode 100644 index 0000000000..8d314a5faa --- /dev/null +++ b/.sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE session SET expires = $1 WHERE id = $2", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Timestamp", + "Text" + ] + }, + "nullable": [] + }, + "hash": "1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8" +} diff --git a/tests/auth.rs b/tests/auth.rs index 558a63db38..8267e1ac85 100644 --- a/tests/auth.rs +++ b/tests/auth.rs @@ -455,7 +455,6 @@ async fn test_email_mfa() { } #[tokio::test] -#[sqlx::test] async fn test_webauthn() { let (client, pool) = make_client_with_db().await; From 2dbbe5851904e713c97011ba8bb8072d2a2f4645 Mon Sep 17 00:00:00 2001 From: Cyprian <46838495+cpprian@users.noreply.github.com> Date: Fri, 9 Aug 2024 12:06:47 +0200 Subject: [PATCH 10/10] Update src/grpc/mod.rs Co-authored-by: Aleksander <170264518+t-aleksander@users.noreply.github.com> --- src/grpc/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/grpc/mod.rs b/src/grpc/mod.rs index 57ee3ac437..5fd63daea8 100644 --- a/src/grpc/mod.rs +++ b/src/grpc/mod.rs @@ -514,7 +514,7 @@ pub async fn run_grpc_bidi_stream( tx.send(req).unwrap(); } Err(err) => { - info!("Disconnected from proxy at {}", endpoint.uri()); + error!("Disconnected from proxy at {}", endpoint.uri()); error!("stream error: {err}"); debug!("waiting 10s to re-establish the connection"); sleep(TEN_SECS).await;