schwarzit.stackit-public/audit-go
1
0
Fork 0
mirror of https://dev.azure.com/schwarzit/schwarzit.stackit-public/_git/audit-go synced 2026-02-17 05:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unescape query parameters in legacy message converter

Browse source
This commit is contained in:
Christian Schaible 2024-10-02 10:31:07 +02:00
parent e9bd1575aa
commit abab0eb0a4
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
audit/api/api_legacy_converter.go
View file

@ -64,9 +64,13 @@ func convertAndSerializeIntoLegacyFormat(
*event.ProtoPayload.RequestMetadata.RequestAttributes.Query != "" { *event.ProtoPayload.RequestMetadata.RequestAttributes.Query != "" {
parameters = map[string]interface{}{} parameters = map[string]interface{}{}
unescapedQuery, err := url.QueryUnescape(*event.ProtoPayload.RequestMetadata.RequestAttributes.Query)
if err != nil {
return nil, err
}
parsedUrl, err := url.Parse(fmt.Sprintf("%s?%s", parsedUrl, err := url.Parse(fmt.Sprintf("%s?%s",
event.ProtoPayload.RequestMetadata.RequestAttributes.Path, event.ProtoPayload.RequestMetadata.RequestAttributes.Path,
*event.ProtoPayload.RequestMetadata.RequestAttributes.Query)) unescapedQuery))
if err != nil { if err != nil {
return nil, err return nil, err
} }

3
audit/api/api_legacy_dynamic_test.go
View file

@ -5,6 +5,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"log/slog" "log/slog"
"net/url"
"os" "os"
"testing" "testing"
"time" "time"
@ -355,6 +356,8 @@ func TestDynamicLegacyAuditApi(t *testing.T) {
// Instantiate test data // Instantiate test data
event, objectIdentifier := NewOrganizationAuditEvent(nil) event, objectIdentifier := NewOrganizationAuditEvent(nil)
escapedQuery := url.QueryEscape("param=value")
event.ProtoPayload.RequestMetadata.RequestAttributes.Query = &escapedQuery
// Log the event to solace // Log the event to solace
visibility := auditV1.Visibility_VISIBILITY_PUBLIC visibility := auditV1.Visibility_VISIBILITY_PUBLIC

6
audit/api/api_legacy_test.go
View file

@ -359,6 +359,8 @@ func TestLegacyAuditApi(t *testing.T) {
// Instantiate test data // Instantiate test data
event, objectIdentifier := NewOrganizationAuditEvent(nil) event, objectIdentifier := NewOrganizationAuditEvent(nil)
escapedQuery := url.QueryEscape("param=value")
event.ProtoPayload.RequestMetadata.RequestAttributes.Query = &escapedQuery
// Log the event to solace // Log the event to solace
visibility := auditV1.Visibility_VISIBILITY_PUBLIC visibility := auditV1.Visibility_VISIBILITY_PUBLIC
@ -462,9 +464,11 @@ func validateSentMessageWithDetails(
*event.ProtoPayload.RequestMetadata.RequestAttributes.Query != "" { *event.ProtoPayload.RequestMetadata.RequestAttributes.Query != "" {
parameters = map[string]interface{}{} parameters = map[string]interface{}{}
unescapedQuery, err := url.QueryUnescape(*event.ProtoPayload.RequestMetadata.RequestAttributes.Query)
assert.NoError(t, err)
parsedUrl, err := url.Parse(fmt.Sprintf("%s?%s", parsedUrl, err := url.Parse(fmt.Sprintf("%s?%s",
event.ProtoPayload.RequestMetadata.RequestAttributes.Path, event.ProtoPayload.RequestMetadata.RequestAttributes.Path,
*event.ProtoPayload.RequestMetadata.RequestAttributes.Query)) unescapedQuery))
assert.NoError(t, err) assert.NoError(t, err)
for k, v := range parsedUrl.Query() { for k, v := range parsedUrl.Query() {