Bugfix/10.4/621 the system lets you remove the last integration tenant without disabling the integration (#651)

mjabascal10 · Kbayero · c3s4rfred · web-flow · commit 762826f74b18 · 2024-05-21T20:21:07.000+03:00
* Improvement integrations component * Refactor guides generation process . * Refactor guides generation process . * Refactor guides generation process . * Add fortiweb filter * Added new integrations(). * Update pfsense_fw.conf Updating pfsense filter * Update ibm_aix.conf Updating aix filter * Update fortiweb.conf Updating fortiweb filter * Update netflow.conf Updating netflow filter * Added pfsense changeset * Add pfsense changeset * Add pfsense changeset * Added confirmation for disabling the log collector action. * Added pfsense changeset * Added netflow changeset * Added netflow changeset * Added netflow changeset * Added aix changeset * Refactor changesets * Disabled modules UFW and LINUX_LOGS * Fixed integration bugs * Disabled modules UFW and LINUX_LOGS * Adding modules to log-firewall-* index-pattern * Update README.md * Migrate agent configurations * Update UTMStack Version * Update UTMStack Agent Version * Fixed the Enable Integration button for Syslog * Added theadWinds menu * Added theadWinds menu * Added theadWinds menu * Added theadWinds menu * Added theadWinds menu * Added theadWinds menu * Fixed menu url validation * Added theadWinds logo * Set timeout to mailSender bean * Set timeout to mailSender bean * Added shm-size param to selenium * Added shm-size param to selenium * Fixing selenium service * Trigger web-pdf workflow * Updating installer shm volume * Updating dockerfile comment * Set timeout to mailSender bean * Remove tls syslog servers * Validate UTF8 messages and create buffer for syslog messages * Close syslog connections * Accept multiple connections in syslog servers * Refactor threat intelligence component * Removed SSL protocol * Fixed Data Parsing processed events is not matching between outside and inside component (#622) * Set threat winds changeset * Fix ibm aix id * Updated pfsense filter * Fixed The system lets you remove the last integration tenant without disabling the integration (#621) * Fixed Validation for character-limited fields (#644) * Fixed Index-Pattern search continues displaying information despite no results found(#645) * Updated module category for aix and pfsense integration * Fixed the space problem between the iframe and the header. * Updated module category for aix and pfsense integration * Fixed Index-Pattern search continues displaying information despite no results found (#645) --------- Co-authored-by: Yorjander Hernandez Vergara <yorjaKbayero@gmail.com> Co-authored-by: Freddy R. Laffita Almaguer <c3s4rfred@gmail.com>
diff --git a/backend/src/main/resources/config/liquibase/changelog/20240424001_updating_category_aix_fortiweb.xml b/backend/src/main/resources/config/liquibase/changelog/20240424001_updating_category_aix_fortiweb.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+
+    <changeSet id="20240424001" author="Manuel">
+
+        <sql dbms="postgresql" splitStatements="true" stripComments="true">
+            <![CDATA[
+
+                    UPDATE utm_module
+                    SET module_category = 'Device'
+                    WHERE module_name IN ('FORTIWEB', 'AIX');
+
+            ]]>
+        </sql>
+    </changeSet>
+</databaseChangeLog>
diff --git a/backend/src/main/resources/config/liquibase/master.xml b/backend/src/main/resources/config/liquibase/master.xml
@@ -59,5 +59,7 @@
 
     <include file="/config/liquibase/changelog/20240419001_updating_pfsense_filter.xml" relativeToChangelogFile="false"/>
 
+    <include file="/config/liquibase/changelog/20240424001_updating_category_aix_fortiweb.xml" relativeToChangelogFile="false"/>
+
 
 </databaseChangeLog>
diff --git a/frontend/src/app/app-module/conf/int-generic-group-config/int-generic-group-config.component.ts b/frontend/src/app/app-module/conf/int-generic-group-config/int-generic-group-config.component.ts
@@ -3,6 +3,7 @@ import {ModalService} from '../../../core/modal/modal.service';
 import {UtmToastService} from '../../../shared/alert/utm-toast.service';
 import {ModalConfirmationComponent} from '../../../shared/components/utm/util/modal-confirmation/modal-confirmation.component';
 import {EncryptService} from '../../../shared/services/util/encrypt.service';
+import {ModuleChangeStatusBehavior} from '../../shared/behavior/module-change-status.behavior';
 import {IntCreateGroupComponent} from '../../shared/components/int-create-group/int-create-group.component';
 import {UtmModuleGroupConfService} from '../../shared/services/utm-module-group-conf.service';
 import {UtmModuleGroupService} from '../../shared/services/utm-module-group.service';
@@ -30,7 +31,8 @@ export class IntGenericGroupConfigComponent implements OnInit {
               private toast: UtmToastService,
               private encryptService: EncryptService,
               private utmModuleGroupConfService: UtmModuleGroupConfService,
-              private modalService: ModalService) {
+              private modalService: ModalService,
+              private moduleChangeStatusBehavior: ModuleChangeStatusBehavior) {
   }
 
   ngOnInit() {
@@ -66,8 +68,10 @@ export class IntGenericGroupConfigComponent implements OnInit {
   deleteGroup(group: UtmModuleGroupType) {
     const deleteModal = this.modalService.open(ModalConfirmationComponent, {centered: true});
     deleteModal.componentInstance.header = 'Delete tenant';
-    deleteModal.componentInstance.message = 'By deleting ' + group.groupName + ' tenant UTMStack no longer receive' +
-      ' logs from this source.' + ' Are you sure that you want to delete this tenant?';
+    deleteModal.componentInstance.message = 'By deleting ' + group.groupName + ' tenant, UTMStack will no longer receive logs from this source.' +
+        (this.groups.length === 1 ? ' Since this is the only tenant, the module associated with it will be deactivated.' : '') +
+        ' Are you sure that you want to delete this tenant?';
+
     deleteModal.componentInstance.confirmBtnText = 'Delete';
     deleteModal.componentInstance.confirmBtnIcon = 'icon-stack-cancel';
     deleteModal.componentInstance.confirmBtnType = 'delete';
@@ -78,7 +82,11 @@ export class IntGenericGroupConfigComponent implements OnInit {
 
   deleteAction(group: UtmModuleGroupType) {
     this.utmModuleGroupService.delete(group.id).subscribe(response => {
-      this.toast.showSuccessBottom('Tenant group saved successfully');
+      if (this.groups.length === 1) {
+        this.moduleChangeStatusBehavior.setStatus(false);
+      } else {
+        this.toast.showSuccessBottom('Tenant group deleted successfully');
+      }
       this.getGroups();
     }, error => {
       this.toast.showError('Error deleting tenant',
@@ -92,6 +100,7 @@ export class IntGenericGroupConfigComponent implements OnInit {
       this.savingConfig = false;
       this.pendingChanges = false;
       this.changes = {keys: [], moduleId: this.moduleId};
+      this.configValidChange.emit(this.tenantGroupConfigValid());
       this.toast.showSuccessBottom('Configuration saved successfully');
     }, () => {
       this.toast.showError('Error saving configuration',
@@ -112,7 +121,7 @@ export class IntGenericGroupConfigComponent implements OnInit {
       required = group.moduleGroupConfigurations.filter(value => value.confRequired === true);
       valid = required.filter(value => value.confValue !== null && value.confValue);
     });
-    return valid.length === required.length;
+    return this.groups.length > 0 && valid.length === required.length;
   }
 
   checkConfigValue(config: string): boolean {
@@ -127,7 +136,7 @@ export class IntGenericGroupConfigComponent implements OnInit {
     } else {
       this.changes.keys[index].confValue = integrationConfig.confValue;
     }
-    this.configValidChange.emit(this.tenantGroupConfigValid());
+    // this.configValidChange.emit(this.tenantGroupConfigValid());
   }
 
   cancelConfig(group: UtmModuleGroupType) {
diff --git a/frontend/src/app/app-module/shared/behavior/module-change-status.behavior.ts b/frontend/src/app/app-module/shared/behavior/module-change-status.behavior.ts
@@ -0,0 +1,12 @@
+import {Inject, Injectable} from '@angular/core';
+import {BehaviorSubject, Observable} from 'rxjs';
+
+@Injectable({providedIn: 'root'})
+export class ModuleChangeStatusBehavior {
+  private $moduleChangeStatusBehavior = new BehaviorSubject<boolean>(null);
+  public moduleStatus$: Observable<boolean> = this.$moduleChangeStatusBehavior.asObservable();
+
+  setStatus(status: boolean) {
+    this.$moduleChangeStatusBehavior.next(status);
+  }
+}
diff --git a/frontend/src/app/app-module/shared/components/app-module-activate-button/app-module-activate-button.component.ts b/frontend/src/app/app-module/shared/components/app-module-activate-button/app-module-activate-button.component.ts
@@ -1,7 +1,10 @@
-import {Component, Input, OnInit} from '@angular/core';
+import {Component, Input, OnDestroy, OnInit} from '@angular/core';
 import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
+import {Subject} from 'rxjs';
+import {takeUntil, filter} from 'rxjs/operators';
 import {UtmToastService} from '../../../../shared/alert/utm-toast.service';
 import {NavBehavior} from '../../../../shared/behaviors/nav.behavior';
+import {ModuleChangeStatusBehavior} from '../../behavior/module-change-status.behavior';
 import {ModuleRefreshBehavior} from '../../behavior/module-refresh.behavior';
 import {UtmModulesEnum} from '../../enum/utm-module.enum';
 import {UtmModulesService} from '../../services/utm-modules.service';
@@ -14,7 +17,7 @@ import {AppModuleDeactivateComponent} from '../app-module-deactivate/app-module-
   templateUrl: './app-module-activate-button.component.html',
   styleUrls: ['./app-module-activate-button.component.css']
 })
-export class AppModuleActivateButtonComponent implements OnInit {
+export class AppModuleActivateButtonComponent implements OnInit, OnDestroy {
   @Input() module: UtmModulesEnum;
   @Input() type: string;
   @Input() disabled = false;
@@ -23,15 +26,21 @@ export class AppModuleActivateButtonComponent implements OnInit {
   moduleDetail: UtmModuleType;
   changingStatus: any;
   activatable: boolean;
+  destroy$: Subject<void> = new Subject<void>();
 
   constructor(private utmModulesService: UtmModulesService,
               public modalService: NgbModal,
               private toastService: UtmToastService,
               private moduleRefreshBehavior: ModuleRefreshBehavior,
-              private navBehavior: NavBehavior) {
+              private navBehavior: NavBehavior,
+              private moduleChangeStatusBehavior: ModuleChangeStatusBehavior) {
   }
 
   ngOnInit() {
+    this.moduleChangeStatusBehavior.moduleStatus$
+        .pipe(filter(value => value !== null),
+              takeUntil(this.destroy$))
+        .subscribe( value => this.changeModuleStatus(value));
     this.getModuleDetail(this.module);
   }
 
@@ -78,4 +87,9 @@ export class AppModuleActivateButtonComponent implements OnInit {
       });
   }
 
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
 }
diff --git a/frontend/src/app/incident-response/shared/component/ir-create-rule/ir-create-rule.component.html b/frontend/src/app/incident-response/shared/component/ir-create-rule/ir-create-rule.component.html
@@ -88,8 +88,9 @@
       </div>
       <div class="form-group">
         <label class="pb-1" for="description">Description
-          ({{ 512 - formRule.get('description').value.length }})</label>
+          ({{ maxLength - formRule.get('description').value.length }})</label>
         <textarea [ngClass]="inputClass.resolveClassInput(formRule.get('description'))"
+                  [maxLength]="maxLength"
                   class="border-1 border-grey-600 form-control" formControlName="description"
                   id="description"
                   name=""
diff --git a/frontend/src/app/incident-response/shared/component/ir-create-rule/ir-create-rule.component.ts b/frontend/src/app/incident-response/shared/component/ir-create-rule/ir-create-rule.component.ts
@@ -38,6 +38,7 @@ export class IrCreateRuleComponent implements OnInit {
   typing = true;
   rulePrefix: string = createElementPrefix(PrefixElementEnum.INCIDENT_RESPONSE_AUTOMATION);
   valuesMap: Map<string, string[]> = new Map();
+  maxLength = 512;
 
   constructor(private incidentResponseRuleService: IncidentResponseRuleService,
               public activeModal: NgbActiveModal,
diff --git a/frontend/src/app/shared/components/utm/index-pattern/index-pattern-create/index-pattern-create.component.ts b/frontend/src/app/shared/components/utm/index-pattern/index-pattern-create/index-pattern-create.component.ts
@@ -179,7 +179,9 @@ export class IndexPatternCreateComponent implements OnInit {
   }
 
   private onError(error) {
-    // this.alertService.error(error.error, error.message, null);
+    this.totalItems = 0;
+    this.indexes = [];
+    this.loading = false;
   }
 
 }
diff --git a/frontend/src/app/threatwind/threatwind.component.css b/frontend/src/app/threatwind/threatwind.component.css
@@ -1,3 +1,13 @@
 .bg-dark{
   background-color: black!important;
 }
+
+.utm-navbar-secondary {
+  height: 50px!important;
+}
+
+.iframe-position {
+  position: absolute;
+  width: 100%;
+  top: -5px;
+}
diff --git a/frontend/src/app/threatwind/threatwind.component.html b/frontend/src/app/threatwind/threatwind.component.html
@@ -1,5 +1,5 @@
-<div class="bg-dark">
-  <iframe style="height: 89vh" [src]="iframeSrc | safe:'resourceUrl'" width="100%"></iframe>
+<div class="bg-dark iframe-position">
+  <iframe style="height: 89.4vh" [src]="iframeSrc | safe:'resourceUrl'" width="100%"></iframe>
 </div>
 
 

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,9 @@ export class IndexPatternCreateComponent implements OnInit {`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`private onError(error) {`
`182`		`- // this.alertService.error(error.error, error.message, null);`
	`182`	`+ this.totalItems = 0;`
	`183`	`+ this.indexes = [];`
	`184`	`+ this.loading = false;`
`183`	`185`	`}`
`184`	`186`
`185`	`187`	`}`