From 578efe4c4f58ad9f7699d2d8127594fe0e2d3a0c Mon Sep 17 00:00:00 2001
From: Manuel Abascal <mjabascal10@gmail.com>
Date: Fri, 5 Jan 2024 22:33:23 +0200
Subject: [PATCH 1/3] Bugfix/frontend/202 unable to remove groups in the
 datasources view (#213)

* Fix: Unable to remove groups in the datasource's view (#202)

* Fix: Incorrect result on create index pattern table (#180)

* Fix: Unable to remove a group for a datasource (#202)

* Fix: The group modal for a source doesn't close when choosing the 'New Group' action (#231)

* Fix: The group modal for a source doesn't close when choosing the 'New Group' action (#231)

* Fix: The group modal for a source doesn't close when choosing the 'New Group' action (#231)
---
 .../asset-group-add.component.html            | 16 +++++++-----
 .../asset-group-add.component.ts              | 25 ++++++++++++++++---
 frontend/src/styles.scss                      |  6 +++++
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/frontend/src/app/assets-discover/shared/components/asset-group-add/asset-group-add.component.html b/frontend/src/app/assets-discover/shared/components/asset-group-add/asset-group-add.component.html
index fda3395bf..24af3e7fe 100644
--- a/frontend/src/app/assets-discover/shared/components/asset-group-add/asset-group-add.component.html
+++ b/frontend/src/app/assets-discover/shared/components/asset-group-add/asset-group-add.component.html
@@ -1,4 +1,4 @@
-<button #tagPopober=ngbPopover *ngIf="typeFormat==='button';else icon"
+<button #tagPopoverButton=ngbPopover *ngIf="typeFormat==='button';else icon"
         [ngbPopover]="colContent"
         [popoverTitle]="colTitle"
         autoClose="outside"
@@ -6,7 +6,7 @@
         container="body"
         id="statusId"
         placement="auto"
-        popoverClass="utm-popover"
+        popoverClass="utm-popover popover-group"
         triggers="click">
   <span>
     <i *ngIf="creating" class="icon-spinner2 spinner"></i>
@@ -18,7 +18,7 @@
        container="body"
        placement="auto"
        tooltipClass="utm-tooltip-top">
-    <span #tagPopober=ngbPopover
+    <span #tagPopoverSpan=ngbPopover
           (click)="getGroups($event)"
           [ngClass]="{'text-blue-800':group}"
           [ngbPopover]="colContent"
@@ -27,7 +27,7 @@
           class="position-relative cursor-pointer small-md-icon"
           container="body"
           placement="auto"
-          popoverClass="utm-popover"
+          popoverClass="utm-popover popover-group"
           triggers="click">
       <i [ngClass]="creating?'icon-spinner2 spinner':getIcon(group)"></i>
       <span *ngIf="showTypeLabel" class="ml-2">
@@ -38,15 +38,19 @@
 </ng-template>
 
 <ng-template #colContent>
-  <ng-select
+  <ng-select #select
     [(ngModel)]="group"
-    [clearable]="true"
+    [clearable]="false"
     [items]="groups"
     [loadingText]="'Loading groups....'"
     [loading]="loading"
     bindLabel="groupName"
     class="mt-2 mb-2"
     id="id" style="min-width: 200px">
+    <ng-template ng-label-tmp let-item="item" let-clear="clear">
+        {{item.groupName}}
+        <span style="position:relative; z-index: 1; cursor: pointer; float: right" (click)="handleClear(select)">&times;</span>
+    </ng-template>
   </ng-select>
 
   <div class="d-flex justify-content-center align-items-center p-1">
diff --git a/frontend/src/app/assets-discover/shared/components/asset-group-add/asset-group-add.component.ts b/frontend/src/app/assets-discover/shared/components/asset-group-add/asset-group-add.component.ts
index 6055a8a6a..73f381c69 100644
--- a/frontend/src/app/assets-discover/shared/components/asset-group-add/asset-group-add.component.ts
+++ b/frontend/src/app/assets-discover/shared/components/asset-group-add/asset-group-add.component.ts
@@ -1,5 +1,6 @@
-import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
-import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
+import {Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core';
+import {NgbModal, NgbPopover} from '@ng-bootstrap/ng-bootstrap';
+import {NgSelectComponent} from '@ng-select/ng-select';
 import {UtmToastService} from '../../../../shared/alert/utm-toast.service';
 import {AssetGroupCreateComponent} from '../../../asset-groups/asset-group-create/asset-group-create.component';
 import {AssetGroupType} from '../../../asset-groups/shared/type/asset-group.type';
@@ -19,6 +20,8 @@ export class AssetGroupAddComponent implements OnInit {
   @Input() assets: number[];
   @Input() group: AssetGroupType;
   @Output() applyGroupEvent = new EventEmitter<AssetGroupType>();
+  @ViewChild('tagPopoverSpan') tagPopoverSpan: NgbPopover;
+  @ViewChild('tagPopoverButton') tagPopoverButton: NgbPopover;
   groups: AssetGroupType[];
   loading = false;
   creating = false;
@@ -58,10 +61,12 @@ export class AssetGroupAddComponent implements OnInit {
         this.applyGroupEvent.emit(response.body);
         this.assetReloadFilterBehavior.$assetReloadFilter.next(AssetFieldFilterEnum.GROUP);
         this.creating = false;
+        this.closePopover();
       }, error => {
         this.utmToastService.showError('Error changing group',
           'Error changing group, please try again');
         this.creating = false;
+        this.closePopover();
       });
   }
 
@@ -70,8 +75,22 @@ export class AssetGroupAddComponent implements OnInit {
   }
 
   addNewGroup() {
+    this.closePopover();
     const modalGroup = this.modalService.open(AssetGroupCreateComponent, {centered: true});
   }
 
-  protected readonly event = event;
+  handleClear(select: NgSelectComponent) {
+    this.group = null;
+    select.close();
+  }
+
+  closePopover() {
+    if (this.tagPopoverSpan) {
+      this.tagPopoverSpan.close();
+    }
+
+    if (this.tagPopoverButton) {
+      this.tagPopoverButton.close();
+    }
+  }
 }
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
index 8b3f2532e..78884eee3 100644
--- a/frontend/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -1286,5 +1286,11 @@ $topnav-background-color: #FFFFFF;
   }
 }
 
