Skip to content
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

Jump to bottom

privacy: Potential JSON injection #1304

Merged
merged 4 commits into from
May 28, 2020
Merged

privacy: Potential JSON injection #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa02275
privacy: Do not construct JSON by concatenating strings.
djcsdy May 17, 2020
255fc04
privacy: Add tests to illustrate JSON injection bug.
djcsdy May 17, 2020
27e2e11
privacy: Do not modify User.Ext or Regs.Ext if json.Marshal reports a…
djcsdy May 27, 2020
5d4c2a2
privacy: Mutate JSON by unmarshalling to a map, modifying, and marsha…
djcsdy May 28, 2020
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
19 changes: 14 additions & 5 deletions privacy/ccpa/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"errors"
"fmt"

"github.com/buger/jsonparser"
"github.com/mxmCherry/openrtb"
"github.com/prebid/prebid-server/openrtb_ext"
)
Expand Down Expand Up @@ -41,12 +40,22 @@ func (p Policy) Write(req *openrtb.BidRequest) error {
}

if req.Regs.Ext == nil {
req.Regs.Ext = json.RawMessage(`{"us_privacy":"` + p.Value + `"}`)
return nil
ext, err := json.Marshal(openrtb_ext.ExtRegs{USPrivacy: p.Value})
if err == nil {
req.Regs.Ext = ext
}
return err
}

var err error
req.Regs.Ext, err = jsonparser.Set(req.Regs.Ext, []byte(`"`+p.Value+`"`), "us_privacy")
var extMap map[string]interface{}
err := json.Unmarshal(req.Regs.Ext, &extMap)
if err == nil {
extMap["us_privacy"] = p.Value
ext, err := json.Marshal(extMap)
if err == nil {
req.Regs.Ext = ext
}
}
return err
}

Expand Down
37 changes: 37 additions & 0 deletions privacy/ccpa/policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,17 @@ func TestRead(t *testing.T) {
},
expectedError: true,
},
{
description: "Injection Attack",
request: &openrtb.BidRequest{
Regs: &openrtb.Regs{
Ext: json.RawMessage(`{"us_privacy":"1YYY\"},\"oops\":\"malicious\",\"p\":{\"p\":\""}`),
},
},
expectedPolicy: Policy{
Value: "1YYY\"},\"oops\":\"malicious\",\"p\":{\"p\":\"",
},
},
}

for _, test := range testCases {
Expand Down Expand Up @@ -138,6 +149,32 @@ func TestWrite(t *testing.T) {
Ext: json.RawMessage(`malformed`)}},
expectedError: true,
},
{
description: "Injection Attack With Nil Request Regs Object",
policy: Policy{Value: "1YYY\"},\"oops\":\"malicious\",\"p\":{\"p\":\""},
request: &openrtb.BidRequest{},
expected: &openrtb.BidRequest{Regs: &openrtb.Regs{
Ext: json.RawMessage(`{"us_privacy":"1YYY\"},\"oops\":\"malicious\",\"p\":{\"p\":\""}`),
}},
},
{
description: "Injection Attack With Nil Request Regs Ext Object",
policy: Policy{Value: "1YYY\"},\"oops\":\"malicious\",\"p\":{\"p\":\""},
request: &openrtb.BidRequest{Regs: &openrtb.Regs{}},
expected: &openrtb.BidRequest{Regs: &openrtb.Regs{
Ext: json.RawMessage(`{"us_privacy":"1YYY\"},\"oops\":\"malicious\",\"p\":{\"p\":\""}`),
}},
},
{
description: "Injection Attack With Existing Request Regs Ext Object",
policy: Policy{Value: "1YYY\"},\"oops\":\"malicious\",\"p\":{\"p\":\""},
request: &openrtb.BidRequest{Regs: &openrtb.Regs{
Ext: json.RawMessage(`{"existing":"any"}`),
}},
expected: &openrtb.BidRequest{Regs: &openrtb.Regs{
Ext: json.RawMessage(`{"existing":"any","us_privacy":"1YYY\"},\"oops\":\"malicious\",\"p\":{\"p\":\""}`),
}},
},
}

