User latency tests

coder · mtojek · Jul 31, 2023 · Jul 28, 2023 · Jul 31, 2023 · Jul 31, 2023
commit 08f243da2cac9236383bd258d17dbd8370477a0e
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -1205,7 +1205,6 @@ func (q *querier) GetTemplateDailyInsights(ctx context.Context, arg database.Get
 			return nil, err
 		}
 	}
-
 	if len(arg.TemplateIDs) == 0 {
 		if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceTemplate.All()); err != nil {
 			return nil, err
@@ -1225,7 +1224,6 @@ func (q *querier) GetTemplateInsights(ctx context.Context, arg database.GetTempl
 			return database.GetTemplateInsightsRow{}, err
 		}
 	}
-
 	if len(arg.TemplateIDs) == 0 {
 		if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceTemplate.All()); err != nil {
 			return database.GetTemplateInsightsRow{}, err
@@ -1401,8 +1399,20 @@ func (q *querier) GetUserCount(ctx context.Context) (int64, error) {
 }
 
 func (q *querier) GetUserLatencyInsights(ctx context.Context, arg database.GetUserLatencyInsightsParams) ([]database.GetUserLatencyInsightsRow, error) {
-	if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceSystem); err != nil {
-		return nil, err
+	for _, templateID := range arg.TemplateIDs {
+		template, err := q.db.GetTemplateByID(ctx, templateID)
+		if err != nil {
+			return nil, err
+		}
+
+		if err := q.authorizeContext(ctx, rbac.ActionUpdate, template); err != nil {
+			return nil, err
+		}
+	}
+	if len(arg.TemplateIDs) == 0 {
+		if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceTemplate.All()); err != nil {
+			return nil, err
+		}
 	}
 	return q.db.GetUserLatencyInsights(ctx, arg)
 }

diff --git a/coderd/insights.go b/coderd/insights.go
@@ -64,10 +64,6 @@ func (api *API) deploymentDAUs(rw http.ResponseWriter, r *http.Request) {
 // @Router /insights/user-latency [get]
 func (api *API) insightsUserLatency(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
-	if !api.Authorize(r, rbac.ActionRead, rbac.ResourceDeploymentValues) {
-		httpapi.Forbidden(rw)
-		return
-	}
 
 	p := httpapi.NewQueryParamParser().
 		Required("start_time").
@@ -100,6 +96,12 @@ func (api *API) insightsUserLatency(rw http.ResponseWriter, r *http.Request) {
 		TemplateIDs: templateIDs,
 	})
 	if err != nil {
+		if httpapi.Is404Error(err) {
+			httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
+				Message: "Template not found or forbidden access.",
+			})
+			return
+		}
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Internal error fetching user latency.",
 			Detail:  err.Error(),

diff --git a/coderd/insights_test.go b/coderd/insights_test.go
@@ -383,7 +383,7 @@ func TestTemplateInsights_BadRequest(t *testing.T) {
 	assert.Error(t, err, "want error for bad interval")
 }
 
-func TestTemplateInsightsRBAC(t *testing.T) {
+func TestTemplateInsights_RBAC(t *testing.T) {
 	t.Parallel()
 
 	y, m, d := time.Now().UTC().Date()
@@ -458,3 +458,76 @@ func TestTemplateInsightsRBAC(t *testing.T) {
 		})
 	}
 }
+
+func TestUserLatencyInsights_RBAC(t *testing.T) {
+	t.Parallel()
+
+	y, m, d := time.Now().UTC().Date()
+	today := time.Date(y, m, d, 0, 0, 0, 0, time.UTC)
+
+	type test struct {
+		interval codersdk.InsightsReportInterval
+	}
+
+	tests := []test{
+		{codersdk.InsightsReportIntervalDay},
+		{""},
+	}
+
+	for _, tt := range tests {
+		tt := tt
+		t.Run(fmt.Sprintf("with interval=%q", tt.interval), func(t *testing.T) {
+			t.Parallel()
+
+			t.Run("AsOwner", func(t *testing.T) {
+				t.Parallel()
+
+				client := coderdtest.New(t, &coderdtest.Options{})
+				_ = coderdtest.CreateFirstUser(t, client)
+
+				ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
+				defer cancel()
+
+				_, err := client.UserLatencyInsights(ctx, codersdk.UserLatencyInsightsRequest{
+					StartTime: today,
+					EndTime:   time.Now().UTC().Truncate(time.Hour).Add(time.Hour), // Round up to include the current hour.
+				})
+				require.NoError(t, err)
+			})
+			t.Run("AsTemplateAdmin", func(t *testing.T) {
+				t.Parallel()
+
+				client := coderdtest.New(t, &coderdtest.Options{})
+				admin := coderdtest.CreateFirstUser(t, client)
+
+				templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin())
+
+				ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
+				defer cancel()
+
+				_, err := templateAdmin.UserLatencyInsights(ctx, codersdk.UserLatencyInsightsRequest{
+					StartTime: today,
+					EndTime:   time.Now().UTC().Truncate(time.Hour).Add(time.Hour), // Round up to include the current hour.
+				})
+				require.NoError(t, err)
+			})
+			t.Run("AsRegularUser", func(t *testing.T) {
+				t.Parallel()
+
+				client := coderdtest.New(t, &coderdtest.Options{})
+				admin := coderdtest.CreateFirstUser(t, client)
+
+				regular, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
+
+				ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
+				defer cancel()
+
+				_, err := regular.UserLatencyInsights(ctx, codersdk.UserLatencyInsightsRequest{
+					StartTime: today,
+					EndTime:   time.Now().UTC().Truncate(time.Hour).Add(time.Hour), // Round up to include the current hour.
+				})
+				require.Error(t, err)
+			})
+		})
+	}
+}