-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add conversions to/from decisionpb.TLSIdentity #50308
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,273 @@ | ||
// Teleport | ||
// Copyright (C) 2024 Gravitational, Inc. | ||
// | ||
// This program is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU Affero General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
// | ||
// This program is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU Affero General Public License for more details. | ||
// | ||
// You should have received a copy of the GNU Affero General Public License | ||
// along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
package decision | ||
|
||
import ( | ||
"time" | ||
|
||
"google.golang.org/protobuf/types/known/timestamppb" | ||
|
||
decisionpb "github.com/gravitational/teleport/api/gen/proto/go/teleport/decision/v1alpha1" | ||
traitpb "github.com/gravitational/teleport/api/gen/proto/go/teleport/trait/v1" | ||
"github.com/gravitational/teleport/api/types" | ||
apitrait "github.com/gravitational/teleport/api/types/trait" | ||
apitraitconvert "github.com/gravitational/teleport/api/types/trait/convert/v1" | ||
"github.com/gravitational/teleport/api/types/wrappers" | ||
"github.com/gravitational/teleport/api/utils/keys" | ||
"github.com/gravitational/teleport/lib/tlsca" | ||
) | ||
|
||
// TLSIdentityToTLSCA transforms a [decisionpb.TLSIdentity] into its | ||
// equivalent [tlsca.Identity]. | ||
func TLSIdentityToTLSCA(id *decisionpb.TLSIdentity) *tlsca.Identity { | ||
if id == nil { | ||
return nil | ||
} | ||
|
||
return &tlsca.Identity{ | ||
Username: id.Username, | ||
Impersonator: id.Impersonator, | ||
Groups: id.Groups, | ||
SystemRoles: id.SystemRoles, | ||
Usage: id.Usage, | ||
Principals: id.Principals, | ||
KubernetesGroups: id.KubernetesGroups, | ||
KubernetesUsers: id.KubernetesUsers, | ||
Expires: timestampToGoTime(id.Expires), | ||
RouteToCluster: id.RouteToCluster, | ||
KubernetesCluster: id.KubernetesCluster, | ||
Traits: traitToWrappers(id.Traits), | ||
RouteToApp: routeToAppFromProto(id.RouteToApp), | ||
TeleportCluster: id.TeleportCluster, | ||
RouteToDatabase: routeToDatabaseFromProto(id.RouteToDatabase), | ||
DatabaseNames: id.DatabaseNames, | ||
DatabaseUsers: id.DatabaseUsers, | ||
MFAVerified: id.MfaVerified, | ||
PreviousIdentityExpires: timestampToGoTime(id.PreviousIdentityExpires), | ||
LoginIP: id.LoginIp, | ||
PinnedIP: id.PinnedIp, | ||
AWSRoleARNs: id.AwsRoleArns, | ||
AzureIdentities: id.AzureIdentities, | ||
GCPServiceAccounts: id.GcpServiceAccounts, | ||
ActiveRequests: id.ActiveRequests, | ||
DisallowReissue: id.DisallowReissue, | ||
Renewable: id.Renewable, | ||
Generation: id.Generation, | ||
BotName: id.BotName, | ||
BotInstanceID: id.BotInstanceId, | ||
AllowedResourceIDs: resourceIDsToTypes(id.AllowedResourceIds), | ||
PrivateKeyPolicy: keys.PrivateKeyPolicy(id.PrivateKeyPolicy), | ||
ConnectionDiagnosticID: id.ConnectionDiagnosticId, | ||
DeviceExtensions: deviceExtensionsFromProto(id.DeviceExtensions), | ||
UserType: types.UserType(id.UserType), | ||
} | ||
} | ||
|
||
// TLSIdentityFromTLSCA transforms a [tlsca.Identity] into its equivalent | ||
// [decisionpb.TLSIdentity]. | ||
func TLSIdentityFromTLSCA(id *tlsca.Identity) *decisionpb.TLSIdentity { | ||
if id == nil { | ||
return nil | ||
} | ||
|
||
return &decisionpb.TLSIdentity{ | ||
Username: id.Username, | ||
Impersonator: id.Impersonator, | ||
Groups: id.Groups, | ||
SystemRoles: id.SystemRoles, | ||
Usage: id.Usage, | ||
Principals: id.Principals, | ||
KubernetesGroups: id.KubernetesGroups, | ||
KubernetesUsers: id.KubernetesUsers, | ||
Expires: timestampFromGoTime(id.Expires), | ||
RouteToCluster: id.RouteToCluster, | ||
KubernetesCluster: id.KubernetesCluster, | ||
Traits: traitFromWrappers(id.Traits), | ||
RouteToApp: routeToAppToProto(&id.RouteToApp), | ||
TeleportCluster: id.TeleportCluster, | ||
RouteToDatabase: routeToDatabaseToProto(&id.RouteToDatabase), | ||
DatabaseNames: id.DatabaseNames, | ||
DatabaseUsers: id.DatabaseUsers, | ||
MfaVerified: id.MFAVerified, | ||
PreviousIdentityExpires: timestampFromGoTime(id.PreviousIdentityExpires), | ||
LoginIp: id.LoginIP, | ||
PinnedIp: id.PinnedIP, | ||
AwsRoleArns: id.AWSRoleARNs, | ||
AzureIdentities: id.AzureIdentities, | ||
GcpServiceAccounts: id.GCPServiceAccounts, | ||
ActiveRequests: id.ActiveRequests, | ||
DisallowReissue: id.DisallowReissue, | ||
Renewable: id.Renewable, | ||
Generation: id.Generation, | ||
BotName: id.BotName, | ||
BotInstanceId: id.BotInstanceID, | ||
AllowedResourceIds: resourceIDsFromTypes(id.AllowedResourceIDs), | ||
PrivateKeyPolicy: string(id.PrivateKeyPolicy), | ||
ConnectionDiagnosticId: id.ConnectionDiagnosticID, | ||
DeviceExtensions: deviceExtensionsToProto(&id.DeviceExtensions), | ||
UserType: string(id.UserType), | ||
} | ||
} | ||
|
||
func timestampToGoTime(t *timestamppb.Timestamp) time.Time { | ||
if t == nil { | ||
return time.Time{} | ||
} | ||
return t.AsTime() | ||
} | ||
|
||
func timestampFromGoTime(t time.Time) *timestamppb.Timestamp { | ||
if t.IsZero() { | ||
codingllama marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return nil | ||
} | ||
return timestamppb.New(t) | ||
} | ||
|
||
func traitToWrappers(traits []*traitpb.Trait) wrappers.Traits { | ||
apiTraits := apitraitconvert.FromProto(traits) | ||
return wrappers.Traits(apiTraits) | ||
} | ||
|
||
func traitFromWrappers(traits wrappers.Traits) []*traitpb.Trait { | ||
if len(traits) == 0 { | ||
return nil | ||
} | ||
apiTraits := apitrait.Traits(traits) | ||
return apitraitconvert.ToProto(apiTraits) | ||
} | ||
|
||
func routeToAppFromProto(routeToApp *decisionpb.RouteToApp) tlsca.RouteToApp { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This returns tlsca.RouterToApp by value as that is how tlsca.Identity wants it. The inverse conversion (routeToAppToProto) will both take and return a pointer. Same for other structs. |
||
if routeToApp == nil { | ||
return tlsca.RouteToApp{} | ||
} | ||
|
||
return tlsca.RouteToApp{ | ||
SessionID: routeToApp.SessionId, | ||
PublicAddr: routeToApp.PublicAddr, | ||
ClusterName: routeToApp.ClusterName, | ||
Name: routeToApp.Name, | ||
AWSRoleARN: routeToApp.AwsRoleArn, | ||
AzureIdentity: routeToApp.AzureIdentity, | ||
GCPServiceAccount: routeToApp.GcpServiceAccount, | ||
URI: routeToApp.Uri, | ||
TargetPort: int(routeToApp.TargetPort), | ||
} | ||
} | ||
|
||
func routeToAppToProto(routeToApp *tlsca.RouteToApp) *decisionpb.RouteToApp { | ||
if routeToApp == nil { | ||
return nil | ||
} | ||
|
||
return &decisionpb.RouteToApp{ | ||
SessionId: routeToApp.SessionID, | ||
PublicAddr: routeToApp.PublicAddr, | ||
ClusterName: routeToApp.ClusterName, | ||
Name: routeToApp.Name, | ||
AwsRoleArn: routeToApp.AWSRoleARN, | ||
AzureIdentity: routeToApp.AzureIdentity, | ||
GcpServiceAccount: routeToApp.GCPServiceAccount, | ||
Uri: routeToApp.URI, | ||
TargetPort: int32(routeToApp.TargetPort), | ||
} | ||
} | ||
|
||
func routeToDatabaseFromProto(routeToDatabase *decisionpb.RouteToDatabase) tlsca.RouteToDatabase { | ||
if routeToDatabase == nil { | ||
return tlsca.RouteToDatabase{} | ||
} | ||
|
||
return tlsca.RouteToDatabase{ | ||
ServiceName: routeToDatabase.ServiceName, | ||
Protocol: routeToDatabase.Protocol, | ||
Username: routeToDatabase.Username, | ||
Database: routeToDatabase.Database, | ||
Roles: routeToDatabase.Roles, | ||
} | ||
} | ||
|
||
func routeToDatabaseToProto(routeToDatabase *tlsca.RouteToDatabase) *decisionpb.RouteToDatabase { | ||
if routeToDatabase == nil { | ||
return nil | ||
} | ||
|
||
return &decisionpb.RouteToDatabase{ | ||
ServiceName: routeToDatabase.ServiceName, | ||
Protocol: routeToDatabase.Protocol, | ||
Username: routeToDatabase.Username, | ||
Database: routeToDatabase.Database, | ||
Roles: routeToDatabase.Roles, | ||
} | ||
} | ||
|
||
func resourceIDsToTypes(resourceIDs []*decisionpb.ResourceId) []types.ResourceID { | ||
if len(resourceIDs) == 0 { | ||
return nil | ||
} | ||
|
||
ret := make([]types.ResourceID, len(resourceIDs)) | ||
for i, r := range resourceIDs { | ||
ret[i] = types.ResourceID{ | ||
ClusterName: r.ClusterName, | ||
Kind: r.Kind, | ||
Name: r.Name, | ||
SubResourceName: r.SubResourceName, | ||
} | ||
} | ||
return ret | ||
} | ||
|
||
func resourceIDsFromTypes(resourceIDs []types.ResourceID) []*decisionpb.ResourceId { | ||
if len(resourceIDs) == 0 { | ||
return nil | ||
} | ||
|
||
ret := make([]*decisionpb.ResourceId, len(resourceIDs)) | ||
for i, r := range resourceIDs { | ||
ret[i] = &decisionpb.ResourceId{ | ||
ClusterName: r.ClusterName, | ||
Kind: r.Kind, | ||
Name: r.Name, | ||
SubResourceName: r.SubResourceName, | ||
} | ||
} | ||
return ret | ||
} | ||
|
||
func deviceExtensionsFromProto(exts *decisionpb.DeviceExtensions) tlsca.DeviceExtensions { | ||
if exts == nil { | ||
return tlsca.DeviceExtensions{} | ||
} | ||
|
||
return tlsca.DeviceExtensions{ | ||
DeviceID: exts.DeviceId, | ||
AssetTag: exts.AssetTag, | ||
CredentialID: exts.CredentialId, | ||
} | ||
} | ||
|
||
func deviceExtensionsToProto(exts *tlsca.DeviceExtensions) *decisionpb.DeviceExtensions { | ||
if exts == nil { | ||
return nil | ||
} | ||
|
||
return &decisionpb.DeviceExtensions{ | ||
DeviceId: exts.DeviceID, | ||
AssetTag: exts.AssetTag, | ||
CredentialId: exts.CredentialID, | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@fspmarshall these are very similar to the helpers in our shared branch, with the major exception that I'm passing tlsca.Identity around as a pointer instead of by value - the struct is too big to keep copying around IMO (despite what a large part of the codebase seems to do).
I also don't distinguish between zero and nil for structs within tlsca.Identity, as they aren't distinguished there either. Semantics should be alright in the existing system (for example we'll handle an "empty" DeviceExtensions just fine).