From 21888246dbd3a8b572a0e937ffc07359833bfbb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Dieguez=20P=C3=A9rez?= Date: Mon, 15 Jan 2024 11:04:14 +0200 Subject: [PATCH 1/2] Fixing issues for 10.2 release (#272) * Update README.md * Bugfix/v10.2/260 frontend is making continuous requests when logout (#267) * Fix: Frontend is making continuous requests when logout (260) * Fix: Incorrect rendering of multi-selection filter when choosing multiple values (268) (#270) * Fix: Unable to login with token query param (269) (#271) --------- Co-authored-by: rvald26 <37116247+rvald26@users.noreply.github.com> Co-authored-by: Manuel Abascal --- README.md | 1 + .../app/shared/components/auth/login/login.component.ts | 2 -- .../utm-notification-alert.component.ts | 1 - .../shared/directives/auth/has-any-authority.directive.ts | 5 ++++- frontend/src/styles.scss | 7 +++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 936a9b2fb..1b7b7a22d 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,7 @@ Resources needed for one month of hot log storage. - You may combine these tiers to allocate resources based on the number of devices and desired hot log storage retention ## Installation steps +The installation can be performed using an installer file or an [ISO image](https://utmstack.com/install). The "Preparing for installation" instructions below are only for the installer file option; please skip them if you use the ISO image instead. ### Preparing for installation diff --git a/frontend/src/app/shared/components/auth/login/login.component.ts b/frontend/src/app/shared/components/auth/login/login.component.ts index 0188addb9..de2829975 100644 --- a/frontend/src/app/shared/components/auth/login/login.component.ts +++ b/frontend/src/app/shared/components/auth/login/login.component.ts @@ -58,8 +58,6 @@ export class LoginComponent implements OnInit, AfterViewInit { this.apiServiceCheckerService.isOnlineApi$.subscribe(result => { if (result) { - this.startNavigation(); - this.activatedRoute.queryParams.subscribe(params => { if (params.token) { this.loginService.loginWithToken(params.token, true).then(() => { diff --git a/frontend/src/app/shared/components/layout/header/shared/notification/utm-notification-alert/utm-notification-alert.component.ts b/frontend/src/app/shared/components/layout/header/shared/notification/utm-notification-alert/utm-notification-alert.component.ts index 177774c8e..279026830 100644 --- a/frontend/src/app/shared/components/layout/header/shared/notification/utm-notification-alert/utm-notification-alert.component.ts +++ b/frontend/src/app/shared/components/layout/header/shared/notification/utm-notification-alert/utm-notification-alert.component.ts @@ -42,7 +42,6 @@ export class UtmNotificationAlertComponent implements OnInit, OnDestroy { } ngOnDestroy() { - console.log('destroy'); this.destroy$.next(true); clearInterval(this.timeoutAlert); clearInterval(this.intervalAlert); diff --git a/frontend/src/app/shared/directives/auth/has-any-authority.directive.ts b/frontend/src/app/shared/directives/auth/has-any-authority.directive.ts index 9364b6f59..8f9486b69 100644 --- a/frontend/src/app/shared/directives/auth/has-any-authority.directive.ts +++ b/frontend/src/app/shared/directives/auth/has-any-authority.directive.ts @@ -1,4 +1,5 @@ import {Directive, Input, TemplateRef, ViewContainerRef} from '@angular/core'; +import {distinctUntilChanged} from 'rxjs/operators'; import {AccountService} from '../../../core/auth/account.service'; /** @@ -30,7 +31,9 @@ export class HasAnyAuthorityDirective { this.authorities = typeof value === 'string' ? [value] : value; this.updateView(); // Get notified each time authentication state changes. - this.accountService.getAuthenticationState().subscribe(identity => this.updateView()); + this.accountService.getAuthenticationState() + .pipe(distinctUntilChanged((prev, next) => prev && next && prev.id === next.id)) + .subscribe(identity => this.updateView()); } private updateView(): void { diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 78884eee3..9a7413c9a 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -1292,5 +1292,12 @@ $topnav-background-color: #FFFFFF; } } +app-rules { + .ng-select .ng-select-container { + min-height: 33px !important; + height: auto !important; + } +} + From be99c82b68841450a36ba1b4d23d7bd7619b37a5 Mon Sep 17 00:00:00 2001 From: Osmany Montero Date: Mon, 15 Jan 2024 12:20:25 +0200 Subject: [PATCH 2/2] Preparing v10.2 release (#283) * Update README.md * Bugfix/v10.2/260 frontend is making continuous requests when logout (#267) * Fix: Frontend is making continuous requests when logout (260) * Fix: Incorrect rendering of multi-selection filter when choosing multiple values (268) (#270) * Fix: Unable to login with token query param (269) (#271) * adding content security policy * updating Dockerfile * Bump golang.org/x/crypto from 0.14.0 to 0.17.0 in /correlation (#274) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.14.0 to 0.17.0. - [Commits](https://github.com/golang/crypto/compare/v0.14.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] Co-authored-by: rvald26 <37116247+rvald26@users.noreply.github.com> Co-authored-by: Manuel Abascal Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- correlation/go.mod | 6 +++--- correlation/go.sum | 11 ++++++----- frontend/Dockerfile | 2 +- installer/templates/front-end.go | 1 + 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/correlation/go.mod b/correlation/go.mod index a401f38b3..437c63b26 100644 --- a/correlation/go.mod +++ b/correlation/go.mod @@ -53,10 +53,10 @@ require ( github.com/ugorji/go/codec v1.2.11 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect golang.org/x/arch v0.5.0 // indirect - golang.org/x/crypto v0.14.0 // indirect + golang.org/x/crypto v0.17.0 // indirect golang.org/x/net v0.17.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/sys v0.15.0 // indirect + golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.14.0 // indirect google.golang.org/protobuf v1.31.0 // indirect ) diff --git a/correlation/go.sum b/correlation/go.sum index 34a45f42c..79b352e77 100644 --- a/correlation/go.sum +++ b/correlation/go.sum @@ -157,8 +157,8 @@ golang.org/x/arch v0.5.0 h1:jpGode6huXQxcskEIpOCvrU+tzo81b6+oFLUYXWtH/Y= golang.org/x/arch v0.5.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= @@ -182,8 +182,9 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -191,8 +192,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 770248743..488fb7422 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -8,4 +8,4 @@ HEALTHCHECK --start-period=120s --interval=60s --timeout=60s \ EXPOSE 80 -CMD ["/bin/sh", "-c", "exec nginx -g 'daemon off;'"] +CMD ["/bin/sh", "-c", "exec nginx -g 'daemon off;'"] \ No newline at end of file diff --git a/installer/templates/front-end.go b/installer/templates/front-end.go index 5a998f78c..a7ced2e84 100644 --- a/installer/templates/front-end.go +++ b/installer/templates/front-end.go @@ -9,6 +9,7 @@ const FrontEnd string =`server { root /usr/share/nginx/html; index index.html index.htm; try_files $uri $uri/ /index.html =404; + add_header Content-Security-Policy "default-src 'self' https://fonts.googleapis.com/css* https://fonts.gstatic.com/s/poppins/v20*; frame-src 'self' data:; script-src 'self' https://storage.googleapis.com; style-src 'self'; img-src 'self' data:; font-src 'self' data:" always; } set $utmstack_backend http://backend:8080;