Skip to content

fix: use AlwaysEnable for licenses with all features #9808

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 2 commits into from
Sep 22, 2023
Merged

fix: use AlwaysEnable for licenses with all features #9808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ec9886
fix: use AlwaysEnable for licenses with all features
spikecurtis Sep 21, 2023
fb452aa
use dbtime.Now() intead of time.Now()
spikecurtis Sep 22, 2023
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
18 changes: 16 additions & 2 deletions enterprise/coderd/license/license.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ func Entitlements(
}

allFeatures := false
allFeaturesEntitlement := codersdk.EntitlementNotEntitled

// Here we loop through licenses to detect enabled features.
for _, l := range licenses {
Expand Down Expand Up @@ -117,14 +118,15 @@ func Entitlements(
}
default:
entitlements.Features[featureName] = codersdk.Feature{
Entitlement: entitlement,
Entitlement: maxEntitlement(entitlements.Features[featureName].Entitlement, entitlement),
Enabled: enablements[featureName] || featureName.AlwaysEnable(),
}
}
}

if claims.AllFeatures {
allFeatures = true
allFeaturesEntitlement = maxEntitlement(allFeaturesEntitlement, entitlement)
}
entitlements.RequireTelemetry = entitlements.RequireTelemetry || claims.RequireTelemetry
}
Expand All @@ -136,7 +138,8 @@ func Entitlements(
continue
}
feature := entitlements.Features[featureName]
feature.Entitlement = codersdk.EntitlementEntitled
feature.Entitlement = maxEntitlement(feature.Entitlement, allFeaturesEntitlement)
feature.Enabled = enablements[featureName] || featureName.AlwaysEnable()
entitlements.Features[featureName] = feature
}
}
Expand Down Expand Up @@ -324,3 +327,14 @@ func keyFunc(keys map[string]ed25519.PublicKey) func(*jwt.Token) (interface{}, e
return k, nil
}
}

// maxEntitlement is the "greater" entitlement between the given values
func maxEntitlement(e1, e2 codersdk.Entitlement) codersdk.Entitlement {
if e1 == codersdk.EntitlementEntitled || e2 == codersdk.EntitlementEntitled {
return codersdk.EntitlementEntitled
}
if e1 == codersdk.EntitlementGracePeriod || e2 == codersdk.EntitlementGracePeriod {
return codersdk.EntitlementGracePeriod
}
return codersdk.EntitlementNotEntitled
}
47 changes: 47 additions & 0 deletions enterprise/coderd/license/license_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,53 @@ func TestEntitlements(t *testing.T) {
}
})

t.Run("AllFeaturesAlwaysEnable", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
Exp: dbtime.Now().Add(time.Hour),
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
AllFeatures: true,
}),
})
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, empty)
require.NoError(t, err)
require.True(t, entitlements.HasLicense)
require.False(t, entitlements.Trial)
for _, featureName := range codersdk.FeatureNames {
if featureName == codersdk.FeatureUserLimit {
continue
}
feature := entitlements.Features[featureName]
require.Equal(t, featureName.AlwaysEnable(), feature.Enabled)
require.Equal(t, codersdk.EntitlementEntitled, feature.Entitlement)
}
})

t.Run("AllFeaturesGrace", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
Exp: dbtime.Now().Add(time.Hour),
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
AllFeatures: true,
GraceAt: dbtime.Now().Add(-time.Hour),
ExpiresAt: dbtime.Now().Add(time.Hour),
}),
})
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
require.NoError(t, err)
require.True(t, entitlements.HasLicense)
require.False(t, entitlements.Trial)
for _, featureName := range codersdk.FeatureNames {
if featureName == codersdk.FeatureUserLimit {
continue
}
require.True(t, entitlements.Features[featureName].Enabled)
require.Equal(t, codersdk.EntitlementGracePeriod, entitlements.Features[featureName].Entitlement)
}
})

t.Run("MultipleReplicasNoLicense", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
Expand Down