mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
c5205b44c8
- Bug 1240330 - mozAlarm debug messages are turned on r=khuey (aa938a4371) - fix (cdc44e8bc8) - Bug 1239788 - Don't include non-main-thread assertions in the constructor enabled check for [Exposed=System] WebIDL interfaces; r=bzbarsky (5d05b4066a) - Bug 1247346. Slot indices on IDL interface members that get a slot should be per-interface, not a single per-member number. r=peterv (640231c37e) - Bug 1157469 - null check wrapper in case WrapNode fails, r=bholley (9fd9b038db) - Bug 1242211 - Mark MozMapRooter as final; r=baku (f3b5cc7728) - Bug 1243438. Don't try to include the filename '<unknown>' when including headers for unions that have a built-in typedef they're referenced by. r=peterv (781d1ec0af) - Bug 1241021 part 1: Refactor GenerateCSS2PropertiesWebIDL.py to invoke a helper function for each line. r=bz (258b031fd8) - Bug 1241021 part 2: Make GenerateCSS2PropertiesWebIDL.py produce capitalized as well as uncapitalized WebkitFoo/webkitFoo DOM style accessors. r=bz (0bf2ec95ae) - Bug 1241021 part 3: Refactor CSS mochitest test_initial_storage.html to perform its DOM accessor consistency-checks via a helper-function. r=bz (3a0c1a1678) - Bug 1241021 part 4: Extend mochitest test_initial_storage.html to test that uppercase Webkit DOM accessors for css properties are functional. r=bz (5a6a23c7ab) - Bug 1240592 - Remove unnecessary -Wno-uninitialized from dom/bindings. r=khuey (c854f7b397) - Bug 1200341 - Implement HKDF for WebCrypto r=rbarnes,smaug (2c830d65a1) - Bug 1200341 - Use BufferSource instead of CryptoOperationData in the SubtleCrypto WebIDL spec r=smaug (8cece95b5c) - Bug 1191936 - Implement RSA-PSS key generation r=rbarnes (ec9654595c) - Bug 1191936 - Implement RSA-PSS signing and verification r=rbarnes,smaug (7653bdfced) - Bug 1204763 follow-up: Fix the comments, DONTBUILD (8b26e6f3a9) - Reformat clang-plugin.cpp using clang-format, no bug (9346eda9f4) - Bug 1214037 - Don't consider the result of an assignment expression MOZ_MUST_USE, r=ehsan (70c7830c3a) - Bug 1242789 - Allow lambdas to capture raw pointers to refcounted objects by reference, r=ehsan (e7158a7746) - Bug 1238042 - Add about:checkerboard. r=ehsan,botond (f234ce7fa0) - Bug 1237177. Make the this-rebinding callable proxy sandboxes use return the prototype of its target, not its own null prototype. r=efaust (694a8081dc) - Bug 1248521 - Pack PrefHashEntry better. r=froydnj. (55e9d609fe) - Bug 1240453 - enable shared memory in xpconnect. r=bz (58db0b406e) - Bug 1202014 - Don't use-after-move in ActorsChild.cpp, r=khuey (382e7183c0) - Bug 1136762 - TSan: data race xpcom/io/nsPipe3.cpp:1061 CloseWithStatus. r=nfroyd. (68fd82971d) - Bug 1237668 - Remove nsSimpleUnicharStreamFactory r=froydnj (8bb6ec081c) - Bug 1189998, Part 4 - Add authentication secret to Push data test. r=dragana (122a0bd5f9) - Bug 1205137 - Add a PushSubscription serializer. r=mt,smaug (aa9e847c42) - Bug 1232910 - Use channel.asyncOpen2 within dom/push/PushServiceHttp2.jsm. r=sicking r=dragana (a2f483a983) - Bug 1246632 - Fix ackMsgRecv in PushServiceHttp2.js. r=kitcambridge (c1559e0539) - Bug 1240615 - Make PushService protocol init method return a Promise. r=kitcambridge (4d52dc6a41) - Bug 1246784 - Expose Console to the WorkerDebuggerGlobalScope, r=khuey (a992fdc555) - misspatch (33708903c4) - Bug 1207494 - Part 5: Remove use of expression closure from dom/contacts/. r=reuben (256b3831a4) - Bug 1207494 - Part 4: Remove use of expression closure from dom/canvas/. r=gw280 (1666e49673) - Bug 1207494 - Part 3: Remove use of expression closure from dom/browser-element/. r=smaug (a891769373) - Bug 1207494 - Part 2: Remove use of expression closure from dom/base/test/. r=peterv (01762e3181) - Bug 1207494 - Part 1: Remove use of expression closure from dom/apps/. r=ferjm (2474c8619b) - Bug 1247108 - Pass securityFlag when creating a new channel within webapps (r=fabrice) (8305294f26) - Bug 1219004 - Improve error management in getFullAppByManifestURL r=ferjm (c3ad64df7a) - revert contains/includes (29c60a77e5) - Bug 1147562 - Update remaining callsites of newChannel before landing the shim in dom/ (r=sicking) (0cd64e20e1) - Bug 1243924 - Convert remaining callsites within dom/ to use channel.open2() (r=sicking) (43b01f88ba) - Bug 1162658 - Update FormData to match latest spec, r=smaug (a42ca52ad5) - Bug 1208895 - Fix a typo in nsGenericHTMLElement::GetItemId(); r=baku (2d6f2d79f4) - Bug 1223523. The named getter on document should not return images with an empty name. r=peterv (da3d1f52f5) - Bug 1183491. Null-check the document we get from our contentWindow in the contentDocument getter, because apparently it can end up null. r=bkelly (3002a4375c) - Bug 1203430 - Intermittent crash in PNeckoChild::SendHTMLDNSPrefetch. r=jdm (3b82b57cbf) - Bug 893332, part 1 - Rename misnamed SetValidityState/GetValidityState arguments. r=baku (d403b12c9a) - Bug 893332, part 2 - Update validity state before asserting range underflow state. r=baku (a4cbce224c) - Bug 893332, part 3 - Don't assert range underflow state under the parser. r=baku (763e99ed8e) - Bug 893332, part 4 - Crashtests. r=baku (7cdcdc02c4) - Bug 1240336 Setting same value to either <input> or <textarea> shouldn't cause committing existing composition r=ehsan (5cc2c35dbb) - Bug 1228708. Fix UndoManager to correctly suppress exceptions it wants to suppress on ErrorResults. r=smaug (905207a3b4) - Bug 1230295 - Add telemetry to report when Ogg chaining is used. r=rillian,r=vladan (e47c49f508)
375 lines
9.5 KiB
C++
375 lines
9.5 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "FormData.h"
|
|
#include "nsIVariant.h"
|
|
#include "nsIInputStream.h"
|
|
#include "mozilla/dom/File.h"
|
|
#include "mozilla/dom/HTMLFormElement.h"
|
|
|
|
#include "MultipartBlobImpl.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::dom;
|
|
|
|
FormData::FormData(nsISupports* aOwner)
|
|
: nsFormSubmission(NS_LITERAL_CSTRING("UTF-8"), nullptr)
|
|
, mOwner(aOwner)
|
|
{
|
|
}
|
|
|
|
namespace {
|
|
|
|
already_AddRefed<Blob>
|
|
GetBlobForFormDataStorage(Blob& aBlob, const Optional<nsAString>& aFilename,
|
|
ErrorResult& aRv)
|
|
{
|
|
if (!aFilename.WasPassed()) {
|
|
RefPtr<Blob> blob = &aBlob;
|
|
return blob.forget();
|
|
}
|
|
|
|
RefPtr<File> file = aBlob.ToFile(aFilename.Value(), aRv);
|
|
if (NS_WARN_IF(aRv.Failed())) {
|
|
return nullptr;
|
|
}
|
|
|
|
return file.forget();
|
|
}
|
|
|
|
} // namespace
|
|
|
|
// -------------------------------------------------------------------------
|
|
// nsISupports
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_CLASS(FormData)
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(FormData)
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK(mOwner)
|
|
|
|
for (uint32_t i = 0, len = tmp->mFormData.Length(); i < len; ++i) {
|
|
ImplCycleCollectionUnlink(tmp->mFormData[i].value);
|
|
}
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(FormData)
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOwner)
|
|
|
|
for (uint32_t i = 0, len = tmp->mFormData.Length(); i < len; ++i) {
|
|
ImplCycleCollectionTraverse(cb, tmp->mFormData[i].value,
|
|
"mFormData[i].GetAsBlob()", 0);
|
|
}
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(FormData)
|
|
|
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(FormData)
|
|
NS_IMPL_CYCLE_COLLECTING_RELEASE(FormData)
|
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(FormData)
|
|
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
|
|
NS_INTERFACE_MAP_ENTRY(nsIDOMFormData)
|
|
NS_INTERFACE_MAP_ENTRY(nsIXHRSendable)
|
|
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMFormData)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
// -------------------------------------------------------------------------
|
|
// nsFormSubmission
|
|
nsresult
|
|
FormData::GetEncodedSubmission(nsIURI* aURI,
|
|
nsIInputStream** aPostDataStream)
|
|
{
|
|
NS_NOTREACHED("Shouldn't call FormData::GetEncodedSubmission");
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
FormData::Append(const nsAString& aName, const nsAString& aValue,
|
|
ErrorResult& aRv)
|
|
{
|
|
AddNameValuePair(aName, aValue);
|
|
}
|
|
|
|
void
|
|
FormData::Append(const nsAString& aName, Blob& aBlob,
|
|
const Optional<nsAString>& aFilename,
|
|
ErrorResult& aRv)
|
|
{
|
|
RefPtr<Blob> blob = GetBlobForFormDataStorage(aBlob, aFilename, aRv);
|
|
if (NS_WARN_IF(aRv.Failed())) {
|
|
return;
|
|
}
|
|
|
|
AddNameBlobPair(aName, blob);
|
|
}
|
|
|
|
void
|
|
FormData::Delete(const nsAString& aName)
|
|
{
|
|
// We have to use this slightly awkward for loop since uint32_t >= 0 is an
|
|
// error for being always true.
|
|
for (uint32_t i = mFormData.Length(); i-- > 0; ) {
|
|
if (aName.Equals(mFormData[i].name)) {
|
|
mFormData.RemoveElementAt(i);
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
FormData::Get(const nsAString& aName,
|
|
Nullable<OwningBlobOrUSVString>& aOutValue)
|
|
{
|
|
for (uint32_t i = 0; i < mFormData.Length(); ++i) {
|
|
if (aName.Equals(mFormData[i].name)) {
|
|
aOutValue.SetValue() = mFormData[i].value;
|
|
return;
|
|
}
|
|
}
|
|
|
|
aOutValue.SetNull();
|
|
}
|
|
|
|
void
|
|
FormData::GetAll(const nsAString& aName,
|
|
nsTArray<OwningBlobOrUSVString>& aValues)
|
|
{
|
|
for (uint32_t i = 0; i < mFormData.Length(); ++i) {
|
|
if (aName.Equals(mFormData[i].name)) {
|
|
OwningBlobOrUSVString* element = aValues.AppendElement();
|
|
*element = mFormData[i].value;
|
|
}
|
|
}
|
|
}
|
|
|
|
bool
|
|
FormData::Has(const nsAString& aName)
|
|
{
|
|
for (uint32_t i = 0; i < mFormData.Length(); ++i) {
|
|
if (aName.Equals(mFormData[i].name)) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
nsresult
|
|
FormData::AddNameBlobPair(const nsAString& aName, Blob* aBlob)
|
|
{
|
|
MOZ_ASSERT(aBlob);
|
|
|
|
FormDataTuple* data = mFormData.AppendElement();
|
|
SetNameBlobPair(data, aName, aBlob);
|
|
return NS_OK;
|
|
}
|
|
|
|
FormData::FormDataTuple*
|
|
FormData::RemoveAllOthersAndGetFirstFormDataTuple(const nsAString& aName)
|
|
{
|
|
FormDataTuple* lastFoundTuple = nullptr;
|
|
uint32_t lastFoundIndex = mFormData.Length();
|
|
// We have to use this slightly awkward for loop since uint32_t >= 0 is an
|
|
// error for being always true.
|
|
for (uint32_t i = mFormData.Length(); i-- > 0; ) {
|
|
if (aName.Equals(mFormData[i].name)) {
|
|
if (lastFoundTuple) {
|
|
// The one we found earlier was not the first one, we can remove it.
|
|
mFormData.RemoveElementAt(lastFoundIndex);
|
|
}
|
|
|
|
lastFoundTuple = &mFormData[i];
|
|
lastFoundIndex = i;
|
|
}
|
|
}
|
|
|
|
return lastFoundTuple;
|
|
}
|
|
|
|
void
|
|
FormData::Set(const nsAString& aName, Blob& aBlob,
|
|
const Optional<nsAString>& aFilename,
|
|
ErrorResult& aRv)
|
|
{
|
|
FormDataTuple* tuple = RemoveAllOthersAndGetFirstFormDataTuple(aName);
|
|
if (tuple) {
|
|
RefPtr<Blob> blob = GetBlobForFormDataStorage(aBlob, aFilename, aRv);
|
|
if (NS_WARN_IF(aRv.Failed())) {
|
|
return;
|
|
}
|
|
|
|
SetNameBlobPair(tuple, aName, blob);
|
|
} else {
|
|
Append(aName, aBlob, aFilename, aRv);
|
|
}
|
|
}
|
|
|
|
void
|
|
FormData::Set(const nsAString& aName, const nsAString& aValue,
|
|
ErrorResult& aRv)
|
|
{
|
|
FormDataTuple* tuple = RemoveAllOthersAndGetFirstFormDataTuple(aName);
|
|
if (tuple) {
|
|
SetNameValuePair(tuple, aName, aValue);
|
|
} else {
|
|
Append(aName, aValue, aRv);
|
|
}
|
|
}
|
|
|
|
uint32_t
|
|
FormData::GetIterableLength() const
|
|
{
|
|
return mFormData.Length();
|
|
}
|
|
|
|
const nsAString&
|
|
FormData::GetKeyAtIndex(uint32_t aIndex) const
|
|
{
|
|
MOZ_ASSERT(aIndex < mFormData.Length());
|
|
return mFormData[aIndex].name;
|
|
}
|
|
|
|
const OwningBlobOrUSVString&
|
|
FormData::GetValueAtIndex(uint32_t aIndex) const
|
|
{
|
|
MOZ_ASSERT(aIndex < mFormData.Length());
|
|
return mFormData[aIndex].value;
|
|
}
|
|
|
|
void
|
|
FormData::SetNameValuePair(FormDataTuple* aData,
|
|
const nsAString& aName,
|
|
const nsAString& aValue)
|
|
{
|
|
MOZ_ASSERT(aData);
|
|
aData->name = aName;
|
|
aData->value.SetAsUSVString() = aValue;
|
|
}
|
|
|
|
void
|
|
FormData::SetNameBlobPair(FormDataTuple* aData,
|
|
const nsAString& aName,
|
|
Blob* aBlob)
|
|
{
|
|
MOZ_ASSERT(aData);
|
|
MOZ_ASSERT(aBlob);
|
|
|
|
aData->name = aName;
|
|
aData->value.SetAsBlob() = aBlob;
|
|
}
|
|
|
|
// -------------------------------------------------------------------------
|
|
// nsIDOMFormData
|
|
|
|
NS_IMETHODIMP
|
|
FormData::Append(const nsAString& aName, nsIVariant* aValue)
|
|
{
|
|
uint16_t dataType;
|
|
nsresult rv = aValue->GetDataType(&dataType);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
if (dataType == nsIDataType::VTYPE_INTERFACE ||
|
|
dataType == nsIDataType::VTYPE_INTERFACE_IS) {
|
|
nsCOMPtr<nsISupports> supports;
|
|
nsID *iid;
|
|
rv = aValue->GetAsInterface(&iid, getter_AddRefs(supports));
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
moz_free(iid);
|
|
|
|
nsCOMPtr<nsIDOMBlob> domBlob = do_QueryInterface(supports);
|
|
RefPtr<Blob> blob = static_cast<Blob*>(domBlob.get());
|
|
if (domBlob) {
|
|
Optional<nsAString> temp;
|
|
ErrorResult rv;
|
|
Append(aName, *blob, temp, rv);
|
|
if (NS_WARN_IF(rv.Failed())) {
|
|
return rv.StealNSResult();
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
}
|
|
|
|
char16_t* stringData = nullptr;
|
|
uint32_t stringLen = 0;
|
|
rv = aValue->GetAsWStringWithSize(&stringLen, &stringData);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsString valAsString;
|
|
valAsString.Adopt(stringData, stringLen);
|
|
|
|
ErrorResult error;
|
|
Append(aName, valAsString, error);
|
|
if (NS_WARN_IF(error.Failed())) {
|
|
return error.StealNSResult();
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
/* virtual */ JSObject*
|
|
FormData::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
|
{
|
|
return FormDataBinding::Wrap(aCx, this, aGivenProto);
|
|
}
|
|
|
|
/* static */ already_AddRefed<FormData>
|
|
FormData::Constructor(const GlobalObject& aGlobal,
|
|
const Optional<NonNull<HTMLFormElement> >& aFormElement,
|
|
ErrorResult& aRv)
|
|
{
|
|
RefPtr<FormData> formData = new FormData(aGlobal.GetAsSupports());
|
|
if (aFormElement.WasPassed()) {
|
|
aRv = aFormElement.Value().WalkFormElements(formData);
|
|
}
|
|
return formData.forget();
|
|
}
|
|
|
|
// -------------------------------------------------------------------------
|
|
// nsIXHRSendable
|
|
|
|
NS_IMETHODIMP
|
|
FormData::GetSendInfo(nsIInputStream** aBody, uint64_t* aContentLength,
|
|
nsACString& aContentType, nsACString& aCharset)
|
|
{
|
|
nsFSMultipartFormData fs(NS_LITERAL_CSTRING("UTF-8"), nullptr);
|
|
|
|
for (uint32_t i = 0; i < mFormData.Length(); ++i) {
|
|
if (mFormData[i].value.IsBlob()) {
|
|
RefPtr<File> file = mFormData[i].value.GetAsBlob()->ToFile();
|
|
if (file) {
|
|
fs.AddNameBlobPair(mFormData[i].name, file);
|
|
continue;
|
|
}
|
|
|
|
ErrorResult rv;
|
|
file =
|
|
mFormData[i].value.GetAsBlob()->ToFile(NS_LITERAL_STRING("blob"), rv);
|
|
if (NS_WARN_IF(rv.Failed())) {
|
|
return rv.StealNSResult();
|
|
}
|
|
|
|
fs.AddNameBlobPair(mFormData[i].name, file);
|
|
} else if (mFormData[i].value.IsUSVString()) {
|
|
fs.AddNameValuePair(mFormData[i].name,
|
|
mFormData[i].value.GetAsUSVString());
|
|
} else {
|
|
MOZ_CRASH("This should no be possible.");
|
|
}
|
|
}
|
|
|
|
fs.GetContentType(aContentType);
|
|
aCharset.Truncate();
|
|
*aContentLength = 0;
|
|
NS_ADDREF(*aBody = fs.GetSubmissionBody(aContentLength));
|
|
|
|
return NS_OK;
|
|
}
|