feat: add tls connection options and setup steps for syslog integrations

Signed-off-by: Manuel Abascal <mjabascal10@gmail.com>

Author: mjabascal10

frontend/src/app/app-module/guides/shared/components/log-collector.component.ts

@@ -3,9 +3,9 @@ import {ModalService} from '../../../../core/modal/modal.service';
 import {
   ModalConfirmationComponent
 } from '../../../../shared/components/utm/util/modal-confirmation/modal-confirmation.component';
-import {replaceCommandTokens} from "../../../../shared/util/replace-command-tokens.util";
+import {replaceCommandTokens} from '../../../../shared/util/replace-command-tokens.util';
 import {UtmModulesEnum} from '../../../shared/enum/utm-module.enum';
-import {PLATFORMS} from "../constant";
+import {PLATFORMS} from '../constant';
 
 @Component({
   selector: 'app-log-colletor',
@@ -78,13 +78,15 @@ export class LogCollectorComponent {
     const protocol = this.selectedProtocol && this.selectedProtocol.name === 'TCP/TLS' ? 'tcp' : this.selectedProtocol.name.toLowerCase();
 
     const command = replaceCommandTokens(this.selectedPlatform.command, {
-        PROTOCOL: protocol,
-        AGENT_NAME: this.agentName(),
         ACTION: this.selectedAction && this.selectedAction.action || '',
-        TLS: this.selectedProtocol && this.selectedProtocol.name === 'TCP/TLS' ? ' --tls' : ''
+        AGENT_NAME: this.agentName(),
+        PROTOCOL: protocol,
+        TLS: this.selectedProtocol && this.selectedProtocol.name === 'TCP/TLS' &&
+          this.selectedAction.name === 'ENABLE' ? `--tls` : ''
       });
 
-    if (this.selectedProtocol && this.selectedProtocol.name === 'TCP/TLS') {
+    if (this.selectedProtocol && this.selectedProtocol.name === 'TCP/TLS' &&
+      this.selectedAction.name === 'ENABLE') {
       const extras = this.selectedPlatform.extraCommands ? this.selectedPlatform.extraCommands : [];
       return [...extras, command];
     }
@@ -179,14 +181,6 @@ export class LogCollectorComponent {
     }
   }
 
-  replaceAll(command, wordsToReplace) {
-    return Object.keys(wordsToReplace).reduce(
-      (f, s, i) =>
-        `${f}`.replace(new RegExp(s, 'ig'), wordsToReplace[s]),
-      command
-    );
-  }
-
   onChangeAction(action: any) {
     if (this.selectedPlatform && this.selectedProtocol && action.name === 'DISABLE') {
       this.openModal();

frontend/src/app/app-module/guides/shared/constant.ts

@@ -97,8 +97,8 @@ export const createFileBeatsPlatforms = (
 ];
 
 export const PLATFORMS = createPlatforms(
-  'Start-Process "C:\\Program Files\\UTMStack\\UTMStack Agent\\utmstack_agent_service.exe" -ArgumentList \'ACTION\', \'AGENT_NAME\', \'PROTOCOL\' TLS -NoNewWindow -Wait\n',
-  'Start-Process "C:\\Program Files\\UTMStack\\UTMStack Agent\\utmstack_agent_service_arm64.exe" -ArgumentList \'ACTION\', \'AGENT_NAME\', \'PROTOCOL\' TLS -NoNewWindow -Wait\n',
+  'Start-Process "C:\\Program Files\\UTMStack\\UTMStack Agent\\utmstack_agent_service.exe" -ArgumentList \'ACTION\', \'AGENT_NAME\', \'PROTOCOL\', \'TLS\' -NoNewWindow -Wait\n',
+  'Start-Process "C:\\Program Files\\UTMStack\\UTMStack Agent\\utmstack_agent_service_arm64.exe" -ArgumentList \'ACTION\', \'AGENT_NAME\', \'PROTOCOL\, \'TLS\' -NoNewWindow -Wait\n',
   'sudo bash -c "/opt/utmstack-linux-agent/utmstack_agent_service ACTION AGENT_NAME PROTOCOL TLS"'
 );
 

frontend/src/app/shared/util/replace-command-tokens.util.ts

@@ -1,20 +1,31 @@
-/*export function replaceCommandTokens(command: string, wordsToReplace: { [key: string]: string }) {
-  return Object.keys(wordsToReplace)
-    .reduce((f, s) => f.replace(new RegExp(s, 'ig'), wordsToReplace[s]), command);
-}*/
-
-export function replaceCommandTokens(command: string, wordsToReplace: { [key: string]: string }) {
+export function replaceCommandTokens(command: string, wordsToReplace: { [key: string]: string }): string {
   let cmd = command;
 
-  Object.entries(wordsToReplace).forEach(([key, value]) => {
-    if (!value) {
-      const regex = new RegExp(`\\s*${key}\\b`, 'g');
-      cmd = cmd.replace(regex, '');
-    } else {
-      const regex = new RegExp(`${key}\\b`, 'g');
-      cmd = cmd.replace(regex, value);
+  if (cmd.includes('-ArgumentList')) {
+
+    const args = Object.values(wordsToReplace)
+      .filter(v => v && v.trim().length > 0)
+      .map(v => `'${v.trim()}'`)
+      .join(', ');
+
+    cmd = cmd.replace(
+      /-ArgumentList\s+(['"].*?['"])(?=\s+-|$)/,
+      `-ArgumentList ${args}`
+    );
+  } else {
+    const match = cmd.match(/"(.*)"/);
+    if (match) {
+      const original = match[1];
+      const parts = original.split(/\s+/);
+      const fixedCommand = parts[0];
+      const args = Object.entries(wordsToReplace)
+        .filter(([_, v]) => v && v.trim().length > 0)
+        .map(([_, v]) => v.trim())
+        .join(' ');
+
+      cmd = cmd.replace(/"(.*)"/, `"${fixedCommand} ${args}"`);
     }
-  });
+  }
 
   cmd = cmd.replace(/\s+/g, ' ').trim();