From ca50d84d894247a0a1ff1d26819cfbf3cd19e769 Mon Sep 17 00:00:00 2001
From: SquirrelDevelopper <squirrel@squirrelserversmanager.io>
Date: Mon, 10 Feb 2025 14:53:01 +0100
Subject: [PATCH] Add support for Remote System Information connection tests

Introduced functionality to validate Remote System Information connection during device setup and diagnostics. Updated client, server, and shared-lib components to integrate this feature, including API endpoints, UI adjustments, and backend logic for connection testing.
---
 .../CheckDeviceConnection.tsx                 |  55 +++++-
 .../ExistingDeviceConnectionTest.tsx          |  22 ++-
 .../NewDeviceModal/NewDeviceModal.tsx         | 157 ++++++++++++------
 client/src/services/rest/device.ts            |  81 ++++++---
 .../rest/devices/check-connection.ts          |  52 ++++++
 .../devices/check-connection.validator.ts     |  10 ++
 .../core/RemoteSSHExecutorComponent.ts        |  28 ++++
 server/src/routes/devices.ts                  |  15 ++
 server/src/services/DeviceUseCases.ts         |  68 ++++++++
 shared-lib/src/types/api.ts                   |   5 +
 10 files changed, 417 insertions(+), 76 deletions(-)

