Skip to content

[v17] Add ClientIPRestrictions entitlement #60696

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Nov 4, 2025
Merged

[v17] Add ClientIPRestrictions entitlement #60696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30116af
Add `ClientIPRestrictions` entitlement (#60053)
mcbattirola Oct 17, 2025
71883e3
Merge branch 'branch/v17' of github.com:gravitational/teleport into m…
mcbattirola Oct 31, 2025
2bc1eb3
Merge branch 'branch/v17' into mcbattirola/v17/cir--entitlement
mcbattirola Nov 3, 2025
39e4efa
Merge branch 'branch/v17' into mcbattirola/v17/cir--entitlement
mcbattirola Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,108 changes: 1,077 additions & 1,031 deletions api/client/proto/authservice.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions api/proto/teleport/legacy/client/proto/authservice.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,8 @@ message Features {
bytes CloudAnonymizationKey = 37 [(gogoproto.jsontag) = "cloud_anonymization_key,omitempty"];
// AccessGraphDemoMode enables the ability to opt-in to a demo mode of Access Graph with limited features.
bool AccessGraphDemoMode = 38 [(gogoproto.jsontag) = "access_graph_demo_mode,omitempty"];
// ClientIPRestrictions allows Cloud users to setup a client IP allowlist
bool ClientIPRestrictions = 39 [(gogoproto.jsontag) = "client_ip_restrictions,omitempty"];
}

// EntitlementInfo is the state and limits of a particular entitlement
Expand Down
2 changes: 2 additions & 0 deletions entitlements/entitlements.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,15 @@ const (
UsageReporting EntitlementKind = "UsageReporting"
LicenseAutoUpdate EntitlementKind = "LicenseAutoUpdate"
AccessGraphDemoMode EntitlementKind = "AccessGraphDemoMode"
ClientIPRestrictions EntitlementKind = "ClientIPRestrictions"
)

// AllEntitlements returns all Entitlements; should be 1:1 with the const declared above.
var AllEntitlements = []EntitlementKind{
AccessLists, AccessMonitoring, AccessRequests, App, CloudAuditLogRetention, DB, Desktop, DeviceTrust,
ExternalAuditStorage, FeatureHiding, HSM, Identity, JoinActiveSessions, K8s, MobileDeviceManagement, OIDC, OktaSCIM,
OktaUserSync, Policy, SAML, SessionLocks, UnrestrictedManagedUpdates, UpsellAlert, UsageReporting, LicenseAutoUpdate, AccessGraphDemoMode,
ClientIPRestrictions,
}

// BackfillFeatures ensures entitlements are backwards compatible.
Expand Down
4 changes: 4 additions & 0 deletions entitlements/entitlements_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ func TestBackfillFeatures(t *testing.T) {
string(LicenseAutoUpdate): {Enabled: true},
string(AccessGraphDemoMode): {Enabled: true},
string(UnrestrictedManagedUpdates): {Enabled: true},
string(ClientIPRestrictions): {Enabled: true},
},
},
expected: map[string]*proto.EntitlementInfo{
Expand Down Expand Up @@ -122,6 +123,7 @@ func TestBackfillFeatures(t *testing.T) {
string(LicenseAutoUpdate): {Enabled: true},
string(AccessGraphDemoMode): {Enabled: true},
string(UnrestrictedManagedUpdates): {Enabled: true},
string(ClientIPRestrictions): {Enabled: true},
},
},
{
Expand Down Expand Up @@ -200,6 +202,7 @@ func TestBackfillFeatures(t *testing.T) {
string(LicenseAutoUpdate): {Enabled: false},
string(AccessGraphDemoMode): {Enabled: false},
string(UnrestrictedManagedUpdates): {Enabled: false},
string(ClientIPRestrictions): {Enabled: false},
},
},
{
Expand Down Expand Up @@ -275,6 +278,7 @@ func TestBackfillFeatures(t *testing.T) {
string(LicenseAutoUpdate): {Enabled: false},
string(AccessGraphDemoMode): {Enabled: false},
string(UnrestrictedManagedUpdates): {Enabled: false},
string(ClientIPRestrictions): {Enabled: false},
// Identity off, fields false
string(Identity): {Enabled: false},
string(SessionLocks): {Enabled: false},
Expand Down
2 changes: 2 additions & 0 deletions lib/modules/modules_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ func TestFeatures_ToProto(t *testing.T) {
string(entitlements.LicenseAutoUpdate): {Enabled: true},
string(entitlements.AccessGraphDemoMode): {Enabled: true},
string(entitlements.UnrestrictedManagedUpdates): {Enabled: true},
string(entitlements.ClientIPRestrictions): {Enabled: true},
},
// Legacy Fields; remove in v18
Kubernetes: true,
Expand Down Expand Up @@ -237,6 +238,7 @@ func TestFeatures_ToProto(t *testing.T) {
entitlements.LicenseAutoUpdate: {Enabled: true, Limit: 0},
entitlements.AccessGraphDemoMode: {Enabled: true, Limit: 0},
entitlements.UnrestrictedManagedUpdates: {Enabled: true, Limit: 0},
entitlements.ClientIPRestrictions: {Enabled: true, Limit: 0},
},
}

Expand Down
8 changes: 8 additions & 0 deletions lib/web/apiserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4987,6 +4987,7 @@ func TestGetWebConfig_WithEntitlements(t *testing.T) {
string(entitlements.LicenseAutoUpdate): {Enabled: false},
string(entitlements.AccessGraphDemoMode): {Enabled: false},
string(entitlements.UnrestrictedManagedUpdates): {Enabled: false},
string(entitlements.ClientIPRestrictions): {Enabled: false},
},
TunnelPublicAddress: "",
RecoveryCodesEnabled: false,
Expand Down Expand Up @@ -5174,6 +5175,7 @@ func TestGetWebConfig_LegacyFeatureLimits(t *testing.T) {
string(entitlements.LicenseAutoUpdate): {Enabled: false},
string(entitlements.AccessGraphDemoMode): {Enabled: false},
string(entitlements.UnrestrictedManagedUpdates): {Enabled: false},
string(entitlements.ClientIPRestrictions): {Enabled: false},
},
PlayableDatabaseProtocols: player.SupportedDatabaseProtocols,
IsPolicyRoleVisualizerEnabled: true,
Expand Down Expand Up @@ -11173,6 +11175,7 @@ func Test_setEntitlementsWithLegacyLogic(t *testing.T) {
string(entitlements.LicenseAutoUpdate): {Enabled: true, Limit: 99},
string(entitlements.AccessGraphDemoMode): {Enabled: true, Limit: 99},
string(entitlements.UnrestrictedManagedUpdates): {Enabled: true, Limit: 99},
string(entitlements.ClientIPRestrictions): {Enabled: true, Limit: 99},
},
},
expected: &webclient.WebConfig{
Expand Down Expand Up @@ -11237,6 +11240,7 @@ func Test_setEntitlementsWithLegacyLogic(t *testing.T) {
string(entitlements.LicenseAutoUpdate): {Enabled: true, Limit: 99},
string(entitlements.AccessGraphDemoMode): {Enabled: true, Limit: 99},
string(entitlements.UnrestrictedManagedUpdates): {Enabled: true, Limit: 99},
string(entitlements.ClientIPRestrictions): {Enabled: true, Limit: 99},
},
},
},
Expand Down Expand Up @@ -11340,6 +11344,7 @@ func Test_setEntitlementsWithLegacyLogic(t *testing.T) {
string(entitlements.LicenseAutoUpdate): {Enabled: false},
string(entitlements.AccessGraphDemoMode): {Enabled: false},
string(entitlements.UnrestrictedManagedUpdates): {Enabled: false},
string(entitlements.ClientIPRestrictions): {Enabled: false},

// set to equivalent legacy feature
string(entitlements.ExternalAuditStorage): {Enabled: true},
Expand Down Expand Up @@ -11470,6 +11475,8 @@ func Test_setEntitlementsWithLegacyLogic(t *testing.T) {
string(entitlements.SAML): {Enabled: true},
string(entitlements.AccessGraphDemoMode): {Enabled: false},
string(entitlements.UnrestrictedManagedUpdates): {Enabled: false},
string(entitlements.ClientIPRestrictions): {Enabled: false},

// set to legacy feature "IsIGSEnabled"; false so set value and keep limits
string(entitlements.AccessLists): {Enabled: true, Limit: 88},
string(entitlements.AccessMonitoring): {Enabled: true, Limit: 88},
Expand Down Expand Up @@ -11581,6 +11588,7 @@ func Test_setEntitlementsWithLegacyLogic(t *testing.T) {
string(entitlements.LicenseAutoUpdate): {Enabled: false},
string(entitlements.AccessGraphDemoMode): {Enabled: false},
string(entitlements.UnrestrictedManagedUpdates): {Enabled: false},
string(entitlements.ClientIPRestrictions): {Enabled: false},
},
},
},
Expand Down
4 changes: 3 additions & 1 deletion web/packages/teleport/src/entitlement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ type entitlement =
| 'SessionLocks'
| 'UnrestrictedManagedUpdates'
| 'UpsellAlert'
| 'UsageReporting';
| 'UsageReporting'
| 'ClientIPRestrictions';

export const defaultEntitlements: Record<
entitlement,
Expand Down Expand Up @@ -73,4 +74,5 @@ export const defaultEntitlements: Record<
UnrestrictedManagedUpdates: { enabled: false, limit: 0 },
UpsellAlert: { enabled: false, limit: 0 },
UsageReporting: { enabled: false, limit: 0 },
ClientIPRestrictions: { enabled: false, limit: 0 },
};
Loading