David Anderson
f3d3148ca7
Merge from mozilla-central.
2012-08-21 15:59:12 -07:00
Randell Jesup
29ac5c0b8c
Bug 773151: Convert nsCAutoString->nsAutoCString CLOSED TREE r=bsmedberg
2012-09-01 22:35:17 -04:00
David Anderson
a1a3db5e45
Forbid JITing annotated frames (bug 763233, r=mrbkap,jandem).
2012-08-16 18:26:11 -07:00
David Anderson
5d981ba8fe
Merge from mozilla-central.
2012-08-16 14:04:20 -07:00
David Anderson
348793a989
Remove JS_FrameIterator (bug 732653, r=luke,mrbkap).
2012-08-15 17:28:33 -07:00
Ryan VanderMeulen
f1e04816ea
Merge m-c to inbound.
2012-08-20 20:21:35 -04:00
Ehsan Akhgari
8c296bbcd4
Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg
...
This patch was generated by a script. Here's the source of the script for
future reference:
function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
! -wholename "*security/nss*" \
! -wholename "*/.hg*" \
! -wholename "obj-ff-dbg*" \
! -name nsXPCOMCID.h \
! -name prtypes.h \
-type f \
\( -iname "*.cpp" \
-o -iname "*.h" \
-o -iname "*.c" \
-o -iname "*.cc" \
-o -iname "*.idl" \
-o -iname "*.ipdl" \
-o -iname "*.ipdlh" \
-o -iname "*.mm" \) | \
xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}
convert PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t
convert PRIntn int
convert PRUintn unsigned
convert PRSize size_t
convert PROffset32 int32_t
convert PROffset64 int64_t
convert PRPtrdiff ptrdiff_t
convert PRFloat64 double
2012-08-22 11:56:38 -04:00
Blair McBride
84a0ccd6eb
Bug 758950 - Test fix, test_bug292789.html should load xpinstallConfirm.js with a newer JS version. r=dveditz
2012-08-20 15:30:29 +12:00
Gregor Wagner
606e9b8f76
Bug 781355 - Hook up mozBrowser to Permission Manager. r=jlebar
2012-08-15 10:22:30 -07:00
Mounir Lamouri
86ed743386
Bug 777072 - 3/7 - Update nsHostTable and nsHostEntry to make them aware of new security model. r=sicking,jlebar
2012-08-23 11:47:55 -07:00
Chris Jones
bf0b224214
No bug: Merge backout on a CLOSED TREE r=bustage
2012-08-23 22:33:04 -07:00
Chris Jones
124a2df024
Back out bug 777072, bug 619236, and bug 784878
2012-08-23 22:00:14 -07:00
Ryan VanderMeulen
e880c79745
Merge the last PGO-green inbound changeset to m-c.
2012-08-23 22:06:49 -04:00
Mounir Lamouri
49bd52f0f6
Bug 777072 - 3/7 - Update nsHostTable and nsHostEntry to make them aware of new security model. r=sicking,jlebar
2012-08-23 11:47:55 -07:00
Bobby Holley
c3b9f1b805
Bug 757046 - Convert enablePrivilege into an insecure test-only construct (preffed off everywhere but in automation). r=bz
2012-08-23 11:45:28 -07:00
Luke Wagner
0f96a5287e
Bug 784551 - remove JSSecurityCallbacks::findObjectPrincipals (r=mrbkap)
...
--HG--
extra : rebase_source : 8043b79eb031e4c3e196f6f693fa6a8a16099ecb
2012-08-23 09:51:09 -07:00
Luke Wagner
5909817000
Bug 668558 - remove JSSecurityCallbacks::subsumePrincipals (r=mrbkap)
...
--HG--
extra : rebase_source : 6cb1ce1b8f2505ca98235e7ad44138ac5f42737a
2012-08-23 09:45:24 -07:00
Aryeh Gregor
982100775b
Bug 780618 - Move all error codes to nsError.h; r=ehsan
2012-07-27 17:03:27 +03:00
Justin Lebar
ba21663f76
Bug 777135 - Part 1: Add nice C++ version of nsIPrincipal::GetAppStatus. r=mounir
...
--HG--
extra : rebase_source : 6150a2b708faa41f1f6c7723260fc52444b7ea8d
2012-08-13 12:58:38 -04:00
Peter Van der Beken
854457d901
Fix for bug 768692 (Move DOM list binding generation to the new DOM binding codegen). r=bzbarsky.
...
--HG--
extra : rebase_source : 651a0fac4c9a87ef1c0a9cd91588c6421fd050c4
2012-05-22 15:46:20 +02:00
Ms2ger
331accfcb4
Bug 780387 - Part b: Stop using PRIntn; r=bsmedberg
2012-08-09 09:09:40 +02:00
Ian Melven
d09de1cd52
Bug 341604 - modify CheckMayLoad to allow sandboxed workers to load blob and data URIs r=jst
2012-08-20 11:34:33 -07:00
Gabor Krizsanits
f51ee4f7f0
Bug 777705 - Default policy for expanded principals. r=mrbkap
2012-08-20 11:22:34 -07:00
Fabrice Desré
b6c9cb580d
Bug 781224 - Rename APP_STATUS_TRUSTED to APP_STATUS_PRIVILEGED in nsIPrincipal [r=mounir]
2012-08-08 10:21:54 -07:00
Eric Faust
d4a732fc86
Bug 775788 - Modify JSFunctionSpec to accept JSJitInfos. (r=luke)
2012-08-07 22:26:19 -07:00
Justin Lebar
cee459a4a6
No bug - Fix error in nsIPrincipal comment (it's nsIScriptSecurityManager::NO_APP_ID, not nsIAppsService::NO_APP_ID). r=me DONTBUILD
2012-08-06 00:31:22 -04:00
Mike Hommey
c1b35e7b2a
Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted
2012-08-04 20:26:44 +02:00
Mounir Lamouri
fcaf100669
Bug 776824 - Add isInBrowserElement to nsIPrincipal. r=mrbkap sr=sicking
2012-07-31 17:47:20 +02:00
Aryeh Gregor
57c0ad57fb
Bug 777292 part 2 - Change all nsnull to nullptr
2012-07-30 17:20:58 +03:00
Justin Lebar
56db9a6e24
Bug 772987 - Part 2: Use Static{Auto,Ref}Ptr where appropriate. r=mounir
...
--HG--
extra : rebase_source : 4e3e72ba53cd0177160f80231eebeb4972119eec
2012-07-26 15:33:45 -04:00
William Chen
f02258ae34
Bug 777582 - Make nsPrincipal deserialize members in the order that they are serialized. r=mounir
2012-07-25 20:12:03 -04:00
Joshua Cranmer
de30491499
Bug 773637 - Kill NS_SCRIPTABLE attributes, Part 2: Remove NS_SCRIPTABLE. r=ehsan
...
--HG--
extra : rebase_source : 83020e0a1961ed5b33d5e0599419c6b7b82caa87
2012-07-06 15:31:49 -05:00
Joshua Cranmer
e1cdfe2f05
Bug 773637 - Kill NS_SCRIPTABLE annotations, Part 1: Remove NS_*PARAM annotations. r=ehsan
...
--HG--
extra : rebase_source : a0b4bc50fece36d9a90fed61431635948bfa33b5
2012-07-06 15:14:07 -05:00
Mounir Lamouri
bd21420645
Bug 758258 - part 6 - Change how extendedOrigin is generated. r=sicking
2012-07-21 17:37:02 -07:00
Mounir Lamouri
40f1fac706
Bug 758258 - Tests. r=sicking
2012-07-21 17:14:25 -07:00
Jonas Sicking
690071fc50
Bug 774585: Rename getCodebasePrincipal to getSimpleCodebasePrincipal since the behavior has semantically changed. r=mounir
2012-07-21 00:29:40 -07:00
Ed Morley
4d382e6311
Bug 774585 - Temporarily disable test_principal_extendedorigin_appid_appstatus.html for failures on OS X 10.7 (and possibly others); rs=mounir on a CLOSED TREE
2012-07-20 12:20:55 +01:00
Mounir Lamouri
397fdcc90e
No bug - fix build bustage on Windows/Android and M-oth on MacOS. r=me CLOSED TREE
2012-07-20 02:14:25 -07:00
Mounir Lamouri
41def80cf5
No bug - Pushing on a CLOSED TREE. r=me
2012-07-20 00:32:12 -07:00
Mounir Lamouri
ccb573e0c6
Bug 774585 - Tests. r=sicking
2012-07-20 00:26:05 -07:00
Jonas Sicking
0bed47c306
Bug 774585 - Make GetChannelPrincipal get the correct app principal. r=mounir
2012-07-20 00:07:49 -07:00
Jonas Sicking
ae7e96692e
Bug 774585 - Add GetDocShellCodebasePrincipal to nsIScriptSecurityManager. r=mounir
2012-07-20 00:06:24 -07:00
Mounir Lamouri
f8a7531c39
Bug 758258 - part 5 - Add GetAppCodebasePrincipal and GetNoAppCodebasePrincipal to nsIScriptSecurityManager. r=mrbkap sr=sicking
2012-07-19 20:28:08 -07:00
Mounir Lamouri
48b9e1c384
Bug 758258 - part 4 - Update CreateCodebasePrincipal() to take app/inbrowser info. r=sicking
2012-07-19 15:32:08 -07:00
Mounir Lamouri
946396d9c4
Bug 758258 - part 3 - Add extendedOrigin, appStatus and appId to nsIPrincipal. r=bholley sr=sicking
2012-07-19 22:44:03 -07:00
Mounir Lamouri
9b29b3b2e7
No bug - Disable failing test on a CLOSED TREE. r=me
2012-07-19 18:55:05 -07:00
Mounir Lamouri
28e8d77612
No bug - fix test bustage on a CLOSED TREE. r=me
2012-07-19 17:35:42 -07:00
Mounir Lamouri
6e7f2253ad
Bug 758258 - Part 2 - Add GetExtendedOrigin(), NO_APP_ID and UNKNOWN_APP_ID. r=sicking
2012-07-18 21:25:19 -07:00
Mounir Lamouri
0ec7cc8b2c
Bug 758258 - Part 1 - Create skeleton for extendedOrigin tests. r=sicking
2012-07-19 16:14:11 -07:00
Steve Fink
eaba73b970
Backed out changeset 1bafff5720a8
2012-07-19 15:22:36 -07:00
Steve Fink
cd96c07f2c
Backed out changeset afc1cf222996
2012-07-19 15:22:32 -07:00
Mounir Lamouri
a849186201
Bug 758258 - Part 2 - Add GetExtendedOrigin(), NO_APP_ID and UNKNOWN_APP_ID. r=sicking
2012-07-18 21:25:19 -07:00
Mounir Lamouri
8638ac5ada
Bug 758258 - Part 1 - Create skeleton for extendedOrigin tests. r=sicking
2012-07-19 10:29:21 -07:00
Mounir Lamouri
c50dc913f1
Bug 775354 - Add a static method to be able to compute the origin based on nsPrincipal algorithm. r=mrbkap
2012-07-18 21:23:44 -07:00
Mounir Lamouri
8b371aed8a
Bug 327244 (2/2) - Remove nsIScriptSecurityManager::CheckLoadURI(). r=sicking,jlebar
2012-07-18 15:27:02 -07:00
Mounir Lamouri
ff9d427dc7
Bug 327244 (1/2) - Remove nsIScriptSecurityManager::CheckLoadURIStr(). r=sicking
2012-07-19 10:49:17 -07:00
Ed Morley
bb507d18ac
Backout ea6db8f420c0 (bug 770831), b51c79ee0883 (bug 774957), 020f6ed5958b (bug 758258), 11d8e19e1fca (bug 758258), 707fc51bfe2e (bug 775354), 489d944a6fe6 (bug 327244), be7df3c9d50f (bug 327244) for m-oth orange
2012-07-19 08:29:48 +01:00
Mounir Lamouri
147b74c44a
Bug 758258 - Part 2 - Add GetExtendedOrigin(), NO_APP_ID and UNKNOWN_APP_ID. r=sicking
2012-07-18 21:25:19 -07:00
Mounir Lamouri
29d37627cd
Bug 758258 - Part 1 - Create skeleton for extendedOrigin tests. r=sicking
2012-07-18 21:26:30 -07:00
Mounir Lamouri
b7c8a681c6
Bug 775354 - Add a static method to be able to compute the origin based on nsPrincipal algorithm. r=mrbkap
2012-07-18 21:23:44 -07:00
Mounir Lamouri
30741d2c3a
Bug 327244 (2/2) - Remove nsIScriptSecurityManager::CheckLoadURI(). r=sicking,jlebar
2012-07-18 15:27:02 -07:00
Mounir Lamouri
2b7700d07d
Bug 327244 (1/2) - Remove nsIScriptSecurityManager::CheckLoadURIStr(). r=sicking
2012-07-18 13:35:15 -07:00
Jonas Sicking
6372b568ef
Bug 774585: Remove unused argument in nsScriptSecurityManager. r=mrbkap
2012-07-17 22:28:47 -07:00
Bobby Holley
c80430a612
Bug 655649 - Recompute cross-compartment wrappers when setting document.domain. r=mrbkap
2012-07-12 10:10:15 +02:00
Nathan Froyd
5b30baa4c3
Bug 370750 - consolidate mochitest files installation; r=glandium
...
With assistance on the patch from Ms2ger, Waldo, and Mossop.
2012-07-03 16:49:02 -04:00
Makoto Kato
70a261905e
Bug 769533 - Part 1. Replace AppendWithConversion with others. r=jlebar
2012-07-06 18:43:28 +09:00
Bobby Holley
82e093909f
Bug 754202 - Check principal in IsCapabilityEnabled when there's no code on the stack. r=mrbkap
2012-06-28 23:47:55 +02:00
Bobby Holley
fb95f07878
Bug 754202 - Remove mContextPrincipal usage from within nsScriptSecurityManager. r=mrbkap
2012-06-28 23:47:55 +02:00
Bobby Holley
fb16bc5a98
Bug 754202 - Remove context pushing/popping API. r=mrbkap Each one of these uses grabs the principal off of an object for pushing, but also enters the compartment of that object. So we shouldn't need this anymore.
...
Can I get a 'hell yeah'?
2012-06-28 23:47:55 +02:00
Bobby Holley
e83c215d0b
Bug 754202 - Pull subject principals directly off the compartment. r=mrbkap It would be nice to check these principals against the principals acquired using the old mechanism. Unfortunately, they often differ. Because CAPS uses JS stack frames, any time we enter a compartment and do an operation (even throwing an Access-Denied exception) without running any JS code, we'll end up with a different principal.
...
Our security story is pretty darn tied to compartments at this point, so let's
just pull the trigger.
2012-06-28 23:47:55 +02:00
Bobby Holley
ae62a76b7e
Bug 754202 - Pull object principals directly off the compartment and assert that behavior doesn't change. r=bz
2012-06-28 23:47:55 +02:00
Justin Lebar
01eddea821
Bug 766173 - Hold a strong ref to nsScriptSecurityManager, instead of hoping that it won't get addref'ed or released. r=bsmedberg
...
--HG--
rename : mobile/android/base/resources/drawable/tabs_button_contracted.xml => mobile/android/base/resources/drawable/tabs_button.xml
extra : rebase_source : 8f861c2298fd053a0e1f6deb6f9945040ea8db90
2012-06-19 13:20:34 -04:00
Ehsan Akhgari
822836504d
Bug 758992 - Make the classes which use the XPCOM nsISupports implementation macros final, to avoid the warning about deleting using a pointer to a base class with virtual functions and no virtual dtor (caps parts); r=bholley
2012-06-12 23:58:27 -04:00
Ryan VanderMeulen
6e456f6d86
Merge m-c to inbound
2012-06-10 21:34:50 -04:00
L. David Baron
91859c5a28
Backout bug 754202 (all patches, rather than just patches 3-7).
2012-06-10 17:22:31 -07:00
Ryan VanderMeulen
9409d47933
Backout 90107a2a0c64 (bug 754202) for real due to orange.
2012-06-10 19:46:20 -04:00
Ryan VanderMeulen
b74e4a29db
Revert c39d36167b99 due to a horribly munged backout.
2012-06-10 19:44:50 -04:00
Ryan VanderMeulen
061d4c2616
Backout the bug 754202 backout due to orange.
2012-06-10 19:37:47 -04:00
Bobby Holley
c82e89c9ae
Merge backout.
2012-06-11 00:28:30 +02:00
Bobby Holley
11cffb7c78
Back out bug 754202. r=me
2012-06-11 00:28:05 +02:00
Ms2ger
ec0e9af43b
Bug 734891 - Followup: Fix build warnings in nsPrincipal.cpp.
2012-06-10 21:25:17 +02:00
Gabor Krizsanits
05c9d300b3
Bug 734891 - part 2: Adding ExpandedPrincipal support
2012-06-09 15:19:26 -07:00
Gabor Krizsanits
1edd821586
Bug 734891 - part 1: Decoupling URI based logic from caps/certificate related logic of nsPrincipal
2012-06-09 15:19:26 -07:00
Gabor Krizsanits
f72703f11c
Bug 734891 - part 0: rearanging nsPrincipal methods for follow up
2012-06-09 15:19:26 -07:00
Bobby Holley
76ae847652
Bug 754202 - Remove mContextPrincipal usage from within nsScriptSecurityManager. r=mrbkap
2012-06-07 14:28:22 +02:00
Bobby Holley
59dda709f9
Bug 754202 - Remove context pushing/popping API. r=mrbkap
...
Each one of these uses grabs the principal off of an object for pushing, but also enters the compartment of that object. So we shouldn't need this anymore.
Can I get a 'hell yeah'?
2012-06-07 14:28:21 +02:00
Bobby Holley
1449c05d14
Bug 754202 - Pull subject principals directly off the compartment. r=mrbkap
...
It would be nice to check these principals against the principals acquired
using the old mechanism. Unfortunately, they often differ. Because CAPS uses
JS stack frames, any time we enter a compartment and do an operation (even
throwing an Access-Denied exception) without running any JS code, we'll end
up with a different principal.
Our security story is pretty darn tied to compartments at this point, so let's
just pull the trigger.
2012-06-07 14:28:21 +02:00
Bobby Holley
cc0e94bad7
Bug 754202 - Pull object principals directly off the compartment, and assert that behavior doesn't change. r=bz
2012-06-07 14:28:21 +02:00
Boris Zbarsky
31ccf86cf9
Bug 761707 part 2. Drop the vestigial jsclass argument to UnwrapDOMObject. r=bholley
2012-06-06 15:59:46 -04:00
Gervase Markham
87620f5676
Bug 716478 - update licence to MPL 2.
2012-05-21 12:12:37 +01:00
Brian Hackett
f8aa8c3c5a
Use handles in API object hooks where possible, bug 750733. r=billm
2012-05-19 15:03:45 -07:00
Brian Hackett
aeda1d5c01
Backed out changeset 5fc7462dd394 for android orange.
2012-05-19 11:52:55 -07:00
Brian Hackett
54e8d378fb
Use handles in API object hooks where possible, bug 750733. r=billm
2012-05-19 09:48:09 -07:00
Ms2ger
5a68e74435
Bug 754968 - Part c: Make BindingUtils.h not require private xpconnect headers; r=bholley
2012-05-18 10:29:40 +02:00
Tom Schuster
889e3a0487
Bug 752226 - Remove any use of JSVAL_IS_OBJECT. r=luke,Ms2ger
2012-05-11 17:46:26 +02:00
Ed Morley
4c4c3cfd18
Backout 9b0fcaacb788 & bf3fef257e68 (bug 752226) for mochitest-other orange
2012-05-11 18:25:52 +01:00
Tom Schuster
6e0861373a
Bug 752226 - Remove any use of JSVAL_IS_OBJECT. r=luke,Ms2ger
...
--HG--
extra : rebase_source : edf2077f8b8bad1970eab6ebe9996e761d4e596c
2012-05-11 17:46:26 +02:00
Ms2ger
9a5ae693e0
Bug 741245 - Remove nsresult return value from nsXPConnect::GetSafeJSContext(); r=bholley
2012-05-05 11:00:05 +02:00
Boris Zbarsky
224115946f
Bug 742217. Reduce the use of nested namespaces in our binding code. r=peterv,bent
...
In the new setup, all per-interface DOM binding files are exported into
mozilla/dom. General files not specific to an interface are also exported into
mozilla/dom.
In terms of namespaces, most things now live in mozilla::dom. Each interface
Foo that has generated code has a mozilla::dom::FooBinding namespace for said
generated code (and possibly a mozilla::bindings::FooBinding_workers if there's
separate codegen for workers).
IDL enums are a bit weird: since the name of the enum and the names of its
entries all end up in the same namespace, we still generate a C++ namespace
with the name of the IDL enum type with "Values" appended to it, with a
::valuelist inside for the actual C++ enum. We then typedef
EnumFooValues::valuelist to EnumFoo. That makes it a bit more difficult to
refer to the values, but means that values from different enums don't collide
with each other.
The enums with the proto and constructor IDs in them now live under the
mozilla::dom::prototypes and mozilla::dom::constructors namespaces respectively.
Again, this lets us deal sanely with the whole "enum value names are flattened
into the namespace the enum is in" deal.
The main benefit of this setup (and the reason "Binding" got appended to the
per-interface namespaces) is that this way "using mozilla::dom" should Just
Work for consumers and still allow C++ code to sanely use the IDL interface
names for concrete classes, which is fairly desirable.
--HG--
rename : dom/bindings/Utils.cpp => dom/bindings/BindingUtils.cpp
rename : dom/bindings/Utils.h => dom/bindings/BindingUtils.h
2012-05-03 00:35:38 -04:00
Bobby Holley
e79c2696df
Bug 750859 - Remove {Disable,Revert}Capability. r=bz, PGO helper on CLOSED TREE
2012-05-02 23:57:43 +02:00