Provide gRPC communication with gateway

DefGuard · Oct 29, 2024 · b71d901 · b71d901
1 parent 068f979
commit b71d901
Show file tree

Hide file tree

Showing 57 changed files with 1,609 additions and 1,513 deletions.
diff --git a/...c75588a57088711b8a508325e103b519500e.json → ...6ff43f8ff063a6772586b79f1c524a848554.json b/...c75588a57088711b8a508325e103b519500e.json → ...6ff43f8ff063a6772586b79f1c524a848554.json
diff --git a/...5b97b734d7d4609c3c9e8e85177a52933486.json → ...19811a7c80e0954d6024f00b5ef883aeab3d.json b/...5b97b734d7d4609c3c9e8e85177a52933486.json → ...19811a7c80e0954d6024f00b5ef883aeab3d.json
diff --git a/.sqlx/query-15ba55bedd1260fe39d7190aa75bb1070bc4977a20e89042385fbc55711075c3.json b/.sqlx/query-15ba55bedd1260fe39d7190aa75bb1070bc4977a20e89042385fbc55711075c3.json
diff --git a/...c7ace2f5d943777a1345950d0e517123b10b.json → ...e24f24239df0ba778666ca1751c9436aec8e.json b/...c7ace2f5d943777a1345950d0e517123b10b.json → ...e24f24239df0ba778666ca1751c9436aec8e.json
diff --git a/.sqlx/query-b3cae8e4b2468e9b0ae88ef135729532ee95c54bc1343706bc61d9e4bceed4d4.json b/.sqlx/query-b3cae8e4b2468e9b0ae88ef135729532ee95c54bc1343706bc61d9e4bceed4d4.json
diff --git a/.sqlx/query-c0b17ec0369d1286c82515cef2e2db17b3b9754bb28b66bf001f0a3aa2655839.json b/.sqlx/query-c0b17ec0369d1286c82515cef2e2db17b3b9754bb28b66bf001f0a3aa2655839.json
diff --git a/.sqlx/query-d10c9a7b0b391aeb8b4869f6bddf997807b66e0b532da747b146513c34e15c5c.json b/.sqlx/query-d10c9a7b0b391aeb8b4869f6bddf997807b66e0b532da747b146513c34e15c5c.json
diff --git a/...4d9c6e02287a0f0c5c6d70303c390c95d84b.json → ...f3da8e12f7179da8cb42fa0446b224f9dec4.json b/...4d9c6e02287a0f0c5c6d70303c390c95d84b.json → ...f3da8e12f7179da8cb42fa0446b224f9dec4.json
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/migrations/20241015074303_network_gateways.up.sql b/migrations/20241015074303_network_gateways.up.sql
@@ -2,7 +2,6 @@ CREATE TABLE gateway (
   id bigserial PRIMARY KEY,
   network_id bigint NOT NULL,
   url text NOT NULL,
-  connected boolean NOT NULL DEFAULT false,
   hostname text NULL,
   connected_at timestamp without time zone NULL,
   disconnected_at timestamp without time zone NULL,

diff --git a/src/auth/failed_login.rs b/src/auth/failed_login.rs
@@ -1,15 +1,15 @@
 use std::{collections::HashMap, sync::Mutex};
 
-use chrono::{DateTime, Duration, Local};
+use chrono::{DateTime, Local, TimeDelta};
 use thiserror::Error;
 use utoipa::ToSchema;
 
 // Time window in seconds
-const FAILED_LOGIN_WINDOW: Duration = Duration::seconds(60);
+const FAILED_LOGIN_WINDOW: TimeDelta = TimeDelta::seconds(60);
 // Failed login count threshold
 const FAILED_LOGIN_COUNT: u32 = 5;
 // How long (in seconds) to lock users out after crossing the threshold
-const FAILED_LOGIN_TIMEOUT: Duration = Duration::seconds(5 * 60);
+const FAILED_LOGIN_TIMEOUT: TimeDelta = TimeDelta::seconds(5 * 60);
 
 #[derive(Debug, Error, ToSchema)]
 #[error("Too many login attempts")]
@@ -35,12 +35,12 @@ impl Default for FailedLogin {
 
 impl FailedLogin {
     // How much time has elapsed since first failed login attempt
-    fn time_since_first_attempt(&self) -> Duration {
+    fn time_since_first_attempt(&self) -> TimeDelta {
         Local::now().signed_duration_since(self.first_attempt)
     }
 
     // How much time has elapsed since last failed login attempt
-    fn time_since_last_attempt(&self) -> Duration {
+    fn time_since_last_attempt(&self) -> TimeDelta {
         Local::now().signed_duration_since(self.last_attempt)
     }
 

diff --git a/src/auth/mod.rs b/src/auth/mod.rs
@@ -20,10 +20,13 @@ use crate::{
     appstate::AppState,
     db::{
         models::{
-            group::Group, oauth2authorizedapp::OAuth2AuthorizedApp, oauth2token::OAuth2Token,
+            group::Group,
+            oauth2authorizedapp::OAuth2AuthorizedApp,
+            oauth2token::OAuth2Token,
+            session::{Session, SessionState},
             user::User,
         },
-        Id, Session, SessionState,
+        Id,
     },
     error::WebError,
     handlers::SESSION_COOKIE_NAME,
@@ -50,7 +53,7 @@ pub enum ClaimsType {
 /// Standard claims: https://www.iana.org/assignments/jwt/jwt.xhtml
 #[derive(Deserialize, Serialize)]
 pub struct Claims {
-    #[serde(skip_serializing, skip_deserializing)]
+    #[serde(skip)]
     secret: String,
     // issuer
     pub iss: String,