Skip to content

Limit datasources to public networks #5391

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

Merged
evankanderson merged 2 commits into from
Feb 3, 2025
Merged

Limit datasources to public networks #5391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
667e3a5
Limit datasources to public networks
evankanderson Feb 1, 2025
3fa4a9d
Remove extra testing code
evankanderson Feb 3, 2025
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
9 changes: 9 additions & 0 deletions internal/datasources/rest/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
uritemplate "github.com/std-uritemplate/std-uritemplate/go/v2"
"google.golang.org/protobuf/types/known/structpb"

"github.com/mindersec/minder/internal/engine/eval/rego"
"github.com/mindersec/minder/internal/util"
"github.com/mindersec/minder/internal/util/schemaupdate"
"github.com/mindersec/minder/internal/util/schemavalidate"
Expand All @@ -36,6 +37,8 @@ type restHandler struct {
inputSchema *jsonschema.Schema
endpointTmpl string
method string
// used only to allow requests to localhost during tests
testOnlyTransport http.RoundTripper
// contains the request body or the key
body string
bodyFromInput bool
Expand Down Expand Up @@ -109,10 +112,16 @@ func (h *restHandler) Call(ctx context.Context, _ *interfaces.Result, args any)
return nil, err
}

transport := h.testOnlyTransport
if transport == nil {
transport = rego.LimitedDialer(nil)
}
// TODO: Add option to use custom client
cli := &http.Client{
// TODO: Make timeout configurable
Timeout: 5 * time.Second,
// Don't allow calling non-public addresses.
Transport: transport,
}

b, err := h.getBody(argsMap)
Expand Down
11 changes: 6 additions & 5 deletions internal/datasources/rest/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,12 @@ func Test_restHandler_Call(t *testing.T) {
tt.fields.endpointTmpl = server.URL + tt.fields.endpointTmpl

h := &restHandler{
endpointTmpl: tt.fields.endpointTmpl,
method: tt.fields.method,
body: tt.fields.body,
headers: tt.fields.headers,
parse: tt.fields.parse,
endpointTmpl: tt.fields.endpointTmpl,
method: tt.fields.method,
body: tt.fields.body,
headers: tt.fields.headers,
parse: tt.fields.parse,
testOnlyTransport: http.DefaultTransport,
}
got, err := h.Call(context.Background(), nil, tt.args.args)
if tt.wantErr {
Expand Down