From e0700570a268c6d3e32c516672bc386e3a23f718 Mon Sep 17 00:00:00 2001 From: Johan Brandhorst-Satzkorn Date: Thu, 25 May 2023 14:40:12 -0700 Subject: [PATCH] bsr: add endpoint to session meta The endpoint stores the address of the host the egress worker proxies to. --- internal/bsr/bsr.go | 2 -- internal/bsr/meta_session.go | 1 + internal/bsr/testing.go | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/bsr/bsr.go b/internal/bsr/bsr.go index a8764c778..95072ac09 100644 --- a/internal/bsr/bsr.go +++ b/internal/bsr/bsr.go @@ -54,8 +54,6 @@ func NewSession(ctx context.Context, meta *SessionRecordingMeta, sessionMeta *Se return nil, fmt.Errorf("%s: missing session meta: %w", op, ErrInvalidParameter) case meta.Id == "": return nil, fmt.Errorf("%s: missing session id: %w", op, ErrInvalidParameter) - case is.Nil(sessionMeta.StaticHost) && is.Nil(sessionMeta.DynamicHost): - return nil, fmt.Errorf("%s: missing session host information: %w", op, ErrInvalidParameter) case !is.Nil(sessionMeta.StaticHost) && !is.Nil(sessionMeta.DynamicHost): return nil, fmt.Errorf("%s: sessionMeta cannot contain both static and dynamic host information: %w", op, ErrInvalidParameter) case len(sessionMeta.StaticCredentialStore) == 0 && len(sessionMeta.VaultCredentialStore) == 0: diff --git a/internal/bsr/meta_session.go b/internal/bsr/meta_session.go index a3008bbfe..de49d7f16 100644 --- a/internal/bsr/meta_session.go +++ b/internal/bsr/meta_session.go @@ -162,6 +162,7 @@ type VaultSshCertLibrary struct { // SessionMeta contains metadata about a session in a BSR. type SessionMeta struct { PublicId string + Endpoint string User *User Target *Target Worker *Worker diff --git a/internal/bsr/testing.go b/internal/bsr/testing.go index 9f706b9ba..d99d47ef5 100644 --- a/internal/bsr/testing.go +++ b/internal/bsr/testing.go @@ -13,6 +13,7 @@ func TestSessionRecordingMeta(s string, p Protocol) *SessionRecordingMeta { func TestSessionMeta(s string) *SessionMeta { return &SessionMeta{ PublicId: s, + Endpoint: "myhost:12345", User: &User{ PublicId: "user123", Scope: Scope{