Add some target fields and move some things around (#3879)

In preparation for putting proxy code in the api package this creates some necessary fields in the target output and it pre-moves credential parsing and proxy handshake code to their new places. This will make the diff for the actual proxy code move quite a bit smaller.

Co-authored-by: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>

internal/daemon/controller/handlers/targets/target_service.go

@@ -1083,6 +1083,8 @@ func (s Service) AuthorizeSession(ctx context.Context, req *pbs.AuthorizeSession
 		TargetId:          t.GetPublicId(),
 		Scope:             authResults.Scope,
 		CreatedTime:       sess.CreateTime.GetTimestamp(),
+		Expiration:        sess.ExpirationTime.GetTimestamp(),
+		EndpointPort:      t.GetDefaultPort(),
 		Type:              t.GetType().String(),
 		Certificate:       sess.Certificate,
 		PrivateKey:        sess.CertificatePrivateKey,
@@ -1103,6 +1105,8 @@ func (s Service) AuthorizeSession(ctx context.Context, req *pbs.AuthorizeSession
 		TargetId:           t.GetPublicId(),
 		Scope:              authResults.Scope,
 		CreatedTime:        sess.CreateTime.GetTimestamp(),
+		Expiration:         sess.ExpirationTime.GetTimestamp(),
+		EndpointPort:       t.GetDefaultPort(),
 		Type:               t.GetType().String(),
 		AuthorizationToken: encodedMarshaledSad,
 		UserId:             authResults.UserId,

internal/daemon/controller/handlers/targets/tcp/target_service_test.go

@@ -2652,15 +2652,18 @@ func TestAuthorizeSession(t *testing.T) {
 				HostId:    wantedHostId,
 				Type:      "tcp",
 				Endpoint:  fmt.Sprintf("tcp://%s", tc.wantedEndpoint),
-				Credentials: []*pb.SessionCredential{{
-					CredentialSource: &pb.CredentialSource{
-						Id:                clsResp.GetItem().GetId(),
-						Name:              clsResp.GetItem().GetName().GetValue(),
-						Description:       clsResp.GetItem().GetDescription().GetValue(),
-						CredentialStoreId: vaultStore.GetPublicId(),
-						Type:              vault.GenericLibrarySubtype.String(),
+				Credentials: []*pb.SessionCredential{
+					{
+						CredentialSource: &pb.CredentialSource{
+							Id:                clsResp.GetItem().GetId(),
+							Name:              clsResp.GetItem().GetName().GetValue(),
+							Description:       clsResp.GetItem().GetDescription().GetValue(),
+							CredentialStoreId: vaultStore.GetPublicId(),
+							Type:              vault.GenericLibrarySubtype.String(),
+						},
 					},
-				}},
+				},
+				EndpointPort: uint32(defaultPort),
 				// TODO: validate the contents of the authorization token is what is expected
 			}
 			wantSecret := map[string]any{
@@ -2697,7 +2700,7 @@ func TestAuthorizeSession(t *testing.T) {
 			gotCred.Secret = nil
 
 			got.AuthorizationToken, got.SessionId, got.CreatedTime = "", "", nil
-			assert.Empty(t, cmp.Diff(got, want, protocmp.Transform()))
+			assert.Empty(t, cmp.Diff(got, want, protocmp.Transform(), protocmp.IgnoreFields(&pb.SessionAuthorization{}, "expiration")))
 		})
 	}
 }
@@ -3269,13 +3272,15 @@ func TestAuthorizeSessionTypedCredentials(t *testing.T) {
 					Description:   proj.GetDescription(),
 					ParentScopeId: proj.GetParentId(),
 				},
-				TargetId:    tar.GetPublicId(),
-				UserId:      at.GetIamUserId(),
-				HostSetId:   tc.hostSourceId,
-				HostId:      tc.wantedHostId,
-				Type:        "tcp",
-				Endpoint:    fmt.Sprintf("tcp://%s:%d", tc.wantedEndpoint, defaultPort),
-				Credentials: []*pb.SessionCredential{tc.wantedCred},
+				TargetId:     tar.GetPublicId(),
+				UserId:       at.GetIamUserId(),
+				HostSetId:    tc.hostSourceId,
+				HostId:       tc.wantedHostId,
+				Type:         "tcp",
+				Endpoint:     fmt.Sprintf("tcp://%s:%d", tc.wantedEndpoint, defaultPort),
+				Credentials:  []*pb.SessionCredential{tc.wantedCred},
+				EndpointPort: uint32(defaultPort),
+				Expiration:   asRes.Item.Expiration,
 				// TODO: validate the contents of the authorization token is what is expected
 			}
 			got := asRes.GetItem()

internal/daemon/worker/handler.go

@@ -22,8 +22,8 @@ import (
 	"github.com/hashicorp/boundary/internal/errors"
 	"github.com/hashicorp/boundary/internal/event"
 	pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services"
-	"github.com/hashicorp/boundary/internal/proxy"
 	"github.com/hashicorp/boundary/internal/util"
+	"github.com/hashicorp/boundary/sdk/pbs/proxy"
 	"github.com/hashicorp/go-secure-stdlib/listenerutil"
 	"github.com/hashicorp/nodeenrollment"
 	"github.com/hashicorp/nodeenrollment/types"

internal/daemon/worker/workerdisconnect_test.go

@@ -33,23 +33,30 @@ func TestDeleteConnectedWorkers(t *testing.T) {
 
 	serverRepo, err := c.Controller().ServersRepoFn()
 	require.NoError(t, err)
-	workers, err := serverRepo.ListWorkers(ctx, []string{"global"}, server.WithLiveness(-1))
-	require.NoError(t, err)
+	workerTimeoutCtx, workerTimeoutCancel := context.WithTimeout(ctx, 5*time.Minute)
+	defer workerTimeoutCancel()
 	var pkiWorker, childPkiWorker, childKmsWorker *server.Worker
-	for _, w := range workers {
-		if w.Type == "pki" && w.GetAddress() == multiHoppedPkiWorker.ProxyAddrs()[0] {
-			childPkiWorker = w
-		}
-		if w.Type == "pki" && w.GetAddress() == multiHoppedKmsWorker.ProxyAddrs()[0] {
-			childKmsWorker = w
-		}
-		if w.Type == "pki" && w.GetAddress() == directPkiWorker.ProxyAddrs()[0] {
-			pkiWorker = w
+	for pkiWorker == nil || childPkiWorker == nil || childKmsWorker == nil {
+		time.Sleep(time.Second)
+		select {
+		case <-workerTimeoutCtx.Done():
+			require.FailNow(t, "timeout waiting for all workers to connect")
+		default:
+			workers, err := serverRepo.ListWorkers(workerTimeoutCtx, []string{"global"}, server.WithLiveness(-1))
+			require.NoError(t, err)
+			for _, w := range workers {
+				if w.Type == "pki" && w.GetAddress() == multiHoppedPkiWorker.ProxyAddrs()[0] {
+					childPkiWorker = w
+				}
+				if w.Type == "pki" && w.GetAddress() == multiHoppedKmsWorker.ProxyAddrs()[0] {
+					childKmsWorker = w
+				}
+				if w.Type == "pki" && w.GetAddress() == directPkiWorker.ProxyAddrs()[0] {
+					pkiWorker = w
+				}
+			}
 		}
 	}
-	require.NotNil(t, childKmsWorker)
-	require.NotNil(t, childPkiWorker)
-	require.NotNil(t, pkiWorker)
 
 	cases := []struct {
 		name       string