diff --git a/client/src/components/DeviceConfiguration/CheckDeviceConnection.tsx b/client/src/components/DeviceConfiguration/CheckDeviceConnection.tsx
index 48c6424e..b8a2c7d1 100644
--- a/client/src/components/DeviceConfiguration/CheckDeviceConnection.tsx
+++ b/client/src/components/DeviceConfiguration/CheckDeviceConnection.tsx
@@ -13,12 +13,15 @@ import {
 import { Alert, Popover, Steps, Typography } from 'antd';
 import { motion } from 'framer-motion';
 import React, { useEffect, useRef, useState } from 'react';
-import { API, SsmAnsible } from 'ssm-shared-lib';
+import { API, SsmAgent, SsmAnsible } from 'ssm-shared-lib';
 
 export type CheckDeviceConnectionProps = {
+  installMethod: SsmAgent.InstallMethods;
   execId?: string;
   dockerConnRes?: string;
   dockerConnErrorMessage?: string;
+  rsiConnRes?: string;
+  rsiConnErrorMessage?: string;
 };
 
 const taskInit: TaskStatusTimelineType = {
@@ -34,11 +37,19 @@ const animationVariants = {
 };
 
 const CheckDeviceConnection: React.FC<CheckDeviceConnectionProps> = (props) => {
-  const { execId, dockerConnRes, dockerConnErrorMessage } = props;
+  const {
+    execId,
+    dockerConnRes,
+    dockerConnErrorMessage,
+    rsiConnErrorMessage,
+    rsiConnRes,
+  } = props;
   const timerIdRef = useRef();
   const [isPollingEnabled, setIsPollingEnabled] = useState(false);
   const [playbookStatus, setPlaybookStatus] = useState('running...');
   const [dockerStatus, setDockerStatus] = useState('running...');
+  const [rsiStatus, setRsiStatus] = useState('running...');
+
   const [execRes, setExecRes] = useState(<></>);
   const [smartFailure, setSmartFailure] = useState<
     API.SmartFailure | undefined
@@ -108,6 +119,14 @@ const CheckDeviceConnection: React.FC<CheckDeviceConnectionProps> = (props) => {
     }
   }, [dockerConnRes]);
 
+  useEffect(() => {
+    if (rsiConnRes) {
+      setRsiStatus(rsiConnRes);
+    } else {
+      setRsiStatus('running...');
+    }
+  }, [rsiConnRes]);
+
   useEffect(() => {
     const pollingCallback = () => {
       terminalHandler.pollingCallback(execId || '');
@@ -202,6 +221,38 @@ const CheckDeviceConnection: React.FC<CheckDeviceConnectionProps> = (props) => {
                 <LoadingOutlined />
               ),
           },
+          ...(props.installMethod === SsmAgent.InstallMethods.LESS
+            ? [
+                {
+                  title: 'Remote System Information Connection test',
+                  description: (
+                    <>
+                      {rsiStatus}{' '}
+                      {rsiStatus === 'failed' && (
+                        <Popover
+                          content={
+                            <Typography.Text type="danger">
+                              {rsiConnErrorMessage}
+                            </Typography.Text>
+                          }
+                          title={'Remote System Information Connection Logs'}
+                        >
+                          <InfoCircleFilled />
+                        </Popover>
+                      )}
+                    </>
+                  ),
+                  icon:
+                    rsiStatus === 'successful' ? (
+                      <CheckCircleOutlined />
+                    ) : rsiStatus === 'failed' ? (
+                      <CloseOutlined style={{ color: 'red' }} />
+                    ) : (
+                      <LoadingOutlined />
+                    ),
+                },
+              ]
+            : []),
         ]}
       />
       {smartFailure && (
diff --git a/client/src/components/DeviceConfiguration/diagnostic/ExistingDeviceConnectionTest.tsx b/client/src/components/DeviceConfiguration/diagnostic/ExistingDeviceConnectionTest.tsx
index 71d77aa2..524d52e7 100644
--- a/client/src/components/DeviceConfiguration/diagnostic/ExistingDeviceConnectionTest.tsx
+++ b/client/src/components/DeviceConfiguration/diagnostic/ExistingDeviceConnectionTest.tsx
@@ -3,10 +3,11 @@ import { StreamlineComputerConnection } from '@/components/Icons/CustomIcons';
 import {
   getCheckDeviceAnsibleConnection,
   getCheckDeviceDockerConnection,
+  getCheckDeviceRemoteSystemInformationConnection,
 } from '@/services/rest/device';
 import { Avatar, Button, Card, Col, Row } from 'antd';
 import React, { useState } from 'react';
-import { API } from 'ssm-shared-lib';
+import { API, SsmAgent } from 'ssm-shared-lib';
 
 type ConnectionTestTabProps = {
   device: Partial<API.DeviceItem>;
@@ -21,6 +22,12 @@ const ExistingDeviceConnectionTest: React.FC<ConnectionTestTabProps> = ({
   >();
   const [dockerConnectionErrorMessage, setDockerConnectionErrorMessage] =
     useState<string | undefined>();
+  const [rsiConnectionStatus, setRsiConnectionStatus] = useState<
+    string | undefined
+  >();
+  const [rsiConnectionErrorMessage, setRsiConnectionErrorMessage] = useState<
+    string | undefined
+  >();
   const [testStarted, setTestStarted] = useState(false);
   const asyncFetch = async () => {
     if (!device.uuid) {
@@ -29,6 +36,8 @@ const ExistingDeviceConnectionTest: React.FC<ConnectionTestTabProps> = ({
     setExecId(undefined);
     setDockerConnectionErrorMessage(undefined);
     setDockerConnectionStatus('running...');
+    setRsiConnectionErrorMessage(undefined);
+    setRsiConnectionStatus('running...');
     setTestStarted(true);
     await getCheckDeviceAnsibleConnection(device.uuid).then((e) => {
       setExecId(e.data.taskId);
@@ -37,6 +46,14 @@ const ExistingDeviceConnectionTest: React.FC<ConnectionTestTabProps> = ({
       setDockerConnectionStatus(e.data.connectionStatus);
       setDockerConnectionErrorMessage(e.data.errorMessage);
     });
+    if (device.agentType === SsmAgent.InstallMethods.LESS) {
+      await getCheckDeviceRemoteSystemInformationConnection(device.uuid).then(
+        (e) => {
+          setRsiConnectionStatus(e.data.connectionStatus);
+          setRsiConnectionErrorMessage(e.data.errorMessage);
+        },
+      );
+    }
   };
   return (
     <Card
@@ -69,9 +86,12 @@ const ExistingDeviceConnectionTest: React.FC<ConnectionTestTabProps> = ({
     >
       {testStarted && (
         <CheckDeviceConnection
+          installMethod={device.agentType as SsmAgent.InstallMethods}
           execId={execId}
           dockerConnRes={dockerConnectionStatus}
           dockerConnErrorMessage={dockerConnectionErrorMessage}
+          rsiConnRes={rsiConnectionStatus}
+          rsiConnErrorMessage={rsiConnectionErrorMessage}
         />
       )}
       <Button style={{ marginBottom: 20 }} onClick={asyncFetch}>
diff --git a/client/src/components/NewDeviceModal/NewDeviceModal.tsx b/client/src/components/NewDeviceModal/NewDeviceModal.tsx
index e8bc0daa..87df2e3e 100644
--- a/client/src/components/NewDeviceModal/NewDeviceModal.tsx
+++ b/client/src/components/NewDeviceModal/NewDeviceModal.tsx
@@ -17,6 +17,7 @@ import {
   putDevice,
   postCheckAnsibleConnection,
   postCheckDockerConnection,
+  postCheckRemoteSystemInformationConnection,
 } from '@/services/rest/device';
 import SSHConnectionFormElements from '@/components/DeviceConfiguration/SSHConnectionFormElements';
 import CheckDeviceConnection from '@/components/DeviceConfiguration/CheckDeviceConnection';
@@ -37,12 +38,25 @@ const { useBreakpoint } = Grid;
 
 const NewDeviceModal: React.FC<NewDeviceModalProps> = (props) => {
   const formRef = useRef<ProFormInstance>();
+  const sshFormRef = useRef<ProFormInstance>();
+  const installMethodFormRef = useRef<ProFormInstance>();
   const [loading, setLoading] = useState(false);
   const [sshConnection, setSshConnection] = useState<any>({});
-  const [execId, setExecId] = useState();
-  const [dockerConnectionStatus, setDockerConnectionStatus] = useState();
+  const [execId, setExecId] = useState<string | undefined>();
+  const [dockerConnectionStatus, setDockerConnectionStatus] = useState<
+    string | undefined
+  >();
   const [dockerConnectionErrorMessage, setDockerConnectionErrorMessage] =
-    useState();
+    useState<string | undefined>();
+  const [rsiConnectionStatus, setRsiConnectionStatus] = useState<
+    string | undefined
+  >();
+  const [rsiConnectionErrorMessage, setRsiConnectionErrorMessage] = useState<
+    string | undefined
+  >();
+  const [agentInstallMethod, setAgentInstallMethod] = useState<
+    string | undefined
+  >();
   const screens = useBreakpoint();
 
   const handleCancel = () => {
@@ -79,50 +93,79 @@ const NewDeviceModal: React.FC<NewDeviceModalProps> = (props) => {
     }
   };
 
-  const handleStepChange = (step: number, form?: ProFormInstance) => {
+  const handleStepChange = (step: number) => {
+    const sshFormValues = sshFormRef?.current?.getFieldsValue(true);
+    const installMethodFormValues =
+      installMethodFormRef?.current?.getFieldsValue(true);
     if (step === 0) {
-      const formValues = form?.getFieldsValue(true);
-      setSshConnection(formValues);
+      setSshConnection(sshFormValues);
+    }
+    if (step === 1) {
+      setAgentInstallMethod(installMethodFormValues?.installMethod);
       setDockerConnectionStatus(undefined);
       setDockerConnectionErrorMessage(undefined);
+      setRsiConnectionStatus(undefined);
+      setRsiConnectionErrorMessage(undefined);
       setExecId(undefined);
       postCheckAnsibleConnection(
-        formValues.deviceIp,
+        sshFormValues.deviceIp,
         {
-          authType: formValues.authType,
-          sshPort: formValues.sshPort,
-          sshUser: formValues.sshUser,
-          sshPwd: formValues.sshPwd,
-          sshKey: formValues.sshKey,
+          authType: sshFormValues.authType,
+          sshPort: sshFormValues.sshPort,
+          sshUser: sshFormValues.sshUser,
+          sshPwd: sshFormValues.sshPwd,
+          sshKey: sshFormValues.sshKey,
           sshConnection:
-            formValues.sshConnection ?? SsmAnsible.SSHConnection.PARAMIKO,
-          becomeUser: formValues.becomeUser,
-          becomeMethod: formValues.becomeMethod,
-          becomePass: formValues.becomePass,
-          strictHostChecking: formValues.strictHostChecking ?? true,
+            sshFormValues.sshConnection ?? SsmAnsible.SSHConnection.PARAMIKO,
+          becomeUser: sshFormValues.becomeUser,
+          becomeMethod: sshFormValues.becomeMethod,
+          becomePass: sshFormValues.becomePass,
+          strictHostChecking: sshFormValues.strictHostChecking ?? true,
         },
-        form?.getFieldsValue().controlNodeURL,
+        installMethodFormValues?.controlNodeURL,
       ).then((e) => {
         setExecId(e.data.taskId);
       });
       postCheckDockerConnection(
-        formValues.deviceIp,
+        sshFormValues.deviceIp,
         {
-          authType: formValues.authType,
-          sshPort: formValues.sshPort,
-          sshUser: formValues.sshUser,
-          sshPwd: formValues.sshPwd,
-          sshKey: formValues.sshKey,
-          becomeUser: formValues.becomeUser,
-          becomeMethod: formValues.becomeMethod,
-          becomePass: formValues.becomePass,
-          strictHostChecking: formValues.strictHostChecking ?? true,
+          authType: sshFormValues.authType,
+          sshPort: sshFormValues.sshPort,
+          sshUser: sshFormValues.sshUser,
+          sshPwd: sshFormValues.sshPwd,
+          sshKey: sshFormValues.sshKey,
+          becomeUser: sshFormValues.becomeUser,
+          becomeMethod: sshFormValues.becomeMethod,
+          becomePass: sshFormValues.becomePass,
+          strictHostChecking: sshFormValues.strictHostChecking ?? true,
         },
-        form?.getFieldsValue().controlNodeURL,
+        installMethodFormValues?.controlNodeURL,
       ).then((e) => {
         setDockerConnectionStatus(e.data.connectionStatus);
         setDockerConnectionErrorMessage(e.data.errorMessage);
       });
+      if (
+        installMethodFormValues?.installMethod === SsmAgent.InstallMethods.LESS
+      ) {
+        postCheckRemoteSystemInformationConnection(
+          sshFormValues.deviceIp,
+          {
+            authType: sshFormValues.authType,
+            sshPort: sshFormValues.sshPort,
+            sshUser: sshFormValues.sshUser,
+            sshPwd: sshFormValues.sshPwd,
+            sshKey: sshFormValues.sshKey,
+            becomeUser: sshFormValues.becomeUser,
+            becomeMethod: sshFormValues.becomeMethod,
+            becomePass: sshFormValues.becomePass,
+            strictHostChecking: sshFormValues.strictHostChecking ?? true,
+          },
+          installMethodFormValues?.controlNodeURL,
+        ).then((e) => {
+          setRsiConnectionStatus(e.data.connectionStatus);
+          setRsiConnectionErrorMessage(e.data.errorMessage);
+        });
+      }
     }
   };
 
@@ -166,15 +209,17 @@ const NewDeviceModal: React.FC<NewDeviceModalProps> = (props) => {
               </motion.div>
             )}
             submitter={{
-              render: ({ form, onSubmit, step, onPre }) => [
+              render: ({ onSubmit, step, onPre }) => [
                 step > 0 && (
                   <Button
                     key="pre"
                     onClick={() => {
                       if (step === 1) setSshConnection({});
-                      if (step === 2) {
+                      if (step === 3) {
                         setDockerConnectionStatus(undefined);
                         setDockerConnectionErrorMessage(undefined);
+                        setRsiConnectionStatus(undefined);
+                        setRsiConnectionErrorMessage(undefined);
                         setExecId(undefined);
                       }
                       onPre?.();
@@ -188,7 +233,7 @@ const NewDeviceModal: React.FC<NewDeviceModalProps> = (props) => {
                   loading={loading}
                   type="primary"
                   onClick={() => {
-                    handleStepChange(step, form);
+                    handleStepChange(step);
                     onSubmit?.();
                   }}
                   icon={step < 3 ? undefined : <DownloadOutlined />}
@@ -204,6 +249,7 @@ const NewDeviceModal: React.FC<NewDeviceModalProps> = (props) => {
             }}
           >
             <StepsForm.StepForm
+              formRef={sshFormRef}
               name="base"
               title="SSH"
               style={{
@@ -214,26 +260,7 @@ const NewDeviceModal: React.FC<NewDeviceModalProps> = (props) => {
               <SSHConnectionFormElements formRef={formRef} />
             </StepsForm.StepForm>
             <StepsForm.StepForm
-              name="test"
-              title="Test"
-              style={{
-                alignItems: 'start',
-                maxWidth: screens.xs ? '80%' : '100%',
-              }}
-            >
-              <StepFormCard
-                title="Test connections"
-                icon={<StreamlineComputerConnection />}
-                content={
-                  <CheckDeviceConnection
-                    execId={execId}
-                    dockerConnRes={dockerConnectionStatus}
-                    dockerConnErrorMessage={dockerConnectionErrorMessage}
-                  />
-                }
-              />
-            </StepsForm.StepForm>
-            <StepsForm.StepForm
+              formRef={installMethodFormRef}
               name="installMethod"
               title="Install Method"
               style={{
@@ -281,7 +308,6 @@ const NewDeviceModal: React.FC<NewDeviceModalProps> = (props) => {
                     case SsmAgent.InstallMethods.DOCKER:
                       return (
                         <>
-                          {' '}
                           <ProFormText
                             name={'controlNodeURL'}
                             label={'Control Node URL'}
@@ -309,6 +335,31 @@ const NewDeviceModal: React.FC<NewDeviceModalProps> = (props) => {
                 }}
               </ProFormDependency>
             </StepsForm.StepForm>
+            <StepsForm.StepForm
+              name="test"
+              title="Test"
+              style={{
+                alignItems: 'start',
+                maxWidth: screens.xs ? '80%' : '100%',
+              }}
+            >
+              <StepFormCard
+                title="Test connections"
+                icon={<StreamlineComputerConnection />}
+                content={
+                  <CheckDeviceConnection
+                    installMethod={
+                      agentInstallMethod as SsmAgent.InstallMethods
+                    }
+                    execId={execId}
+                    dockerConnRes={dockerConnectionStatus}
+                    dockerConnErrorMessage={dockerConnectionErrorMessage}
+                    rsiConnRes={rsiConnectionStatus}
+                    rsiConnErrorMessage={rsiConnectionErrorMessage}
+                  />
+                }
+              />
+            </StepsForm.StepForm>
             <StepsForm.StepForm
               name="confirm"
               title="Confirm"
diff --git a/client/src/services/rest/device.ts b/client/src/services/rest/device.ts
index f1693eb1..1e576da0 100644
--- a/client/src/services/rest/device.ts
+++ b/client/src/services/rest/device.ts
@@ -2,6 +2,10 @@
 /* eslint-disable */
 import { request } from '@umijs/max';
 import { API, SsmAgent } from 'ssm-shared-lib';
+import {
+  CheckAnsibleConnection,
+  Response,
+} from 'ssm-shared-lib/distribution/types/api';
 
 export async function getDevices(
   params?: API.PageParams,
@@ -56,11 +60,14 @@ export async function postCheckAnsibleConnection(
   masterNodeUrl?: string,
   options?: { [key: string]: any },
 ) {
-  return request<API.NewDevice>('/api/devices/check-connection/ansible', {
-    data: { ip: ip, masterNodeUrl: masterNodeUrl, ...deviceAuth },
-    method: 'POST',
-    ...(options || {}),
-  });
+  return request<API.Response<API.CheckAnsibleConnection>>(
+    '/api/devices/check-connection/ansible',
+    {
+      data: { ip: ip, masterNodeUrl: masterNodeUrl, ...deviceAuth },
+      method: 'POST',
+      ...(options || {}),
+    },
+  );
 }
 
 export async function postCheckDockerConnection(
@@ -68,18 +75,36 @@ export async function postCheckDockerConnection(
   deviceAuth: API.DeviceAuthParams,
   options?: { [key: string]: any },
 ) {
-  return request<API.NewDevice>('/api/devices/check-connection/docker', {
-    data: { ip: ip, ...deviceAuth },
-    method: 'POST',
-    ...(options || {}),
-  });
+  return request<API.Response<API.CheckDockerConnection>>(
+    '/api/devices/check-connection/docker',
+    {
+      data: { ip: ip, ...deviceAuth },
+      method: 'POST',
+      ...(options || {}),
+    },
+  );
+}
+
+export async function postCheckRemoteSystemInformationConnection(
+  ip: string,
+  deviceAuth: API.DeviceAuthParams,
+  options?: { [key: string]: any },
+) {
+  return request<API.Response<API.CheckRemoteSystemInformationConnection>>(
+    '/api/devices/check-connection/remote-system-information',
+    {
+      data: { ip: ip, ...deviceAuth },
+      method: 'POST',
+      ...(options || {}),
+    },
+  );
 }
 
 export async function deleteDevice(
   uuid: string,
   options?: { [key: string]: any },
 ) {
-  return request<API.SimpleResult>(`/api/devices/${uuid}`, {
+  return request<API.Response<API.SimpleResult>>(`/api/devices/${uuid}`, {
     method: 'DELETE',
     ...(options || {}),
   });
@@ -96,7 +121,7 @@ export async function updateDeviceDockerConfiguration(
   },
   options?: { [key: string]: any },
 ) {
-  return request<API.SimpleResult>(
+  return request<API.Response<API.SimpleResult>>(
     `/api/devices/${uuid}/configuration/containers/docker`,
     {
       method: 'POST',
@@ -113,7 +138,7 @@ export async function updateDeviceSystemInformationConfiguration(
   systemInformationConfiguration: Partial<API.SystemInformationConfiguration>,
   options?: { [key: string]: any },
 ) {
-  return request<API.SimpleResult>(
+  return request<API.Response<API.SimpleResult>>(
     `/api/devices/${uuid}/configuration/system-information`,
     {
       method: 'POST',
@@ -130,7 +155,7 @@ export async function updateDeviceProxmoxConfiguration(
   proxmoxConfiguration: API.ProxmoxConfiguration,
   options?: { [key: string]: any },
 ) {
-  return request<API.SimpleResult>(
+  return request<API.Response<API.SimpleResult>>(
     `/api/devices/${uuid}/configuration/containers/proxmox`,
     {
       method: 'POST',
@@ -144,7 +169,7 @@ export async function getCheckDeviceDockerConnection(
   uuid: string,
   options?: { [key: string]: any },
 ) {
-  return request<API.SimpleResult>(
+  return request<API.Response<API.CheckDockerConnection>>(
     `/api/devices/${uuid}/auth/docker/test-connection`,
     {
       method: 'GET',
@@ -157,7 +182,7 @@ export async function getCheckDeviceAnsibleConnection(
   uuid: string,
   options?: { [key: string]: any },
 ) {
-  return request<API.SimpleResult>(
+  return request<API.Response<API.CheckAnsibleConnection>>(
     `/api/devices/${uuid}/auth/ansible/test-connection`,
     {
       method: 'GET',
@@ -166,6 +191,19 @@ export async function getCheckDeviceAnsibleConnection(
   );
 }
 
+export async function getCheckDeviceRemoteSystemInformationConnection(
+  uuid: string,
+  options?: { [key: string]: any },
+) {
+  return request<API.Response<API.CheckRemoteSystemInformationConnection>>(
+    `/api/devices/${uuid}/auth/remote-system-information/test-connection`,
+    {
+      method: 'GET',
+      ...(options || {}),
+    },
+  );
+}
+
 export async function updateAgentInstallMethod(
   uuid: string,
   installMethod: SsmAgent.InstallMethods,
@@ -187,10 +225,13 @@ export async function postDeviceDiagnostic(
   uuid: string,
   options?: { [key: string]: any },
 ) {
-  return request<API.SimpleResult>(`/api/devices/${uuid}/auth/diagnostic`, {
-    method: 'POST',
-    ...(options || {}),
-  });
+  return request<API.Response<API.SimpleResult>>(
+    `/api/devices/${uuid}/auth/diagnostic`,
+    {
+      method: 'POST',
+      ...(options || {}),
+    },
+  );
 }
 
 export async function postDeviceCapabilities(
diff --git a/server/src/controllers/rest/devices/check-connection.ts b/server/src/controllers/rest/devices/check-connection.ts
index f535cd6d..dcb8c411 100644
--- a/server/src/controllers/rest/devices/check-connection.ts
+++ b/server/src/controllers/rest/devices/check-connection.ts
@@ -1,4 +1,5 @@
 import { API } from 'ssm-shared-lib';
+import { CheckRemoteSystemInformationConnection } from 'ssm-shared-lib/distribution/types/api';
 import DeviceAuthRepo from '../../../data/database/repository/DeviceAuthRepo';
 import DeviceRepo from '../../../data/database/repository/DeviceRepo';
 import { preWriteSensitiveInfos } from '../../../helpers/sensitive/handle-sensitive-info';
@@ -75,6 +76,33 @@ export const postCheckDockerConnection = async (req, res) => {
   }
 };
 
+export const postCheckRemoteSystemInformationConnection = async (req, res) => {
+  const { ip, authType, sshKey, sshUser, sshPwd, sshPort, becomeMethod, becomePass, sshKeyPass } =
+    req.body;
+  if (!req.user) {
+    throw new ForbiddenError();
+  }
+  const result = await DeviceUseCases.checkDockerConnection(
+    ip,
+    authType,
+    sshKey,
+    sshUser,
+    sshPwd,
+    sshPort,
+    becomeMethod,
+    becomePass,
+    sshKeyPass,
+  );
+  try {
+    new SuccessResponse('Post CheckRemoteSystemInformationConnection', {
+      connectionStatus: result.status,
+      errorMessage: result.message,
+    } as API.CheckRemoteSystemInformationConnection).send(res);
+  } catch (error: any) {
+    throw new InternalError(error.message);
+  }
+};
+
 export const getCheckDeviceDockerConnection = async (req, res) => {
   const { uuid } = req.params;
   const device = await DeviceRepo.findOneByUuid(uuid);
@@ -96,6 +124,30 @@ export const getCheckDeviceDockerConnection = async (req, res) => {
   }
 };
 
+export const getCheckDeviceRemoteSystemInformationConnection = async (req, res) => {
+  const { uuid } = req.params;
+  const device = await DeviceRepo.findOneByUuid(uuid);
+  if (!device) {
+    throw new NotFoundError('Device ID not found');
+  }
+  const deviceAuth = await DeviceAuthRepo.findOneByDevice(device);
+  if (!deviceAuth) {
+    throw new NotFoundError('Device Auth not found');
+  }
+  try {
+    const result = await DeviceUseCases.checkDeviceRemoteSystemInformationConnection(
+      device,
+      deviceAuth,
+    );
+    new SuccessResponse('Post getCheckDeviceRemoteSystemInformationConnection', {
+      connectionStatus: result.status,
+      errorMessage: result.message,
+    } as API.CheckDockerConnection).send(res);
+  } catch (error: any) {
+    throw new InternalError(error.message);
+  }
+};
+
 export const getCheckDeviceAnsibleConnection = async (req, res) => {
   const { uuid } = req.params;
   const device = await DeviceRepo.findOneByUuid(uuid);
diff --git a/server/src/controllers/rest/devices/check-connection.validator.ts b/server/src/controllers/rest/devices/check-connection.validator.ts
index c0b79d08..8beadfbe 100644
--- a/server/src/controllers/rest/devices/check-connection.validator.ts
+++ b/server/src/controllers/rest/devices/check-connection.validator.ts
@@ -96,6 +96,16 @@ export const getCheckDeviceDockerConnectionValidator = [
   validator,
 ];
 
+export const getCheckDeviceRemoteSystemInformationConnectionValidator = [
+  param('uuid')
+    .exists()
+    .notEmpty()
+    .withMessage('Uuid is required')
+    .isUUID()
+    .withMessage('Uuid is not valid'),
+  validator,
+];
+
 export const getCheckDeviceAnsibleConnectionValidator = [
   param('uuid')
     .exists()
diff --git a/server/src/modules/remote-system-information/core/RemoteSSHExecutorComponent.ts b/server/src/modules/remote-system-information/core/RemoteSSHExecutorComponent.ts
index f8b75402..c7e883bb 100644
--- a/server/src/modules/remote-system-information/core/RemoteSSHExecutorComponent.ts
+++ b/server/src/modules/remote-system-information/core/RemoteSSHExecutorComponent.ts
@@ -209,6 +209,34 @@ export default class RemoteSSHExecutorComponent extends Component {
     });
   }
 
+  public static async testConnection(config: ConnectConfig): Promise<void> {
+    return new Promise((resolve, reject) => {
+      const conn = new Client();
+      conn
+        .on('ready', () => {
+          conn.exec('echo', (err, stream) => {
+            if (err) {
+              conn.end(); // Close the connection after the test succeeds
+              reject(err);
+            }
+            stream.on('exit', (code: number, signal: any) => {
+              if (code === 0) {
+                conn.end(); // Close the connection after the test succeeds
+                resolve();
+              } else {
+                conn.end(); // Close the connection after the test succeeds
+                reject(new Error(`Connection failed with code ${code}, signal: ${signal}`));
+              }
+            });
+          });
+        })
+        .on('error', (err) => {
+          reject(err); // Return the error if connection fails
+        })
+        .connect(config); // Connect using provided configuration
+    });
+  }
+
   // Reconnection logic
   private async reconnect(retryAttempt = 0): Promise<void> {
     // If already reconnecting, return the existing promise
diff --git a/server/src/routes/devices.ts b/server/src/routes/devices.ts
index c254ae7c..32550459 100644
--- a/server/src/routes/devices.ts
+++ b/server/src/routes/devices.ts
@@ -6,14 +6,17 @@ import {
   getCheckDeviceAnsibleConnection,
   getCheckDeviceDockerConnection,
   getCheckDeviceProxmoxConnection,
+  getCheckDeviceRemoteSystemInformationConnection,
   postCheckAnsibleConnection,
   postCheckDockerConnection,
+  postCheckRemoteSystemInformationConnection,
   postDiagnostic,
 } from '../controllers/rest/devices/check-connection';
 import {
   getCheckDeviceAnsibleConnectionValidator,
   getCheckDeviceDockerConnectionValidator,
   getCheckDeviceProxmoxConnectionValidator,
+  getCheckDeviceRemoteSystemInformationConnectionValidator,
   postCheckAnsibleConnectionValidator,
   postCheckDockerConnectionValidator,
   postDiagnosticValidator,
@@ -93,6 +96,11 @@ router.post(
   postCheckDockerConnectionValidator,
   postCheckDockerConnection,
 );
+router.post(
+  '/check-connection/remote-system-information',
+  postCheckDockerConnectionValidator,
+  postCheckRemoteSystemInformationConnection,
+);
 
 router.get(`/dashboard/stats/performances`, getDashboardPerformanceStats);
 router.post(
@@ -141,6 +149,13 @@ router
 router
   .route('/:uuid/auth/proxmox/test-connection')
   .post(getCheckDeviceProxmoxConnectionValidator, getCheckDeviceProxmoxConnection);
+router
+  .route('/:uuid/auth/remote-system-information/test-connection')
+  .get(
+    getCheckDeviceRemoteSystemInformationConnectionValidator,
+    getCheckDeviceRemoteSystemInformationConnection,
+  );
+
 router.post('/:uuid/auth/diagnostic', postDiagnosticValidator, postDiagnostic);
 
 router.route('/').put(addDeviceValidator, addDevice).get(getDevices);
diff --git a/server/src/services/DeviceUseCases.ts b/server/src/services/DeviceUseCases.ts
index 507c40fb..bb0a1587 100644
--- a/server/src/services/DeviceUseCases.ts
+++ b/server/src/services/DeviceUseCases.ts
@@ -15,12 +15,14 @@ import DeviceRepo from '../data/database/repository/DeviceRepo';
 import DeviceStatRepo from '../data/database/repository/DeviceStatRepo';
 import PlaybookRepo from '../data/database/repository/PlaybookRepo';
 import ProxmoxContainerRepo from '../data/database/repository/ProxmoxContainerRepo';
+import SSHCredentialsHelper from '../helpers/ssh/SSHCredentialsHelper';
 import PinoLogger from '../logger';
 import { InternalError } from '../middlewares/api/ApiError';
 import { DEFAULT_VAULT_ID, vaultEncrypt } from '../modules/ansible-vault/ansible-vault';
 import Inventory from '../modules/ansible/utils/InventoryTransformer';
 import WatcherEngine from '../modules/containers/core/WatcherEngine';
 import Docker from '../modules/containers/watchers/providers/docker/Docker';
+import RemoteSystemInformationWatcher from '../modules/remote-system-information/watchers/RemoteSystemInformationWatcher';
 import PlaybookUseCases from './PlaybookUseCases';
 
 const logger = PinoLogger.child({ module: 'DeviceUseCases' }, { msgPrefix: '[DEVICE] - ' });
@@ -251,6 +253,52 @@ async function checkDockerConnection(
   }
 }
 
+async function checkRemoteSystemInformationConnection(
+  ip?: string,
+  authType?: SsmAnsible.SSHType,
+  sshKey?: string,
+  sshUser?: string,
+  sshPwd?: string,
+  sshPort?: number,
+  becomeMethod?: SsmAnsible.AnsibleBecomeMethod,
+  becomePass?: string,
+  sshKeyPass?: string,
+) {
+  try {
+    const mockedDeviceAuth = {
+      device: {
+        _id: 'tmp',
+        ip,
+        uuid: 'tmp',
+        status: SsmStatus.DeviceStatus.REGISTERING,
+        capabilities: { containers: {} },
+        systemInformation: {},
+        configuration: { containers: {}, systemInformation: {} },
+      },
+      authType,
+      sshKey: sshKey ? await vaultEncrypt(sshKey, DEFAULT_VAULT_ID) : undefined,
+      sshUser,
+      sshPwd: sshPwd ? await vaultEncrypt(sshPwd, DEFAULT_VAULT_ID) : undefined,
+      sshPort: sshPort || 22,
+      becomeMethod,
+      becomePass: becomePass ? await vaultEncrypt(becomePass, DEFAULT_VAULT_ID) : undefined,
+      sshKeyPass: sshKeyPass ? await vaultEncrypt(sshKeyPass, DEFAULT_VAULT_ID) : undefined,
+    };
+    await RemoteSystemInformationWatcher.testConnection(
+      await SSHCredentialsHelper.getSShConnection(mockedDeviceAuth.device, mockedDeviceAuth),
+    );
+
+    return {
+      status: 'successful',
+    };
+  } catch (error: any) {
+    return {
+      status: 'failed',
+      message: error.message,
+    };
+  }
+}
+
 async function checkDeviceDockerConnection(device: Device, deviceAuth: DeviceAuth) {
   try {
     await Docker.testDockerConnection(device, deviceAuth);
@@ -266,6 +314,25 @@ async function checkDeviceDockerConnection(device: Device, deviceAuth: DeviceAut
   }
 }
 
+async function checkDeviceRemoteSystemInformationConnection(
+  device: Device,
+  deviceAuth: DeviceAuth,
+) {
+  try {
+    const connection = await SSHCredentialsHelper.getSShConnection(device, deviceAuth);
+    await RemoteSystemInformationWatcher.testConnection(connection);
+    return {
+      status: 'successful',
+    };
+  } catch (error: any) {
+    logger.error(error);
+    return {
+      status: 'failed',
+      message: error.message,
+    };
+  }
+}
+
 async function checkDeviceAnsibleConnection(user: User, device: Device) {
   const playbook = await PlaybookRepo.findOneByUniqueQuickReference('checkDeviceBeforeAdd');
   if (!playbook) {
@@ -290,4 +357,5 @@ export default {
   checkDeviceAnsibleConnection,
   getProxmoxDevicesToWatch,
   getRemoteSysInfoDevicesToWatch,
+  checkDeviceRemoteSystemInformationConnection,
 };
diff --git a/shared-lib/src/types/api.ts b/shared-lib/src/types/api.ts
index f14e7eaa..66a92b5e 100644
--- a/shared-lib/src/types/api.ts
+++ b/shared-lib/src/types/api.ts
@@ -166,6 +166,11 @@ export type CheckDockerConnection = {
   errorMessage?: string;
 }
 
+export type CheckRemoteSystemInformationConnection = {
+  connectionStatus: string;
+  errorMessage?: string;
+}
+
 export type DeviceCapabilities = {
   containers: {
     docker: {