Fix for network device config (#2587)

Author: moubctez

Cargo.lock

@@ -324,15 +324,14 @@ pub(crate) async fn proxy_cert_self_signed(
             WebError::Http(StatusCode::INTERNAL_SERVER_ERROR)
         })?;
 
-    let (ca_cert_der, ca_key_der) = match (certs.ca_cert_der.clone(), certs.ca_key_der.clone()) {
-        (Some(c), Some(k)) => (c, k),
-        _ => {
-            warn!("CA not configured; cannot issue self-signed proxy cert");
-            return Ok(ApiResponse::json(
-                serde_json::json!({"msg": "Core CA is not configured"}),
-                StatusCode::BAD_REQUEST,
-            ));
-        }
+    let (Some(ca_cert_der), Some(ca_key_der)) =
+        (certs.ca_cert_der.clone(), certs.ca_key_der.clone())
+    else {
+        warn!("CA not configured; cannot issue self-signed proxy cert");
+        return Ok(ApiResponse::json(
+            serde_json::json!({"msg": "Core CA is not configured"}),
+            StatusCode::BAD_REQUEST,
+        ));
     };
 
     // Build CA from stored DER blobs.

crates/defguard_core/src/handlers/proxy.rs

@@ -53,7 +53,6 @@ use handlers::{
 };
 use ipnetwork::IpNetwork;
 use regex::Regex;
-use reqwest::Url;
 use secrecy::ExposeSecret;
 use semver::Version;
 use sqlx::PgPool;
@@ -740,8 +739,7 @@ pub async fn init_dev_env(config: &DefGuardConfig) {
     settings.public_proxy_url = config
         .enrollment_url
         .clone()
-        .unwrap_or(Url::parse("http://localhost:8080").unwrap())
-        .to_string();
+        .map_or(String::from("http://localhost:8080"), |url| url.to_string());
     settings.defguard_url = config.url.clone().unwrap().to_string();
     update_current_settings(&pool, settings)
         .await

crates/defguard_core/src/lib.rs

@@ -227,9 +227,11 @@ export const NetworkDevicesTable = ({ networkDevices }: Props) => {
               text: m.network_devices_action_view_config(),
               icon: 'config',
               onClick: async () => {
-                const { data: config } = await api.network_device.getDeviceConfig(row.id);
+                const { data: configs } = await api.network_device.getDeviceConfig(
+                  row.id,
+                );
                 openModal(ModalName.NetworkDeviceConfig, {
-                  config,
+                  config: configs[0].config,
                   device: row,
                 });
               },

web/src/pages/NetworkDevicesPage/NetworkDevicesTable.tsx

@@ -320,7 +320,8 @@ const api = {
       client.put(`/device/network/${id}`, data),
     getDevice: (id: number) => client.get<NetworkDevice>(`/device/network/${id}`),
     getDevices: () => fetchAllPages<NetworkDevice>('/device/network'),
-    getDeviceConfig: (id: number) => client.get<string>(`/device/network/${id}/config`),
+    getDeviceConfig: (id: number) =>
+      client.get<AddDeviceResponseConfig[]>(`/device/network/${id}/config`),
     generateToken: (id: number) =>
       client.post<StartEnrollmentResponse>(`/device/network/start_cli/${id}`),
     addCliDevice: (data: AddNetworkDeviceRequest) =>