Skip to content

fix(API, ETAC): Added ETAC to entity APIs BED-7403 #2382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mvlipka wants to merge 13 commits into
base: main
Choose a base branch
from
+2,030 −181
Open

fix(API, ETAC): Added ETAC to entity APIs BED-7403 #2382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7c5a167
BED-7403 added ETAC to entity APIs
mvlipka Feb 19, 2026
4a62710
BED-7403 existing tests pass
mvlipka Feb 19, 2026
003b0d7
BED-7403 error when environmentid not found
mvlipka Feb 19, 2026
15f70f9
BED-7403 added error logging
mvlipka Feb 19, 2026
8eb3de0
BED-7403 fix attr in logging
mvlipka Feb 19, 2026
bf8c5b2
BED-7403 fix linting
mvlipka Feb 19, 2026
8350398
Merge branch 'main' into BED-7403/Entity-API-ETAC
mvlipka Feb 19, 2026
7f879c6
BED-7403 updated tests to include ETAC testing
mvlipka Feb 23, 2026
52dc4c3
BED-7403 updated azure tests with etac
mvlipka Feb 23, 2026
c0d63c5
BED-7403 naming
mvlipka Feb 23, 2026
ecae846
BED-7403 slog lint
mvlipka Feb 23, 2026
58ff792
BED-7403 slog lint
mvlipka Feb 23, 2026
278f5a5
Merge branch 'main' into BED-7403/Entity-API-ETAC
mvlipka Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions cmd/api/src/api/v2/ad_entity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,15 @@ package v2

import (
"fmt"
"log/slog"
"net/http"

"github.com/specterops/bloodhound/cmd/api/src/api"
"github.com/specterops/bloodhound/cmd/api/src/auth"
bhCtx "github.com/specterops/bloodhound/cmd/api/src/ctx"
adAnalysis "github.com/specterops/bloodhound/packages/go/analysis/ad"
"github.com/specterops/bloodhound/packages/go/analysis/tiering"
"github.com/specterops/bloodhound/packages/go/bhlog/attr"
"github.com/specterops/bloodhound/packages/go/graphschema/ad"
"github.com/specterops/bloodhound/packages/go/graphschema/common"
"github.com/specterops/dawgs/graph"
Expand Down Expand Up @@ -64,10 +68,22 @@ func (s *Resources) PatchDomain(response http.ResponseWriter, request *http.Requ
}

func (s *Resources) handleAdEntityInfoQuery(response http.ResponseWriter, request *http.Request, entityType graph.Kind, countQueries map[string]any) {
user, isUser := auth.GetUserFromAuthCtx(bhCtx.FromRequest(request).AuthCtx)
if !isUser {
slog.Error("Unable to get user from auth context")
api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusInternalServerError, api.ErrorResponseDetailsInternalServerError, request), response)
return
}

if includeCounts, err := api.ParseOptionalBool(request.URL.Query().Get(api.QueryParameterIncludeCounts), true); err != nil {
api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusBadRequest, api.ErrorResponseDetailsBadQueryParameterFilters, request), response)
} else if objectId, err := GetEntityObjectIDFromRequestPath(request); err != nil {
api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusBadRequest, fmt.Sprintf("error reading objectid: %v", err), request), response)
} else if hasAccess, err := CheckUserHasAccessToNodeById(request.Context(), s.DB, s.GraphQuery, s.DogTags, user, objectId, entityType); err != nil {
slog.ErrorContext(request.Context(), "Error checking if user has access to node for ETAC", attr.Error(err))
api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusInternalServerError, api.ErrorResponseDetailsInternalServerError, request), response)
} else if !hasAccess {
api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusForbidden, api.ErrorResponseDetailsForbidden, request), response)
} else if node, err := s.GraphQuery.GetEntityByObjectId(request.Context(), objectId, entityType); err != nil {
if graph.IsErrNotFound(err) {
api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusNotFound, "node not found", request), response)
Expand Down
Loading