Skip to content

Commit

Permalink
Update decisionLogicUrl to decisionLogicURL
Browse files Browse the repository at this point in the history 
Bug: 1432707
Change-Id: I43bd9a486f56f069b2572fab12185a61fad218a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4796889
Commit-Queue: Tianyang Xu <[email protected]>
Reviewed-by: Dominic Farolino <[email protected]>
Reviewed-by: Joshua Bell <[email protected]>
Reviewed-by: Kelvin Jiang <[email protected]>
Reviewed-by: Caleb Raitto <[email protected]>
Reviewed-by: Matt Menke <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1189071}
  • Loading branch information
@chromium-wpt-export-bot
Tianyang Xu authored and chromium-wpt-export-bot committed Aug 28, 2023
1 parent bf1b335 commit c5e6081
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 40 deletions.
2 changes: 1 addition & 1 deletion fenced-frame/disallowed-navigations-dangling-markup-urn.https.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
const auctionConfig = {
seller: location.origin,
interestGroupBuyers: [location.origin],
decisionLogicUrl: new URL(FLEDGE_DECISION_URL, location.origin),
decisionLogicURL: new URL(FLEDGE_DECISION_URL, location.origin),
auctionSignals: {biddingToken: bidding_token, sellerToken: seller_token},
};

Expand Down
10 changes: 5 additions & 5 deletions fenced-frame/resources/utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,17 @@ async function generateURNFromFledgeRawURL(
let auctionConfig = {
seller: location.origin,
interestGroupBuyers: [location.origin],
decisionLogicUrl: new URL(FLEDGE_DECISION_URL, location.origin),
decisionLogicURL: new URL(FLEDGE_DECISION_URL, location.origin),
auctionSignals: {biddingToken: bidding_token, sellerToken: seller_token},
resolveToConfig: resolve_to_config
};

if (requested_size) {
let decisionUrlParams =
new URLSearchParams(auctionConfig.decisionLogicUrl.search);
decisionUrlParams.set(
let decisionURLParams =
new URLSearchParams(auctionConfig.decisionLogicURL.search);
decisionURLParams.set(
'requested-size', requested_size[0] + '-' + requested_size[1]);
auctionConfig.decisionLogicUrl.search = decisionUrlParams;
auctionConfig.decisionLogicURL.search = decisionURLParams;

auctionConfig['requestedSize'] = {width: requested_size[0], height: requested_size[1]};
}
Expand Down
14 changes: 7 additions & 7 deletions fledge/tentative/auction-config.https.sub.window.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,15 @@ makeTest({
});

makeTest({
name: 'decisionLogicUrl is invalid',
name: 'decisionLogicURL is invalid',
expect: EXPECT_EXCEPTION(TypeError),
auctionConfigOverrides: { decisionLogicUrl: "https://foo:99999999999" },
auctionConfigOverrides: { decisionLogicURL: "https://foo:99999999999" },
});

makeTest({
name: 'decisionLogicUrl is cross-origin with seller',
name: 'decisionLogicURL is cross-origin with seller',
expect: EXPECT_EXCEPTION(TypeError),
auctionConfigOverrides: { decisionLogicUrl: "https://example.com" },
auctionConfigOverrides: { decisionLogicURL: "https://example.com" },
});

makeTest({
Expand Down Expand Up @@ -242,12 +242,12 @@ makeTest({
componentAuctions: [
{
seller: window.location.origin,
decisionLogicUrl: window.location.origin,
decisionLogicURL: window.location.origin,
interestGroupBuyers: undefined,
componentAuctions: [
{
seller: window.location.origin,
decisionLogicUrl: window.location.origin,
decisionLogicURL: window.location.origin,
}
],
},
Expand All @@ -263,7 +263,7 @@ makeTest({
componentAuctions: [
{
seller: window.location.origin,
decisionLogicUrl: window.location.origin,
decisionLogicURL: window.location.origin,
interestGroupBuyers: [],
},
],
Expand Down
4 changes: 2 additions & 2 deletions fledge/tentative/no-winner.https.sub.window.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ for (error of BIDDING_LOGIC_SCRIPT_ERRORS) {

for (error of DECISION_LOGIC_SCRIPT_ERRORS) {
promise_test((async (error, test) => {
let decisionLogicUrl =
let decisionLogicURL =
`${BASE_URL}resources/decision-logic.sub.py?${error}`;
await runBasicFledgeTestExpectingNoWinner(
test, {auctionConfigOverrides: {decisionLogicUrl: decisionLogicUrl}}
test, { auctionConfigOverrides: { decisionLogicURL: decisionLogicURL } }
);
}).bind(undefined, error), `Decision logic script: ${error}`);
}
17 changes: 9 additions & 8 deletions fledge/tentative/resources/fledge-util.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function createBiddingScriptURL(params = {}) {
// returns something or throws.
//
// The default reportResult() method is empty.
function createDecisionScriptUrl(uuid, params = {}) {
function createDecisionScriptURL(uuid, params = {}) {
let url = new URL(`${BASE_URL}resources/decision-logic.sub.py`);
url.searchParams.append('uuid', uuid);
if (params.scoreAd)
Expand Down Expand Up @@ -223,7 +223,7 @@ async function leaveInterestGroup(interestGroupOverrides = {}) {
async function runBasicFledgeAuction(test, uuid, auctionConfigOverrides = {}) {
let auctionConfig = {
seller: window.location.origin,
decisionLogicUrl: createDecisionScriptUrl(
decisionLogicURL: createDecisionScriptURL(
uuid,
{ reportResult: `sendReportTo('${createSellerReportUrl(uuid)}');` }),
interestGroupBuyers: [window.location.origin],
Expand Down Expand Up @@ -317,16 +317,16 @@ async function runReportTest(test, uuid, codeToInsert, expectedReportUrls,
}
${reportResult}`;
}
let decisionScriptUrlParams = {};
let decisionScriptURLParams = {};

if (scoreAd !== undefined) {
decisionScriptUrlParams.scoreAd = scoreAd;
decisionScriptURLParams.scoreAd = scoreAd;
}

if (reportResult !== null)
decisionScriptUrlParams.reportResult = reportResult;
decisionScriptURLParams.reportResult = reportResult;
else
decisionScriptUrlParams.error = 'no-reportResult';
decisionScriptURLParams.error = 'no-reportResult';

if (reportWinSuccessCondition) {
reportWin = `if (!(${reportWinSuccessCondition})) {
Expand Down Expand Up @@ -354,7 +354,8 @@ async function runReportTest(test, uuid, codeToInsert, expectedReportUrls,
await joinInterestGroup(test, uuid, interestGroupOverrides);
await runBasicFledgeAuctionAndNavigate(
test, uuid,
{ decisionLogicUrl: createDecisionScriptUrl(
uuid, decisionScriptUrlParams) });
{
decisionLogicURL: createDecisionScriptURL(
uuid, decisionScriptURLParams) });
await waitForObservedRequests(uuid, expectedReportUrls);
}
2 changes: 1 addition & 1 deletion fledge/tentative/trusted-bidding-signals.https.sub.window.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ async function runTrustedBiddingSignalsDataVersionTest(
await joinInterestGroup(test, uuid, interestGroupOverrides);

const auctionConfigOverrides = {
decisionLogicUrl: createDecisionScriptUrl(
decisionLogicURL: createDecisionScriptURL(
uuid,
{ scoreAd:
`if (browserSignals.dataVersion !== undefined)
Expand Down
18 changes: 9 additions & 9 deletions fledge/tentative/trusted-scoring-signals.https.sub.window.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
async function runTrustedScoringSignalsTest(test, uuid, renderURL, scoreAdCheck) {
const auctionConfigOverrides = {
trustedScoringSignalsUrl: TRUSTED_SCORING_SIGNALS_URL,
decisionLogicUrl:
createDecisionScriptUrl(uuid, {
decisionLogicURL:
createDecisionScriptURL(uuid, {
scoreAd: `if (!(${scoreAdCheck})) throw "error";` })};
await runBasicFledgeTestExpectingWinner(
test,
Expand Down Expand Up @@ -49,7 +49,7 @@ async function runTrustedScoringSignalsDataVersionTest(
await joinInterestGroup(test, uuid, interestGroupOverrides);

const auctionConfigOverrides = {
decisionLogicUrl: createDecisionScriptUrl(
decisionLogicURL: createDecisionScriptURL(
uuid,
{ scoreAd:
`if (!(${check})) return false;`,
Expand Down Expand Up @@ -79,13 +79,13 @@ function createScoringSignalsRenderUrlWithBody(uuid, responseBody) {

promise_test(async test => {
const uuid = generateUuid(test);
const decisionLogicScriptUrl = createDecisionScriptUrl(
const decisionLogicScriptUrl = createDecisionScriptURL(
uuid,
{ scoreAd: 'if (trustedScoringSignals !== null) throw "error";'});
await runBasicFledgeTestExpectingWinner(
test,
{ uuid: uuid,
auctionConfigOverrides: { decisionLogicUrl: decisionLogicScriptUrl }
auctionConfigOverrides: { decisionLogicURL: decisionLogicScriptUrl }
});
}, 'No trustedScoringSignalsUrl.');

Expand Down Expand Up @@ -268,8 +268,8 @@ promise_test(async test => {
let auctionConfigOverrides = { trustedScoringSignalsUrl: TRUSTED_SCORING_SIGNALS_URL };

// scoreAd() only accepts the first IG's bid, validating its trustedScoringSignals.
auctionConfigOverrides.decisionLogicUrl =
createDecisionScriptUrl(uuid, {
auctionConfigOverrides.decisionLogicURL =
createDecisionScriptURL(uuid, {
scoreAd: `if (browserSignals.renderURL === "${renderURL1}" &&
trustedScoringSignals.renderURL["${renderURL1}"] !== 1 ||
trustedScoringSignals.renderURL["${renderURL2}"] !== undefined)
Expand All @@ -280,8 +280,8 @@ promise_test(async test => {
`Wrong value type returned from first auction: ${config.constructor.type}`);

// scoreAd() only accepts the second IG's bid, validating its trustedScoringSignals.
auctionConfigOverrides.decisionLogicUrl =
createDecisionScriptUrl(uuid, {
auctionConfigOverrides.decisionLogicURL =
createDecisionScriptURL(uuid, {
scoreAd: `if (browserSignals.renderURL === "${renderURL2}" &&
trustedScoringSignals.renderURL["${renderURL1}"] !== undefined ||
trustedScoringSignals.renderURL["${renderURL2}"] !== '1')
Expand Down
10 changes: 5 additions & 5 deletions parakeet/finalizeAd.tentative.https.sub.window.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

const okayAuctionRequest = {
seller: "https://{{host}}:{{ports[https][0]}}",
decisionLogicUrl: "https://{{host}}:{{ports[https][0]}}",
decisionLogicURL: "https://{{host}}:{{ports[https][0]}}",
perBuyerSignals: {"{{host}}": { randomParam: "value1" }},
auctionSignals: "pubCode123",
sellerSignals: { someKey: "sellerValue" }
Expand All @@ -22,18 +22,18 @@ promise_test(async t => {

promise_test(async t => {
const auctionRequest = Object.assign({}, okayAuctionRequest);
delete auctionRequest.decisionLogicUrl;
delete auctionRequest.decisionLogicURL;

const finalizePromise = navigator.finalizeAd({}, auctionRequest);

await promise_rejects_js(t, TypeError, finalizePromise);
}, "finalizeAd() should reject a missing decisionLogicUrl.");
}, "finalizeAd() should reject a missing decisionLogicURL.");

promise_test(async t => {
const auctionRequest = Object.assign({}, okayAuctionRequest);
auctionRequest.decisionLogicUrl = "http://{{host}}:{{ports[https][0]}}";
auctionRequest.decisionLogicURL = "http://{{host}}:{{ports[https][0]}}";

const finalizePromise = navigator.finalizeAd({}, auctionRequest);

await promise_rejects_js(t, TypeError, finalizePromise);
}, "finalizeAd() should reject a non-HTTPS decisionLogicUrl.");
}, "finalizeAd() should reject a non-HTTPS decisionLogicURL.");
5 changes: 3 additions & 2 deletions private-aggregation/resources/protected-audience-helper-module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ function createBiddingScriptURL(params = {}) {
// returns something or throws.
//
// The default reportResult() method is empty.
function createDecisionScriptUrl(uuid, params = {}) {
function createDecisionScriptURL(uuid, params = {}) {
let url = new URL(`${FLEDGE_BASE_URL}resources/decision-logic.sub.py`);
url.searchParams.append('uuid', uuid);
if (params.scoreAd)
Expand Down Expand Up @@ -191,7 +191,8 @@ async function runReportTest(test, uuid, codeToInsert, expectedNumReports = 0) {
await joinInterestGroup(test, uuid, interestGroupOverrides);
await runBasicFledgeAuctionAndNavigate(
test, uuid,
{ decisionLogicUrl: createDecisionScriptUrl(
{
decisionLogicURL: createDecisionScriptURL(
uuid, { scoreAd, reportResult })
});

Expand Down

0 comments on commit c5e6081

Please sign in to comment.