Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 10:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1572155 - Make validationURL use baseURI r=marcosc

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D41047

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Kagami Sascha Rosylight 2019-08-20 03:45:58 +00:00
parent efe5f0901c
commit 341ce1c24c
3 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
dom/payments/MerchantValidationEvent.cpp
View File

@ -9,13 +9,15 @@
#include "mozilla/dom/PaymentRequest.h"
#include "mozilla/dom/Location.h"
#include "mozilla/dom/URL.h"
#include "mozilla/ResultExtensions.h"
#include "nsIURI.h"
#include "nsNetUtil.h"
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED(MerchantValidationEvent, Event, mRequest)
NS_IMPL_CYCLE_COLLECTION_INHERITED(MerchantValidationEvent, Event,
mValidationURL, mRequest)
NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(MerchantValidationEvent, Event)
NS_IMPL_CYCLE_COLLECTION_TRACE_END
@ -43,7 +45,21 @@ already_AddRefed<MerchantValidationEvent> MerchantValidationEvent::Constructor(
RefPtr<MerchantValidationEvent> e = new MerchantValidationEvent(aOwner);
bool trusted = e->Init(aOwner);
e->InitEvent(aType, aEventInitDict.mBubbles, aEventInitDict.mCancelable);
if (!e->init(aEventInitDict, aRv)) {
nsString errMsg;
Result<Ok, nsresult> rv = e->init(aEventInitDict, errMsg);
if (rv.isErr()) {
auto err = rv.unwrapErr();
switch (err) {
case NS_ERROR_TYPE_ERR:
aRv.ThrowRangeError<MSG_ILLEGAL_RANGE_PR_CONSTRUCTOR>(errMsg);
break;
case NS_ERROR_MALFORMED_URI:
aRv.ThrowTypeError<MSG_INVALID_URL>(aEventInitDict.mValidationURL);
break;
default:
aRv.Throw(err);
break;
}
return nullptr;
}
e->SetTrusted(trusted);
@ -51,46 +67,26 @@ already_AddRefed<MerchantValidationEvent> MerchantValidationEvent::Constructor(
return e.forget();
}
bool MerchantValidationEvent::init(
const MerchantValidationEventInit& aEventInitDict, ErrorResult& aRv) {
Result<Ok, nsresult> MerchantValidationEvent::init(
const MerchantValidationEventInit& aEventInitDict, nsString& errMsg) {
// Check methodName is valid
if (!aEventInitDict.mMethodName.IsEmpty()) {
nsString errMsg;
auto rv = PaymentRequest::IsValidPaymentMethodIdentifier(
nsresult rv = PaymentRequest::IsValidPaymentMethodIdentifier(
aEventInitDict.mMethodName, errMsg);
if (NS_FAILED(rv)) {
aRv.ThrowRangeError<MSG_ILLEGAL_RANGE_PR_CONSTRUCTOR>(errMsg);
return false;
return Err(rv);
}
}
SetMethodName(aEventInitDict.mMethodName);
nsCOMPtr<nsPIDOMWindowInner> window = do_QueryInterface(GetParentObject());
auto doc = window->GetExtantDoc();
if (!doc) {
aRv.Throw(NS_ERROR_UNEXPECTED);
return false;
return Err(NS_ERROR_UNEXPECTED);
}
auto principal = doc->NodePrincipal();
nsCOMPtr<nsIURI> baseURI;
principal->GetURI(getter_AddRefs(baseURI));
nsresult rv;
nsCOMPtr<nsIURI> validationUri;
rv = NS_NewURI(getter_AddRefs(validationUri), aEventInitDict.mValidationURL,
nullptr, baseURI);
if (NS_WARN_IF(NS_FAILED(rv))) {
aRv.ThrowTypeError<MSG_INVALID_URL>(aEventInitDict.mValidationURL);
return false;
}
nsAutoCString utf8href;
rv = validationUri->GetSpec(utf8href);
if (NS_FAILED(rv)) {
aRv.Throw(NS_ERROR_DOM_BAD_URI);
return false;
}
CopyUTF8toUTF16(utf8href, mValidationURL);
return true;
MOZ_TRY_VAR(mValidationURL,
doc->ResolveWithBaseURI(aEventInitDict.mValidationURL));
return Ok();
}
MerchantValidationEvent::MerchantValidationEvent(EventTarget* aOwner)
@ -161,11 +157,11 @@ void MerchantValidationEvent::SetRequest(PaymentRequest* aRequest) {
}
void MerchantValidationEvent::GetValidationURL(nsAString& aValidationURL) {
aValidationURL.Assign(mValidationURL);
}
void MerchantValidationEvent::SetValidationURL(nsAString& aValidationURL) {
mValidationURL.Assign(aValidationURL);
nsAutoCString utf8href;
nsresult rv = mValidationURL->GetSpec(utf8href);
MOZ_ASSERT(NS_SUCCEEDED(rv));
Unused << rv;
aValidationURL.Assign(NS_ConvertUTF8toUTF16(utf8href));
}
void MerchantValidationEvent::GetMethodName(nsAString& aMethodName) {
@ -176,7 +172,7 @@ void MerchantValidationEvent::SetMethodName(const nsAString& aMethodName) {
mMethodName.Assign(aMethodName);
}
MerchantValidationEvent::~MerchantValidationEvent() {}
MerchantValidationEvent::~MerchantValidationEvent() = default;
JSObject* MerchantValidationEvent::WrapObjectInternal(
JSContext* aCx, JS::Handle<JSObject*> aGivenProto) {

9
dom/payments/MerchantValidationEvent.h
View File

@ -9,6 +9,7 @@
#include "mozilla/Attributes.h"
#include "mozilla/ErrorResult.h"
#include "mozilla/Result.h"
#include "mozilla/dom/Event.h"
#include "mozilla/dom/MerchantValidationEventBinding.h"
#include "mozilla/dom/PromiseNativeHandler.h"
@ -49,21 +50,19 @@ class MerchantValidationEvent : public Event, public PromiseNativeHandler {
void GetValidationURL(nsAString& aValidationURL);
void SetValidationURL(nsAString& aValidationURL);
void GetMethodName(nsAString& aMethodName);
void SetMethodName(const nsAString& aMethodName);
protected:
bool init(const MerchantValidationEventInit& aEventInitDict,
ErrorResult& aRv);
Result<Ok, nsresult> init(const MerchantValidationEventInit& aEventInitDict,
nsString& errMsg);
~MerchantValidationEvent();
private:
// Indicating whether an Complete()-initiated update is currently in progress.
bool mWaitForUpdate;
nsString mValidationURL;
nsCOMPtr<nsIURI> mValidationURL;
RefPtr<PaymentRequest> mRequest;
nsString mMethodName;
};

14
testing/web-platform/tests/payment-request/MerchantValidationEvent/constructor.https.html
View File

@ -79,6 +79,20 @@ test(() => {
}
}, "Relative validationURLs use the document as the base.");
test(() => {
const validationURL = "pass";
const base = document.createElement("base");
base.href = "https://pass.com";
document.head.append(base);
const event = new MerchantValidationEvent("test", { validationURL });
try {
assert_idl_attribute(event, "validationURL");
assert_equals(event.validationURL, "https://pass.com/pass");
} finally {
base.remove();
}
}, "Relative validationURLs use the document.baseURI as the base.");
test(() => {
const methodName = "https://pass.com";
const event = new MerchantValidationEvent("test", { methodName });