-
Notifications
You must be signed in to change notification settings - Fork 109
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: move in-memory analysis request state to postgres (#631)
- Loading branch information
Showing
20 changed files
with
549 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| // Copyright 2024 Specter Ops, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package v2 | ||
|
|
||
| import ( | ||
| "database/sql" | ||
| "net/http" | ||
|
|
||
| "github.com/specterops/bloodhound/errors" | ||
| "github.com/specterops/bloodhound/log" | ||
| "github.com/specterops/bloodhound/src/api" | ||
| "github.com/specterops/bloodhound/src/auth" | ||
| "github.com/specterops/bloodhound/src/ctx" | ||
| ) | ||
|
|
||
| func (s Resources) GetAnalysisRequest(response http.ResponseWriter, request *http.Request) { | ||
| if analRequest, err := s.DB.GetAnalysisRequest(request.Context()); err != nil && !errors.Is(err, sql.ErrNoRows) { | ||
| api.HandleDatabaseError(request, response, err) | ||
| } else if errors.Is(err, sql.ErrNoRows) { | ||
| api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusNotFound, api.ErrorResponseDetailsResourceNotFound, request), response) | ||
| } else { | ||
| api.WriteBasicResponse(request.Context(), analRequest, http.StatusOK, response) | ||
| } | ||
| } | ||
|
|
||
| func (s Resources) RequestAnalysis(response http.ResponseWriter, request *http.Request) { | ||
| defer log.Measure(log.LevelDebug, "Requesting analysis")() | ||
|
|
||
| var userId string | ||
| if user, isUser := auth.GetUserFromAuthCtx(ctx.FromRequest(request).AuthCtx); !isUser { | ||
| log.Warnf("encountered request analysis for unknown user, this shouldn't happen") | ||
| userId = "unknown-user" | ||
| } else { | ||
| userId = user.ID.String() | ||
| } | ||
|
|
||
| if err := s.DB.RequestAnalysis(request.Context(), userId); err != nil { | ||
| api.HandleDatabaseError(request, response, err) | ||
| return | ||
| } | ||
|
|
||
| response.WriteHeader(http.StatusAccepted) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // Copyright 2024 Specter Ops, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package v2_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/specterops/bloodhound/src/api/v2/integration" | ||
| "github.com/specterops/bloodhound/src/model" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestRequestAnalysis(t *testing.T) { | ||
| testCtx := integration.NewFOSSContext(t) | ||
|
|
||
| err := testCtx.AdminClient().RequestAnalysis() | ||
| require.Nil(t, err) | ||
|
|
||
| analReq, err := testCtx.AdminClient().GetAnalysisRequest() | ||
| require.Nil(t, err) | ||
| require.Equal(t, analReq.RequestType, model.AnalysisRequestAnalysis) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| // Copyright 2024 Specter Ops, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package apiclient | ||
|
|
||
| import ( | ||
| "net/http" | ||
|
|
||
| "github.com/specterops/bloodhound/src/api" | ||
| "github.com/specterops/bloodhound/src/model" | ||
| ) | ||
|
|
||
| func (s Client) RequestAnalysis() error { | ||
| if response, err := s.Request(http.MethodPut, "api/v2/analysis", nil, nil); err != nil { | ||
| return err | ||
| } else { | ||
| defer response.Body.Close() | ||
|
|
||
| if api.IsErrorResponse(response) { | ||
| return ReadAPIError(response) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func (s Client) GetAnalysisRequest() (model.AnalysisRequest, error) { | ||
| var analReq model.AnalysisRequest | ||
|
|
||
| if response, err := s.Request(http.MethodGet, "api/v2/analysis/status", nil, nil); err != nil { | ||
| return analReq, err | ||
| } else { | ||
| defer response.Body.Close() | ||
|
|
||
| if api.IsErrorResponse(response) { | ||
| return analReq, ReadAPIError(response) | ||
| } | ||
|
|
||
| return analReq, api.ReadAPIV2ResponsePayload(&analReq, response) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.