fix me filter

ethanndickson · ethanndickson · commit 493ffa798f46 · 2025-07-02T05:43:51.000Z
diff --git a/coderd/searchquery/search.go b/coderd/searchquery/search.go
@@ -67,7 +67,7 @@ func AuditLogs(ctx context.Context, db database.Store, query string) (database.G
 	return filter, parser.Errors
 }
 
-func ConnectionLogs(ctx context.Context, db database.Store, query string) (database.GetConnectionLogsOffsetParams, []codersdk.ValidationError) {
+func ConnectionLogs(ctx context.Context, db database.Store, query string, apiKey database.APIKey) (database.GetConnectionLogsOffsetParams, []codersdk.ValidationError) {
 	// Always lowercase for all searches.
 	query = strings.ToLower(query)
 	values, errors := searchTerms(query, func(term string, values url.Values) error {
@@ -92,6 +92,17 @@ func ConnectionLogs(ctx context.Context, db database.Store, query string) (datab
 		ConnectionID:        parser.UUID(values, uuid.Nil, "connection_id"),
 		Status:              string(httpapi.ParseCustom(parser, values, "", "status", httpapi.ParseEnum[database.ConnectionStatus])),
 	}
+
+	if filter.Username == "me" {
+		filter.UserID = apiKey.UserID
+		filter.Username = ""
+	}
+
+	if filter.WorkspaceOwner == "me" {
+		filter.WorkspaceOwnerID = apiKey.UserID
+		filter.WorkspaceOwner = ""
+	}
+
 	parser.ErrorExcessParams(values)
 	return filter, parser.Errors
 }
diff --git a/coderd/searchquery/search_test.go b/coderd/searchquery/search_test.go
@@ -405,47 +405,68 @@ func TestSearchAudit(t *testing.T) {
 
 func TestSearchConnectionLogs(t *testing.T) {
 	t.Parallel()
+	t.Run("All", func(t *testing.T) {
+		t.Parallel()
 
-	orgID := uuid.New()
-	workspaceOwnerID := uuid.New()
-	workspaceID := uuid.New()
-	connectionID := uuid.New()
+		orgID := uuid.New()
+		workspaceOwnerID := uuid.New()
+		workspaceID := uuid.New()
+		connectionID := uuid.New()
 
-	db, _ := dbtestutil.NewDB(t)
-	dbgen.Organization(t, db, database.Organization{
-		ID:   orgID,
-		Name: "testorg",
-	})
-	dbgen.User(t, db, database.User{
-		ID:       workspaceOwnerID,
-		Username: "testowner",
-		Email:    "owner@example.com",
+		db, _ := dbtestutil.NewDB(t)
+		dbgen.Organization(t, db, database.Organization{
+			ID:   orgID,
+			Name: "testorg",
+		})
+		dbgen.User(t, db, database.User{
+			ID:       workspaceOwnerID,
+			Username: "testowner",
+			Email:    "owner@example.com",
+		})
+
+		query := fmt.Sprintf(`organization:testorg workspace_owner:testowner `+
+			`workspace_owner_email:owner@example.com type:port_forwarding username:testuser `+
+			`user_email:test@example.com started_after:"2023-01-01T00:00:00Z" `+
+			`started_before:"2023-01-16T12:00:00+12:00" workspace_id:%s connection_id:%s status:connected`,
+			workspaceID.String(), connectionID.String())
+
+		values, errs := searchquery.ConnectionLogs(context.Background(), db, query, database.APIKey{})
+		require.Len(t, errs, 0)
+
+		expected := database.GetConnectionLogsOffsetParams{
+			OrganizationID:      orgID,
+			WorkspaceOwner:      "testowner",
+			WorkspaceOwnerEmail: "owner@example.com",
+			Type:                string(database.ConnectionTypePortForwarding),
+			Username:            "testuser",
+			UserEmail:           "test@example.com",
+			StartedAfter:        time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC),
+			StartedBefore:       time.Date(2023, 1, 16, 0, 0, 0, 0, time.UTC),
+			WorkspaceID:         workspaceID,
+			ConnectionID:        connectionID,
+			Status:              string(database.ConnectionStatusConnected),
+		}
+
+		require.Equal(t, expected, values)
 	})
 
-	query := fmt.Sprintf(`organization:testorg workspace_owner:testowner `+
-		`workspace_owner_email:owner@example.com type:port_forwarding username:testuser `+
-		`user_email:test@example.com started_after:"2023-01-01T00:00:00Z" `+
-		`started_before:"2023-01-16T12:00:00+12:00" workspace_id:%s connection_id:%s status:connected`,
-		workspaceID.String(), connectionID.String())
+	t.Run("Me", func(t *testing.T) {
+		t.Parallel()
+
+		userID := uuid.New()
+		db, _ := dbtestutil.NewDB(t)
 
-	values, errs := searchquery.ConnectionLogs(context.Background(), db, query)
-	require.Len(t, errs, 0)
+		query := `username:me workspace_owner:me`
+		values, errs := searchquery.ConnectionLogs(context.Background(), db, query, database.APIKey{UserID: userID})
+		require.Len(t, errs, 0)
 
-	expected := database.GetConnectionLogsOffsetParams{
-		OrganizationID:      orgID,
-		WorkspaceOwner:      "testowner",
-		WorkspaceOwnerEmail: "owner@example.com",
-		Type:                string(database.ConnectionTypePortForwarding),
-		Username:            "testuser",
-		UserEmail:           "test@example.com",
-		StartedAfter:        time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC),
-		StartedBefore:       time.Date(2023, 1, 16, 0, 0, 0, 0, time.UTC),
-		WorkspaceID:         workspaceID,
-		ConnectionID:        connectionID,
-		Status:              string(database.ConnectionStatusConnected),
-	}
+		expected := database.GetConnectionLogsOffsetParams{
+			UserID:           userID,
+			WorkspaceOwnerID: userID,
+		}
 
-	require.Equal(t, expected, values)
+		require.Equal(t, expected, values)
+	})
 }
 
 func TestSearchUsers(t *testing.T) {
diff --git a/enterprise/coderd/connectionlog.go b/enterprise/coderd/connectionlog.go
@@ -37,7 +37,7 @@ func (api *API) connectionLogs(rw http.ResponseWriter, r *http.Request) {
 	}
 
 	queryStr := r.URL.Query().Get("q")
-	filter, errs := searchquery.ConnectionLogs(ctx, api.Database, queryStr)
+	filter, errs := searchquery.ConnectionLogs(ctx, api.Database, queryStr, apiKey)
 	if len(errs) > 0 {
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 			Message:     "Invalid connection search query.",
@@ -50,16 +50,6 @@ func (api *API) connectionLogs(rw http.ResponseWriter, r *http.Request) {
 	// #nosec G115 - Safe conversion as pagination limit is expected to be within int32 range
 	filter.LimitOpt = int32(page.Limit)
 
-	if filter.Username == "me" {
-		filter.UserID = apiKey.UserID
-		filter.Username = ""
-	}
-
-	if filter.WorkspaceOwner == "me" {
-		filter.WorkspaceOwnerID = apiKey.UserID
-		filter.WorkspaceOwner = ""
-	}
-
 	dblogs, err := api.Database.GetConnectionLogsOffset(ctx, filter)
 	if dbauthz.IsNotAuthorizedError(err) {
 		httpapi.Forbidden(rw)
