feat: add enterprise key for shared ports

f0ssel · f0ssel · commit cab9159940dc · 2024-01-29T18:24:33.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -56,6 +56,7 @@ import (
 	"github.com/coder/coder/v2/coderd/httpapi"
 	"github.com/coder/coder/v2/coderd/httpmw"
 	"github.com/coder/coder/v2/coderd/metricscache"
+	"github.com/coder/coder/v2/coderd/portsharing"
 	"github.com/coder/coder/v2/coderd/prometheusmetrics"
 	"github.com/coder/coder/v2/coderd/provisionerdserver"
 	"github.com/coder/coder/v2/coderd/rbac"
@@ -401,6 +402,7 @@ func New(options *Options) *API {
 	}
 
 	api.AppearanceFetcher.Store(&appearance.DefaultFetcher)
+	api.PortSharer.Store(&portsharing.DefaultPortSharer)
 	api.SiteHandler = site.New(&site.Options{
 		BinFS:             binFS,
 		BinHashes:         binHashes,
@@ -1104,6 +1106,7 @@ type API struct {
 	// AccessControlStore is a pointer to an atomic pointer since it is
 	// passed to dbauthz.
 	AccessControlStore *atomic.Pointer[dbauthz.AccessControlStore]
+	PortSharer         atomic.Pointer[portsharing.PortSharer]
 
 	HTTPAuth *HTTPAuthorizer
 
diff --git a/coderd/portsharing/portsharing.go b/coderd/portsharing/portsharing.go
@@ -0,0 +1,13 @@
+package portsharing
+
+type PortSharer interface {
+	Enabled() bool
+}
+
+type AGPLPortSharer struct{}
+
+func (AGPLPortSharer) Enabled() bool {
+	return true
+}
+
+var DefaultPortSharer PortSharer = AGPLPortSharer{}
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -52,6 +52,7 @@ const (
 	FeatureWorkspaceBatchActions      FeatureName = "workspace_batch_actions"
 	FeatureAccessControl              FeatureName = "access_control"
 	FeatureOAuth2Provider             FeatureName = "oauth2_provider"
+	FeatureSharedPorts                FeatureName = "shared_ports"
 )
 
 // FeatureNames must be kept in-sync with the Feature enum above.
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -15,6 +15,8 @@ import (
 	"time"
 
 	"github.com/coder/coder/v2/coderd/appearance"
+	agplportsharing "github.com/coder/coder/v2/coderd/portsharing"
+	"github.com/coder/coder/v2/enterprise/coderd/portsharing"
 
 	"golang.org/x/xerrors"
 	"tailscale.com/tailcfg"
@@ -533,6 +535,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 			codersdk.FeatureWorkspaceProxy:             true,
 			codersdk.FeatureUserRoleManagement:         true,
 			codersdk.FeatureAccessControl:              true,
+			codersdk.FeatureSharedPorts:                true,
 		})
 	if err != nil {
 		return err
@@ -690,6 +693,14 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 		}
 	}
 
+	if initial, changed, enabled := featureChanged(codersdk.FeatureSharedPorts); shouldUpdate(initial, changed, enabled) {
+		var ps agplportsharing.PortSharer = agplportsharing.DefaultPortSharer
+		if enabled {
+			ps = portsharing.NewEnterprisePortSharer()
+		}
+		api.AGPL.PortSharer.Store(&ps)
+	}
+
 	// External token encryption is soft-enforced
 	featureExternalTokenEncryption := entitlements.Features[codersdk.FeatureExternalTokenEncryption]
 	featureExternalTokenEncryption.Enabled = len(api.ExternalTokenEncryption) > 0
diff --git a/enterprise/coderd/portsharing/portsharing.go b/enterprise/coderd/portsharing/portsharing.go
@@ -0,0 +1,11 @@
+package portsharing
+
+type EnterprisePortSharer struct{}
+
+func NewEnterprisePortSharer() *EnterprisePortSharer {
+	return &EnterprisePortSharer{}
+}
+
+func (EnterprisePortSharer) Enabled() bool {
+	return true
+}

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ const (`
`52`	`52`	`FeatureWorkspaceBatchActions FeatureName = "workspace_batch_actions"`
`53`	`53`	`FeatureAccessControl FeatureName = "access_control"`
`54`	`54`	`FeatureOAuth2Provider FeatureName = "oauth2_provider"`
	`55`	`+ FeatureSharedPorts FeatureName = "shared_ports"`
`55`	`56`	`)`
`56`	`57`
`57`	`58`	`// FeatureNames must be kept in-sync with the Feature enum above.`