diff --git a/.github/workflows/principal-multi-env.yml b/.github/workflows/principal-multi-env.yml index 1fabb67a4..6bbcf5a13 100644 --- a/.github/workflows/principal-multi-env.yml +++ b/.github/workflows/principal-multi-env.yml @@ -43,7 +43,6 @@ jobs: backend: - 'backend/**' - 'version.yml' - correlation: correlation/** frontend: frontend/** bitdefender: bitdefender/** mutate: mutate/** @@ -74,7 +73,7 @@ jobs: strategy: fail-fast: false matrix: - service: ['agent-manager', 'aws', 'backend', 'correlation', 'frontend', 'bitdefender', 'mutate', 'office365', 'log-auth-proxy', 'sophos', 'user-auditor', 'web-pdf'] + service: ['agent-manager', 'aws', 'backend', 'frontend', 'bitdefender', 'mutate', 'office365', 'log-auth-proxy', 'sophos', 'user-auditor', 'web-pdf'] uses: ./.github/workflows/used-runner.yml with: microservice: ${{ matrix.service }} diff --git a/.github/workflows/used-runner.yml b/.github/workflows/used-runner.yml index c79c2907c..7049d75c7 100644 --- a/.github/workflows/used-runner.yml +++ b/.github/workflows/used-runner.yml @@ -22,7 +22,7 @@ jobs: id: get_tech run: | folder_changed="${{inputs.microservice}}" - if [[ "$folder_changed" == "agent-manager" || "$folder_changed" == "aws" || "$folder_changed" == "correlation" || "$folder_changed" == "bitdefender" || "$folder_changed" == "office365" || "$folder_changed" == "sophos" || "$folder_changed" == "log-auth-proxy" ]]; then + if [[ "$folder_changed" == "agent-manager" || "$folder_changed" == "aws" || "$folder_changed" == "bitdefender" || "$folder_changed" == "office365" || "$folder_changed" == "sophos" || "$folder_changed" == "log-auth-proxy" ]]; then tech="golang" elif [[ "$folder_changed" == "backend" ]]; then tech="java-11" diff --git a/CHANGELOG.md b/CHANGELOG.md index 1117697d6..3f75acc39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,4 +10,4 @@ ## New Features - Introduced new standards, sections, dashboards, and visualizations to compliance reports. - Update ip address to agent. -- Alert generation for down data sources. \ No newline at end of file +- Alert generation for down data sources. diff --git a/frontend/src/app/shared/components/utm/util/utm-agent-detail/utm-agent-detail.component.ts b/frontend/src/app/shared/components/utm/util/utm-agent-detail/utm-agent-detail.component.ts index 9b3b0723d..d5515139a 100644 --- a/frontend/src/app/shared/components/utm/util/utm-agent-detail/utm-agent-detail.component.ts +++ b/frontend/src/app/shared/components/utm/util/utm-agent-detail/utm-agent-detail.component.ts @@ -1,5 +1,5 @@ import {Component, Input, OnInit} from '@angular/core'; -import {EMPTY, of} from 'rxjs'; +import {EMPTY} from 'rxjs'; import {catchError, map, tap} from 'rxjs/operators'; import {NetScanType} from '../../../../../assets-discover/shared/types/net-scan.type'; import {UtmToastService} from '../../../../alert/utm-toast.service'; @@ -53,6 +53,7 @@ export class UtmAgentDetailComponent implements OnInit { this.loading = true; const agent = { id: this.agent.id, + hostname: this.agent.hostname, ip: this.agentIp, mac: this.macs.length > 0 ? this.macs[0] : '', agentKey: this.agent.agentKey diff --git a/log-auth-proxy/logservice/auth_service.go b/log-auth-proxy/logservice/auth_service.go index 81e10ef7b..a1d3eb217 100644 --- a/log-auth-proxy/logservice/auth_service.go +++ b/log-auth-proxy/logservice/auth_service.go @@ -2,6 +2,7 @@ package logservice import ( "context" + "crypto/tls" "os" "sync" "time" @@ -11,7 +12,7 @@ import ( "github.com/utmstack/UTMStack/log-auth-proxy/panelservice" "github.com/utmstack/UTMStack/log-auth-proxy/utils" "google.golang.org/grpc" - "google.golang.org/grpc/credentials/insecure" + "google.golang.org/grpc/credentials" "google.golang.org/grpc/metadata" ) @@ -57,7 +58,11 @@ func (auth *LogAuthService) syncKeys(typ agent.ConnectorType) { h.Fatal("Failed to get the SERVER_ADDRESS ") } - conn, err := grpc.Dial(serverAddress, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMessageSize))) + tlsConfig := &tls.Config{InsecureSkipVerify: true} + creds := credentials.NewTLS(tlsConfig) + opts := grpc.WithTransportCredentials(creds) + + conn, err := grpc.NewClient(serverAddress, opts, grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMessageSize))) if err != nil { h.ErrorF("Failed to connect to gRPC server: %v", err) return