Finish backend

ammario · ammario · commit afd8fb98030f · 2022-12-03T05:25:26.000Z
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -3308,7 +3308,7 @@ func (q *fakeQuerier) GetServiceBanner(_ context.Context) (string, error) {
 		return "", sql.ErrNoRows
 	}
 
-	return string(q.lastUpdateCheck), nil
+	return string(q.serviceBanner), nil
 }
 
 func (q *fakeQuerier) InsertLicense(
diff --git a/codersdk/servicebanner.go b/codersdk/servicebanner.go
@@ -1,7 +1,38 @@
 package codersdk
 
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+)
+
 type ServiceBanner struct {
 	Enabled         bool   `json:"enabled"`
 	Message         string `json:"message,omitempty"`
 	BackgroundColor string `json:"background_color,omitempty"`
 }
+
+func (c *Client) ServiceBanner(ctx context.Context) (*ServiceBanner, error) {
+	res, err := c.Request(ctx, http.MethodGet, "/api/v2/service-banner", nil)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+	if res.StatusCode != http.StatusOK {
+		return nil, readBodyAsError(res)
+	}
+	var b ServiceBanner
+	return &b, json.NewDecoder(res.Body).Decode(&b)
+}
+
+func (c *Client) SetServiceBanner(ctx context.Context, s *ServiceBanner) error {
+	res, err := c.Request(ctx, http.MethodPut, "/api/v2/service-banner", s)
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+	if res.StatusCode != http.StatusOK {
+		return readBodyAsError(res)
+	}
+	return nil
+}
diff --git a/enterprise/coderd/servicebanner.go b/enterprise/coderd/servicebanner.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 
 	"github.com/coder/coder/coderd/httpapi"
+	"github.com/coder/coder/coderd/rbac"
 	"github.com/coder/coder/codersdk"
 )
 
@@ -42,7 +43,9 @@ func (api *API) serviceBanner(rw http.ResponseWriter, r *http.Request) {
 	err = json.Unmarshal([]byte(serviceBannerJSON), &serviceBanner)
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-			Message: fmt.Sprintf("unmarshal json: %+v", err),
+			Message: fmt.Sprintf(
+				"unmarshal json: %+v, raw: %s", err, serviceBannerJSON,
+			),
 		})
 		return
 	}
@@ -53,6 +56,13 @@ func (api *API) serviceBanner(rw http.ResponseWriter, r *http.Request) {
 func (api *API) putServiceBanner(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
+	if !api.AGPL.Authorize(r, rbac.ActionUpdate, rbac.ResourceDeploymentConfig) {
+		httpapi.Write(ctx, rw, http.StatusForbidden, codersdk.Response{
+			Message: "Insufficient permissions to update service banner",
+		})
+		return
+	}
+
 	var serviceBanner codersdk.ServiceBanner
 	if !httpapi.Read(ctx, rw, r, &serviceBanner) {
 		return
diff --git a/enterprise/coderd/servicebanner_test.go b/enterprise/coderd/servicebanner_test.go
@@ -2,9 +2,14 @@ package coderd_test
 
 import (
 	"context"
+	"errors"
+	"net/http"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/coderd/coderdtest"
+	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/enterprise/coderd/coderdenttest"
 	"github.com/coder/coder/testutil"
 )
@@ -15,10 +20,41 @@ func TestServiceBanners(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 	defer cancel()
 
-	client := coderdenttest.New(t, &coderdenttest.Options{})
+	adminClient := coderdenttest.New(t, &coderdenttest.Options{})
+
+	adminUser := coderdtest.CreateFirstUser(t, adminClient)
 
-	user := coderdtest.CreateFirstUser(t, client)
-	coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+	// Even without a license, the banner should return as disabled.
+	sb, err := adminClient.ServiceBanner(ctx)
+	require.NoError(t, err)
+	require.False(t, sb.Enabled)
+
+	coderdenttest.AddLicense(t, adminClient, coderdenttest.LicenseOptions{
 		ServiceBanners: true,
 	})
+
+	// Default state
+	sb, err = adminClient.ServiceBanner(ctx)
+	require.NoError(t, err)
+	require.False(t, sb.Enabled)
+
+	basicUserClient := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)
+
+	// Regular user should be unable to set the banner
+	sb.Enabled = true
+	err = basicUserClient.SetServiceBanner(ctx, sb)
+	require.Error(t, err)
+	var sdkError *codersdk.Error
+	require.True(t, errors.As(err, &sdkError))
+	require.Equal(t, http.StatusForbidden, sdkError.StatusCode())
+
+	// But an admin can
+	wantBanner := sb
+	wantBanner.Enabled = true
+	wantBanner.Message = "Hey"
+	err = adminClient.SetServiceBanner(ctx, wantBanner)
+	require.NoError(t, err)
+	gotBanner, err := adminClient.ServiceBanner(ctx)
+	require.NoError(t, err)
+	require.Equal(t, wantBanner, gotBanner)
 }

Original file line number	Diff line number	Diff line change
`@@ -3308,7 +3308,7 @@ func (q *fakeQuerier) GetServiceBanner(_ context.Context) (string, error) {`
`3308`	`3308`	`return "", sql.ErrNoRows`
`3309`	`3309`	`}`
`3310`	`3310`
`3311`		`- return string(q.lastUpdateCheck), nil`
	`3311`	`+ return string(q.serviceBanner), nil`
`3312`	`3312`	`}`
`3313`	`3313`
`3314`	`3314`	`func (q *fakeQuerier) InsertLicense(`