for _, test := range testCases {
Expand Down
20 changes: 15 additions & 5 deletions privacy/gdpr/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package gdpr

import (
"encoding/json"
"github.com/prebid/prebid-server/openrtb_ext"

"github.com/buger/jsonparser"
"github.com/mxmCherry/openrtb"
"github.com/prebid/go-gdpr/vendorconsent"
)
Expand All @@ -25,12 +25,22 @@ func (p Policy) Write(req *openrtb.BidRequest) error {
}

if req.User.Ext == nil {
req.User.Ext = json.RawMessage(`{"consent":"` + p.Consent + `"}`)
return nil
ext, err := json.Marshal(openrtb_ext.ExtUser{Consent: p.Consent})
if err == nil {
req.User.Ext = ext
}
return err
}

var err error
req.User.Ext, err = jsonparser.Set(req.User.Ext, []byte(`"`+p.Consent+`"`), "consent")
var extMap map[string]interface{}
err := json.Unmarshal(req.User.Ext, &extMap)
if err == nil {
extMap["consent"] = p.Consent
ext, err := json.Marshal(extMap)
if err == nil {
req.User.Ext = ext
}
}
return err
}

Expand Down
30 changes: 28 additions & 2 deletions privacy/gdpr/policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ func TestWrite(t *testing.T) {
request: &openrtb.BidRequest{User: &openrtb.User{
Ext: json.RawMessage(`{"existing":"any"}`)}},
expected: &openrtb.BidRequest{User: &openrtb.User{
Ext: json.RawMessage(`{"existing":"any","consent":"anyConsent"}`)}},
Ext: json.RawMessage(`{"consent":"anyConsent","existing":"any"}`)}},
},
{
description: "Enabled With Existing Request User Ext Object - Overwrites",
policy: Policy{Consent: "anyConsent"},
request: &openrtb.BidRequest{User: &openrtb.User{
Ext: json.RawMessage(`{"existing":"any","consent":"toBeOverwritten"}`)}},
expected: &openrtb.BidRequest{User: &openrtb.User{
Ext: json.RawMessage(`{"existing":"any","consent":"anyConsent"}`)}},
Ext: json.RawMessage(`{"consent":"anyConsent","existing":"any"}`)}},
},
{
description: "Enabled With Existing Malformed Request User Ext Object",
Expand All @@ -59,6 +59,32 @@ func TestWrite(t *testing.T) {
Ext: json.RawMessage(`malformed`)}},
expectedError: true,
},
{
description: "Injection Attack With Nil Request User Object",
policy: Policy{Consent: "BONV8oqONXwgmADACHENAO7pqzAAppY\"},\"oops\":\"malicious\",\"p\":{\"p\":\""},
request: &openrtb.BidRequest{},
expected: &openrtb.BidRequest{User: &openrtb.User{
Ext: json.RawMessage(`{"consent":"BONV8oqONXwgmADACHENAO7pqzAAppY\"},\"oops\":\"malicious\",\"p\":{\"p\":\""}`),
}},
},
{
description: "Injection Attack With Nil Request User Ext Object",
policy: Policy{Consent: "BONV8oqONXwgmADACHENAO7pqzAAppY\"},\"oops\":\"malicious\",\"p\":{\"p\":\""},
request: &openrtb.BidRequest{User: &openrtb.User{}},
expected: &openrtb.BidRequest{User: &openrtb.User{
Ext: json.RawMessage(`{"consent":"BONV8oqONXwgmADACHENAO7pqzAAppY\"},\"oops\":\"malicious\",\"p\":{\"p\":\""}`),
}},
},
{
description: "Injection Attack With Existing Request User Ext Object",
policy: Policy{Consent: "BONV8oqONXwgmADACHENAO7pqzAAppY\"},\"oops\":\"malicious\",\"p\":{\"p\":\""},
request: &openrtb.BidRequest{User: &openrtb.User{
Ext: json.RawMessage(`{"existing":"any"}`),
}},
expected: &openrtb.BidRequest{User: &openrtb.User{
Ext: json.RawMessage(`{"consent":"BONV8oqONXwgmADACHENAO7pqzAAppY\"},\"oops\":\"malicious\",\"p\":{\"p\":\"","existing":"any"}`),
}},
},
}

for _, test := range testCases {
Expand Down