cargo fmt

warp-tech · Mar 4, 2024 · bcba676 · bcba676
1 parent f3dc1ad
commit bcba676
Show file tree

Hide file tree

Showing 21 changed files with 180 additions and 74 deletions.
diff --git a/oidc-test/docker-compose.yml b/oidc-test/docker-compose.yml
@@ -0,0 +1,80 @@
+version: '3'
+services:
+  oidc-server-mock:
+    container_name: oidc-server-mock
+    image: ghcr.io/soluto/oidc-server-mock:latest
+    ports:
+      - '4011:80'
+    environment:
+      ASPNETCORE_ENVIRONMENT: Development
+      SERVER_OPTIONS_INLINE: |
+        {
+          "AccessTokenJwtType": "JWT",
+          "Discovery": {
+            "ShowKeySet": true
+          },
+          "Authentication": {
+            "CookieSameSiteMode": "Lax",
+            "CheckSessionCookieSameSiteMode": "Lax"
+          }
+        }
+      LOGIN_OPTIONS_INLINE: |
+        {
+          "AllowRememberLogin": false
+        }
+      LOGOUT_OPTIONS_INLINE: |
+        {
+          "AutomaticRedirectAfterSignOut": true
+        }
+      API_SCOPES_INLINE: |
+        - Name: some-app-scope-1
+        - Name: some-app-scope-2
+      API_RESOURCES_INLINE: |
+        - Name: some-app
+          Scopes:
+            - some-app-scope-1
+            - some-app-scope-2
+      USERS_CONFIGURATION_INLINE: |
+        [
+          {
+            "SubjectId":"1",
+            "Username":"User1",
+            "Password":"pwd",
+            "Claims": [
+              {
+                "Type": "name",
+                "Value": "Sam Tailor",
+                "ValueType": "string"
+              },
+              {
+                "Type": "email",
+                "Value": "sam.tailor@gmail.com",
+                "ValueType": "string"
+              },
+              {
+                "Type": "some-api-resource-claim",
+                "Value": "Sam's Api Resource Custom Claim",
+                "ValueType": "string"
+              },
+              {
+                "Type": "some-api-scope-claim",
+                "Value": "Sam's Api Scope Custom Claim",
+                "ValueType": "string"
+              },
+              {
+                "Type": "some-identity-resource-claim",
+                "Value": "Sam's Identity Resource Custom Claim",
+                "ValueType": "string"
+              }
+            ]
+          }
+        ]
+      CLIENTS_CONFIGURATION_PATH: /tmp/config/clients-config.json
+      ASPNET_SERVICES_OPTIONS_INLINE: |
+        {
+          "ForwardedHeadersOptions": {
+            "ForwardedHeaders" : "All"
+          }
+        }
+    volumes:
+      - .:/tmp/config:ro
diff --git a/warpgate-admin/src/api/recordings_detail.rs b/warpgate-admin/src/api/recordings_detail.rs
@@ -69,8 +69,8 @@ pub async fn api_get_recording_cast(
         .map_err(InternalServerError)?;
 
     let Some(recording) = recording else {
-            return Err(NotFoundError.into())
-        };
+        return Err(NotFoundError.into());
+    };
 
     if recording.kind != RecordingKind::Terminal {
         return Err(NotFoundError.into());
@@ -128,8 +128,8 @@ pub async fn api_get_recording_tcpdump(
         .map_err(poem::error::InternalServerError)?;
 
     let Some(recording) = recording else {
-            return Err(NotFoundError.into())
-        };
+        return Err(NotFoundError.into());
+    };
 
     if recording.kind != RecordingKind::Traffic {
         return Err(NotFoundError.into());

diff --git a/warpgate-admin/src/api/targets.rs b/warpgate-admin/src/api/targets.rs
@@ -139,9 +139,10 @@ impl DetailApi {
         let Some(target) = Target::Entity::find_by_id(id.0)
             .one(&*db)
             .await
-            .map_err(poem::error::InternalServerError)? else {
-                return Ok(GetTargetResponse::NotFound);
-            };
+            .map_err(poem::error::InternalServerError)?
+        else {
+            return Ok(GetTargetResponse::NotFound);
+        };
 
         Ok(GetTargetResponse::Ok(Json(
             target
@@ -162,7 +163,8 @@ impl DetailApi {
         let Some(target) = Target::Entity::find_by_id(id.0)
             .one(&*db)
             .await
-            .map_err(poem::error::InternalServerError)? else {
+            .map_err(poem::error::InternalServerError)?
+        else {
             return Ok(UpdateTargetResponse::NotFound);
         };
 
@@ -199,9 +201,10 @@ impl DetailApi {
         let Some(target) = Target::Entity::find_by_id(id.0)
             .one(&*db)
             .await
-            .map_err(poem::error::InternalServerError)? else {
-                return Ok(DeleteTargetResponse::NotFound);
-            };
+            .map_err(poem::error::InternalServerError)?
+        else {
+            return Ok(DeleteTargetResponse::NotFound);
+        };
 
         if target.kind == TargetKind::WebAdmin {
             return Ok(DeleteTargetResponse::Forbidden);
@@ -268,8 +271,9 @@ impl RolesApi {
             .all(&*db)
             .await
             .map(|x| x.into_iter().next())
-            .map_err(WarpgateError::from)? else {
-            return Ok(GetTargetRolesResponse::NotFound)
+            .map_err(WarpgateError::from)?
+        else {
+            return Ok(GetTargetRolesResponse::NotFound);
         };
 
         Ok(GetTargetRolesResponse::Ok(Json(
@@ -328,16 +332,18 @@ impl RolesApi {
         let Some(target) = Target::Entity::find_by_id(id.0)
             .one(&*db)
             .await
-            .map_err(poem::error::InternalServerError)? else {
-                return Ok(DeleteTargetRoleResponse::NotFound);
-            };
+            .map_err(poem::error::InternalServerError)?
+        else {
+            return Ok(DeleteTargetRoleResponse::NotFound);
+        };
 
         let Some(role) = Role::Entity::find_by_id(role_id.0)
             .one(&*db)
             .await
-            .map_err(poem::error::InternalServerError)? else {
-                return Ok(DeleteTargetRoleResponse::NotFound);
-            };
+            .map_err(poem::error::InternalServerError)?
+        else {
+            return Ok(DeleteTargetRoleResponse::NotFound);
+        };
 
         if role.name == BUILTIN_ADMIN_ROLE_NAME && target.kind == TargetKind::WebAdmin {
             return Ok(DeleteTargetRoleResponse::Forbidden);
@@ -348,9 +354,10 @@ impl RolesApi {
             .filter(TargetRoleAssignment::Column::RoleId.eq(role_id.0))
             .one(&*db)
             .await
-            .map_err(WarpgateError::from)? else {
-                return Ok(DeleteTargetRoleResponse::NotFound);
-            };
+            .map_err(WarpgateError::from)?
+        else {
+            return Ok(DeleteTargetRoleResponse::NotFound);
+        };
 
         model.delete(&*db).await.map_err(WarpgateError::from)?;
 

diff --git a/warpgate-admin/src/api/users.rs b/warpgate-admin/src/api/users.rs
@@ -134,9 +134,10 @@ impl DetailApi {
         let Some(user) = User::Entity::find_by_id(id.0)
             .one(&*db)
             .await
-            .map_err(poem::error::InternalServerError)? else {
-                return Ok(GetUserResponse::NotFound);
-            };
+            .map_err(poem::error::InternalServerError)?
+        else {
+            return Ok(GetUserResponse::NotFound);
+        };
 
         Ok(GetUserResponse::Ok(Json(
             user.try_into().map_err(poem::error::InternalServerError)?,
@@ -155,7 +156,8 @@ impl DetailApi {
         let Some(user) = User::Entity::find_by_id(id.0)
             .one(&*db)
             .await
-            .map_err(poem::error::InternalServerError)? else {
+            .map_err(poem::error::InternalServerError)?
+        else {
             return Ok(UpdateUserResponse::NotFound);
         };
 
@@ -196,9 +198,10 @@ impl DetailApi {
         let Some(user) = User::Entity::find_by_id(id.0)
             .one(&*db)
             .await
-            .map_err(poem::error::InternalServerError)? else {
-                return Ok(DeleteUserResponse::NotFound);
-            };
+            .map_err(poem::error::InternalServerError)?
+        else {
+            return Ok(DeleteUserResponse::NotFound);
+        };
 
         UserRoleAssignment::Entity::delete_many()
             .filter(UserRoleAssignment::Column::UserId.eq(user.id))
@@ -270,8 +273,9 @@ impl RolesApi {
             .all(&*db)
             .await
             .map(|x| x.into_iter().next())
-            .map_err(WarpgateError::from)? else {
-            return Ok(GetUserRolesResponse::NotFound)
+            .map_err(WarpgateError::from)?
+        else {
+            return Ok(GetUserRolesResponse::NotFound);
         };
 
         Ok(GetUserRolesResponse::Ok(Json(
@@ -330,25 +334,28 @@ impl RolesApi {
         let Some(_user) = User::Entity::find_by_id(id.0)
             .one(&*db)
             .await
-            .map_err(poem::error::InternalServerError)? else {
-                return Ok(DeleteUserRoleResponse::NotFound);
-            };
+            .map_err(poem::error::InternalServerError)?
+        else {
+            return Ok(DeleteUserRoleResponse::NotFound);
+        };
 
         let Some(_role) = Role::Entity::find_by_id(role_id.0)
             .one(&*db)
             .await
-            .map_err(poem::error::InternalServerError)? else {
-                return Ok(DeleteUserRoleResponse::NotFound);
-            };
+            .map_err(poem::error::InternalServerError)?
+        else {
+            return Ok(DeleteUserRoleResponse::NotFound);
+        };
 
         let Some(model) = UserRoleAssignment::Entity::find()
             .filter(UserRoleAssignment::Column::UserId.eq(id.0))
             .filter(UserRoleAssignment::Column::RoleId.eq(role_id.0))
             .one(&*db)
             .await
-            .map_err(WarpgateError::from)? else {
-                return Ok(DeleteUserRoleResponse::NotFound);
-            };
+            .map_err(WarpgateError::from)?
+        else {
+            return Ok(DeleteUserRoleResponse::NotFound);
+        };
 
         model.delete(&*db).await.map_err(WarpgateError::from)?;
 

diff --git a/warpgate-core/src/auth_state_store.rs b/warpgate-core/src/auth_state_store.rs
@@ -62,7 +62,7 @@ impl AuthStateStore {
             .get_credential_policy(username, supported_credential_types)
             .await?;
         let Some(policy) = policy else {
-            return Err(WarpgateError::UserNotFound)
+            return Err(WarpgateError::UserNotFound);
         };
 
         let state = AuthState::new(
@@ -93,7 +93,7 @@ impl AuthStateStore {
 
     pub async fn complete(&mut self, id: &Uuid) {
         let Some((state, _)) = self.store.get(id) else {
-            return
+            return;
         };
         if let Some(sig) = self.completion_signals.remove(id) {
             let _ = sig.sender.send(state.lock().await.verify());

diff --git a/warpgate-core/src/config_providers/db.rs b/warpgate-core/src/config_providers/db.rs
@@ -135,7 +135,11 @@ impl ConfigProvider for DatabaseConfigProvider {
         &mut self,
         client_credential: &AuthCredential,
     ) -> Result<Option<String>, WarpgateError> {
-        let AuthCredential::Sso { provider: client_provider, email : client_email} = client_credential else {
+        let AuthCredential::Sso {
+            provider: client_provider,
+            email: client_email,
+        } = client_credential
+        else {
             return Ok(None);
         };
 
@@ -171,9 +175,9 @@ impl ConfigProvider for DatabaseConfigProvider {
             .await?;
 
         let Some(user_model) = user_model else {
-                error!("Selected user not found: {}", username);
-                return Ok(false);
-            };
+            error!("Selected user not found: {}", username);
+            return Ok(false);
+        };
 
         let user: UserConfig = user_model.try_into()?;
 

diff --git a/warpgate-core/src/config_providers/file.rs b/warpgate-core/src/config_providers/file.rs
@@ -132,7 +132,11 @@ impl ConfigProvider for FileConfigProvider {
         &mut self,
         client_credential: &AuthCredential,
     ) -> Result<Option<String>, WarpgateError> {
-        let AuthCredential::Sso { provider: client_provider, email : client_email} = client_credential else {
+        let AuthCredential::Sso {
+            provider: client_provider,
+            email: client_email,
+        } = client_credential
+        else {
             return Ok(None);
         };
 

diff --git a/warpgate-core/src/logging/layer.rs b/warpgate-core/src/logging/layer.rs
@@ -32,9 +32,7 @@ where
         id: &tracing_core::span::Id,
         ctx: Context<'_, S>,
     ) {
-        let Some(span) = ctx.span(id) else {
-            return
-        };
+        let Some(span) = ctx.span(id) else { return };
         if !span.metadata().target().starts_with("warpgate") {
             return;
         }

diff --git a/warpgate-core/src/logging/socket.rs b/warpgate-core/src/logging/socket.rs
@@ -42,16 +42,14 @@ where
 
     tokio::spawn(async move {
         while let Some(values) = rx.recv().await {
-            let Some(ref socket) = socket else {
-                return
-            };
+            let Some(ref socket) = socket else { return };
             let Some(ref socket_address) = socket_address else {
-                return
+                return;
             };
 
             let Ok(serialized) = serde_json::to_vec(&values) else {
                 eprintln!("Failed to serialize log entry {values:?}");
-                continue
+                continue;
             };
 
             let buffer = BytesMut::from(&serialized[..]);