Skip to content

fix: {{interactsh-url}} replacement in variables for network template #5677

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
merged 1 commit into from
Oct 18, 2024
Merged

fix: {{interactsh-url}} replacement in variables for network template #5677

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions pkg/protocols/network/request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,38 +289,39 @@ func (request *Request) executeRequestWithPayloads(variables map[string]interfac
inputEvents := make(map[string]interface{})

for _, input := range request.Inputs {
data := []byte(input.Data)
dataInBytes := []byte(input.Data)
var err error

if request.options.Interactsh != nil {
var transformedData string
transformedData, interactshURLs = request.options.Interactsh.Replace(string(data), []string{})
data = []byte(transformedData)
}

finalData, err := expressions.EvaluateByte(data, interimValues)
dataInBytes, err = expressions.EvaluateByte(dataInBytes, interimValues)
if err != nil {
request.options.Output.Request(request.options.TemplatePath, address, request.Type().String(), err)
request.options.Progress.IncrementFailedRequestsBy(1)
return errors.Wrap(err, "could not evaluate template expressions")
}

reqBuilder.Write(finalData)
data := string(dataInBytes)
if request.options.Interactsh != nil {
data, interactshURLs = request.options.Interactsh.Replace(data, []string{})
dataInBytes = []byte(data)
}

reqBuilder.Write(dataInBytes)

if err := expressions.ContainsUnresolvedVariables(string(finalData)); err != nil {
if err := expressions.ContainsUnresolvedVariables(data); err != nil {
gologger.Warning().Msgf("[%s] Could not make network request for %s: %v\n", request.options.TemplateID, actualAddress, err)
return nil
}

if input.Type.GetType() == hexType {
finalData, err = hex.DecodeString(string(finalData))
dataInBytes, err = hex.DecodeString(data)
if err != nil {
request.options.Output.Request(request.options.TemplatePath, address, request.Type().String(), err)
request.options.Progress.IncrementFailedRequestsBy(1)
return errors.Wrap(err, "could not write request to server")
}
}

if _, err := conn.Write(finalData); err != nil {
if _, err := conn.Write(dataInBytes); err != nil {
request.options.Output.Request(request.options.TemplatePath, address, request.Type().String(), err)
request.options.Progress.IncrementFailedRequestsBy(1)
return errors.Wrap(err, "could not write request to server")
Expand Down
Loading