+.popover-group{
+  .ng-select.ng-select-single .ng-select-container .ng-value-container .ng-value{
+    width: 100%;
+  }
+}
+
 
 

From f3cf4a91d136ab2dea7b27f50775ff3dff71f6d0 Mon Sep 17 00:00:00 2001
From: "Freddy R. Laffita Almaguer" <c3s4rfred@gmail.com>
Date: Mon, 8 Jan 2024 08:28:43 -0500
Subject: [PATCH 2/3] Updating filebrowser image (#236)

---
 installer/compose.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/compose.go b/installer/compose.go
index 88dc68647..bfb62754f 100644
--- a/installer/compose.go
+++ b/installer/compose.go
@@ -375,7 +375,7 @@ func (c *Compose) Populate(conf *Config, stack *StackConfig) *Compose {
 	}
 
 	c.Services["filebrowser"] = Service{
-		Image: utils.Str("utmstack.azurecr.io/filebrowser:" + conf.Branch),
+		Image: utils.Str("ghcr.io/utmstack/filebrowser/filebrowser:" + conf.Branch),
 		Volumes: []string{
 			stack.Rules + ":/srv",
 		},

From b974bb04ff99cec13b54edecd0fa55a1dc7ad9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Mora=20L=C3=B3pez?=
 <41559395+leonardomoralopez89@users.noreply.github.com>
Date: Mon, 8 Jan 2024 15:35:47 +0200
Subject: [PATCH 3/3] A new validation is now in place for saving application
 configurations regarding the activation of MFA. This setting requires email
 configuration to be functional. Therefore, activating MFA also validates
 email configuration. (#237)

---
 .../UtmConfigurationParameterService.java     | 56 ++++++++++++++-----
 .../com/park/utmstack/util/UtilResponse.java  |  4 ++
 .../util/exceptions/UtmMailException.java     |  7 +++
 .../UtmConfigurationParameterResource.java    | 20 ++++---
 4 files changed, 65 insertions(+), 22 deletions(-)
 create mode 100644 backend/src/main/java/com/park/utmstack/util/exceptions/UtmMailException.java

diff --git a/backend/src/main/java/com/park/utmstack/service/UtmConfigurationParameterService.java b/backend/src/main/java/com/park/utmstack/service/UtmConfigurationParameterService.java
index 21a3ba7fb..3780eca76 100644
--- a/backend/src/main/java/com/park/utmstack/service/UtmConfigurationParameterService.java
+++ b/backend/src/main/java/com/park/utmstack/service/UtmConfigurationParameterService.java
@@ -1,15 +1,18 @@
 package com.park.utmstack.service;
 
 import com.park.utmstack.config.Constants;
+import com.park.utmstack.domain.User;
 import com.park.utmstack.domain.UtmConfigurationParameter;
 import com.park.utmstack.repository.UtmConfigurationParameterRepository;
 import com.park.utmstack.util.CipherUtil;
+import com.park.utmstack.util.exceptions.UtmMailException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -33,17 +36,23 @@ public class UtmConfigurationParameterService {
     private static final String CLASSNAME = "UtmConfigurationParameterService";
     private final Logger log = LoggerFactory.getLogger(UtmConfigurationParameterService.class);
 
-    private final UtmConfigurationParameterRepository utmConfigurationParameterRepository;
+    private final UtmConfigurationParameterRepository configParamRepository;
+    private final UserService userService;
+    private final MailService mailService;
 
-    public UtmConfigurationParameterService(UtmConfigurationParameterRepository utmConfigurationParameterRepository) {
-        this.utmConfigurationParameterRepository = utmConfigurationParameterRepository;
+    public UtmConfigurationParameterService(UtmConfigurationParameterRepository configParamRepository,
+                                            UserService userService,
+                                            MailService mailService) {
+        this.configParamRepository = configParamRepository;
+        this.userService = userService;
+        this.mailService = mailService;
     }
 
     @EventListener(ApplicationReadyEvent.class)
     public void init() {
         final String ctx = CLASSNAME + ".init";
         try {
-            List<UtmConfigurationParameter> params = utmConfigurationParameterRepository.findAll();
+            List<UtmConfigurationParameter> params = configParamRepository.findAll();
             if (CollectionUtils.isEmpty(params))
                 return;
             params.forEach(p -> {
@@ -57,17 +66,25 @@ public void init() {
         }
     }
 
-    public void saveAll(List<UtmConfigurationParameter> parameters) throws Exception {
+    public void saveAll(List<UtmConfigurationParameter> params) throws UtmMailException {
         final String ctx = CLASSNAME + ".saveAll";
         try {
+            // If the configuration to save is: Enable Two-Factor Authentication then we need to check
+            // if the email configuration is OK
+            params.stream().filter(p -> p.getConfParamShort().equals(Constants.PROP_TFA_ENABLE)
+                            && Boolean.parseBoolean(p.getConfParamValue()))
+                    .findFirst().ifPresent(tfa -> validateMailConfOnMFAActivation());
+
             Map<String, String> cfg = new HashMap<>();
-            parameters.forEach(p -> {
+            for (UtmConfigurationParameter p : params) {
                 cfg.put(p.getConfParamShort(), p.getConfParamValue());
                 if (StringUtils.hasText(p.getConfParamValue()) && p.getConfParamDatatype().equalsIgnoreCase("password"))
                     p.setConfParamValue(CipherUtil.encrypt(p.getConfParamValue(), System.getenv(Constants.ENV_ENCRYPTION_KEY)));
-            });
-            utmConfigurationParameterRepository.saveAll(parameters);
+            }
+            configParamRepository.saveAll(params);
             Constants.CFG.putAll(cfg);
+        } catch (UtmMailException e) {
+            throw new UtmMailException(ctx + ": " + e.getMessage());
         } catch (Exception e) {
             throw new RuntimeException(ctx + ": " + e.getMessage());
         }
@@ -82,7 +99,7 @@ public void saveAll(List<UtmConfigurationParameter> parameters) throws Exception
     @Transactional(readOnly = true)
     public Page<UtmConfigurationParameter> findAll(Pageable pageable) {
         log.debug("Request to get all UtmConfigurationParameters");
-        return utmConfigurationParameterRepository.findAll(pageable);
+        return configParamRepository.findAll(pageable);
     }
 
 
@@ -95,7 +112,7 @@ public Page<UtmConfigurationParameter> findAll(Pageable pageable) {
     @Transactional(readOnly = true)
     public Optional<UtmConfigurationParameter> findOne(Long id) {
         log.debug("Request to get UtmConfigurationParameter : {}", id);
-        return utmConfigurationParameterRepository.findById(id);
+        return configParamRepository.findById(id);
     }
 
     /**
@@ -105,18 +122,27 @@ public Optional<UtmConfigurationParameter> findOne(Long id) {
      */
     public void delete(Long id) {
         log.debug("Request to delete UtmConfigurationParameter : {}", id);
-        utmConfigurationParameterRepository.deleteById(id);
+        configParamRepository.deleteById(id);
     }
 
     public Map<String, String> getValueMapForDateSetting() throws Exception {
         final String ctx = CLASSNAME + ".getValueMapForDateSetting";
         try {
-            return utmConfigurationParameterRepository
-                .findAllBySectionId(DATE_FORMAT_SETTING_ID).stream()
-                .collect(Collectors.toMap(UtmConfigurationParameter::getConfParamShort,
-                    UtmConfigurationParameter::getConfParamValue));
+            return configParamRepository
+                    .findAllBySectionId(DATE_FORMAT_SETTING_ID).stream()
+                    .collect(Collectors.toMap(UtmConfigurationParameter::getConfParamShort,
+                            UtmConfigurationParameter::getConfParamValue));
         } catch (Exception e) {
             throw new Exception(ctx + ": " + e.getMessage());
         }
     }
+
+    private void validateMailConfOnMFAActivation() throws UtmMailException {
+        final String ctx = CLASSNAME + ".validateMailConfOnMFAActivation";
+        try {
+            mailService.sendCheckEmail(List.of(userService.getCurrentUserLogin().getEmail()));
+        } catch (Exception e) {
+            throw new UtmMailException(ctx + ": " + e.getLocalizedMessage());
+        }
+    }
 }
diff --git a/backend/src/main/java/com/park/utmstack/util/UtilResponse.java b/backend/src/main/java/com/park/utmstack/util/UtilResponse.java
index 2c040df80..eaff4d45e 100644
--- a/backend/src/main/java/com/park/utmstack/util/UtilResponse.java
+++ b/backend/src/main/java/com/park/utmstack/util/UtilResponse.java
@@ -27,5 +27,9 @@ public static <T> ResponseEntity<T> buildLockedResponse(String msg) {
     public static <T> ResponseEntity<T> buildUnauthorizedResponse(String msg) {
         return buildErrorResponse(HttpStatus.UNAUTHORIZED, msg);
     }
+
+    public static <T> ResponseEntity<T> buildPreconditionFailedResponse(String msg) {
+        return buildErrorResponse(HttpStatus.PRECONDITION_FAILED, msg);
+    }
 }
 
diff --git a/backend/src/main/java/com/park/utmstack/util/exceptions/UtmMailException.java b/backend/src/main/java/com/park/utmstack/util/exceptions/UtmMailException.java
new file mode 100644
index 000000000..288577b9e
--- /dev/null
+++ b/backend/src/main/java/com/park/utmstack/util/exceptions/UtmMailException.java
@@ -0,0 +1,7 @@
+package com.park.utmstack.util.exceptions;
+
+public class UtmMailException extends RuntimeException {
+    public UtmMailException(String message) {
+        super(message);
+    }
+}
diff --git a/backend/src/main/java/com/park/utmstack/web/rest/UtmConfigurationParameterResource.java b/backend/src/main/java/com/park/utmstack/web/rest/UtmConfigurationParameterResource.java
index 0e75042b5..6174341a8 100644
--- a/backend/src/main/java/com/park/utmstack/web/rest/UtmConfigurationParameterResource.java
+++ b/backend/src/main/java/com/park/utmstack/web/rest/UtmConfigurationParameterResource.java
@@ -6,7 +6,8 @@
 import com.park.utmstack.service.UtmConfigurationParameterService;
 import com.park.utmstack.service.application_events.ApplicationEventService;
 import com.park.utmstack.service.dto.UtmConfigurationParameterCriteria;
-import com.park.utmstack.web.rest.util.HeaderUtil;
+import com.park.utmstack.util.UtilResponse;
+import com.park.utmstack.util.exceptions.UtmMailException;
 import com.park.utmstack.web.rest.util.PaginationUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +15,6 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
@@ -33,13 +33,10 @@ public class UtmConfigurationParameterResource {
 
     private final Logger log = LoggerFactory.getLogger(UtmConfigurationParameterResource.class);
 
-    private static final String ENTITY_NAME = "utmConfigurationParameter";
     private static final String CLASSNAME = "UtmConfigurationParameterResource";
 
     private final UtmConfigurationParameterService utmConfigurationParameterService;
-
     private final UtmConfigurationParameterQueryService utmConfigurationParameterQueryService;
-
     private final ApplicationEventService applicationEventService;
 
     public UtmConfigurationParameterResource(UtmConfigurationParameterService utmConfigurationParameterService,
@@ -64,12 +61,21 @@ public ResponseEntity<Void> updateConfigurationParameters(@Valid @RequestBody Li
             Assert.notEmpty(parameters, "There isn't any parameter to update");
             utmConfigurationParameterService.saveAll(parameters);
             return ResponseEntity.ok().build();
+        } catch (UtmMailException e) {
+            String msg = ctx + ": " + e.getMessage();
+            log.error(msg);
+            applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
+            return UtilResponse.buildPreconditionFailedResponse(msg);
+        } catch (IllegalArgumentException e) {
+            String msg = ctx + ": " + e.getMessage();
+            log.error(msg);
+            applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
+            return UtilResponse.buildBadRequestResponse(msg);
         } catch (Exception e) {
             String msg = ctx + ": " + e.getMessage();
             log.error(msg);
             applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).headers(
-                HeaderUtil.createFailureAlert("", "", msg)).body(null);
+            return UtilResponse.buildInternalServerErrorResponse(msg);
         }
     }