fix license woes

sreya · sreya · commit 262bb4525ab5 · 2022-10-10T19:50:33.000Z
diff --git a/enterprise/cli/features_test.go b/enterprise/cli/features_test.go
@@ -57,7 +57,7 @@ func TestFeaturesList(t *testing.T) {
 		var entitlements codersdk.Entitlements
 		err := json.Unmarshal(buf.Bytes(), &entitlements)
 		require.NoError(t, err, "unmarshal JSON output")
-		assert.Len(t, entitlements.Features, 5)
+		assert.Len(t, entitlements.Features, 6)
 		assert.Empty(t, entitlements.Warnings)
 		assert.Equal(t, codersdk.EntitlementNotEntitled,
 			entitlements.Features[codersdk.FeatureUserLimit].Entitlement)
diff --git a/enterprise/coderd/coderd_test.go b/enterprise/coderd/coderd_test.go
@@ -41,8 +41,9 @@ func TestEntitlements(t *testing.T) {
 		})
 		_ = coderdtest.CreateFirstUser(t, client)
 		coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			UserLimit: 100,
-			AuditLog:  true,
+			UserLimit:   100,
+			AuditLog:    true,
+			RBACEnabled: true,
 		})
 		res, err := client.Entitlements(context.Background())
 		require.NoError(t, err)
diff --git a/enterprise/coderd/coderdenttest/coderdenttest.go b/enterprise/coderd/coderdenttest/coderdenttest.go
@@ -135,9 +135,9 @@ func GenerateLicense(t *testing.T, options LicenseOptions) string {
 		workspaceQuota = 1
 	}
 
-	groups := int64(0)
+	rbac := int64(0)
 	if options.RBACEnabled {
-		groups = 1
+		rbac = 1
 	}
 
 	c := &license.Claims{
@@ -159,7 +159,7 @@ func GenerateLicense(t *testing.T, options LicenseOptions) string {
 			BrowserOnly:    browserOnly,
 			SCIM:           scim,
 			WorkspaceQuota: workspaceQuota,
-			RBAC:           groups,
+			RBAC:           rbac,
 		},
 	}
 	tok := jwt.NewWithClaims(jwt.SigningMethodEdDSA, c)
diff --git a/enterprise/coderd/license/license.go b/enterprise/coderd/license/license.go
@@ -96,6 +96,12 @@ func Entitlements(ctx context.Context, db database.Store, logger slog.Logger, ke
 				Enabled:     enablements[codersdk.FeatureWorkspaceQuota],
 			}
 		}
+		if claims.Features.RBAC > 0 {
+			entitlements.Features[codersdk.FeatureRBAC] = codersdk.Feature{
+				Entitlement: entitlement,
+				Enabled:     enablements[codersdk.FeatureRBAC],
+			}
+		}
 		if claims.AllFeatures {
 			allFeatures = true
 		}
diff --git a/enterprise/coderd/scim.go b/enterprise/coderd/scim.go
@@ -33,22 +33,6 @@ func (api *API) scimEnabledMW(next http.Handler) http.Handler {
 	})
 }
 
-// TODO reduce the duplication across all of these.
-func (api *API) rbacEnabledMW(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-		api.entitlementsMu.RLock()
-		rbac := api.entitlements.rbac
-		api.entitlementsMu.RUnlock()
-
-		if rbac == codersdk.EntitlementNotEntitled {
-			httpapi.RouteNotFound(rw)
-			return
-		}
-
-		next.ServeHTTP(rw, r)
-	})
-}
-
 func (api *API) scimVerifyAuthHeader(r *http.Request) bool {
 	hdr := []byte(r.Header.Get("Authorization"))
 
diff --git a/enterprise/coderd/templates.go b/enterprise/coderd/templates.go
@@ -244,3 +244,19 @@ func convertSDKTemplateRole(role codersdk.TemplateRole) []rbac.Action {
 
 	return nil
 }
+
+// TODO reduce the duplication across all of these.
+func (api *API) rbacEnabledMW(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+		api.entitlementsMu.RLock()
+		rbac := api.entitlements.Features[codersdk.FeatureRBAC].Enabled
+		api.entitlementsMu.RUnlock()
+
+		if !rbac {
+			httpapi.RouteNotFound(rw)
+			return
+		}
+
+		next.ServeHTTP(rw, r)
+	})
+}

Original file line number	Diff line number	Diff line change
`@@ -135,9 +135,9 @@ func GenerateLicense(t *testing.T, options LicenseOptions) string {`
`135`	`135`	`workspaceQuota = 1`
`136`	`136`	`}`
`137`	`137`
`138`		`- groups := int64(0)`
	`138`	`+ rbac := int64(0)`
`139`	`139`	`if options.RBACEnabled {`
`140`		`- groups = 1`
	`140`	`+ rbac = 1`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`c := &license.Claims{`
`@@ -159,7 +159,7 @@ func GenerateLicense(t *testing.T, options LicenseOptions) string {`
`159`	`159`	`BrowserOnly: browserOnly,`
`160`	`160`	`SCIM: scim,`
`161`	`161`	`WorkspaceQuota: workspaceQuota,`
`162`		`- RBAC: groups,`
	`162`	`+ RBAC: rbac,`
`163`	`163`	`},`
`164`	`164`	`}`
`165`	`165`	`tok := jwt.NewWithClaims(jwt.SigningMethodEdDSA, c)`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,12 @@ func Entitlements(ctx context.Context, db database.Store, logger slog.Logger, ke`
`96`	`96`	`Enabled: enablements[codersdk.FeatureWorkspaceQuota],`
`97`	`97`	`}`
`98`	`98`	`}`
	`99`	`+ if claims.Features.RBAC > 0 {`
	`100`	`+ entitlements.Features[codersdk.FeatureRBAC] = codersdk.Feature{`
	`101`	`+ Entitlement: entitlement,`
	`102`	`+ Enabled: enablements[codersdk.FeatureRBAC],`
	`103`	`+ }`
	`104`	`+ }`
`99`	`105`	`if claims.AllFeatures {`
`100`	`106`	`allFeatures = true`
`101`	`107`	`}`