Eric Rahm
9100016c49
Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
...
This is straightforward mapping of PR_LOG levels to their LogLevel
counterparts:
PR_LOG_ERROR -> LogLevel::Error
PR_LOG_WARNING -> LogLevel::Warning
PR_LOG_WARN -> LogLevel::Warning
PR_LOG_INFO -> LogLevel::Info
PR_LOG_DEBUG -> LogLevel::Debug
PR_LOG_NOTICE -> LogLevel::Debug
PR_LOG_VERBOSE -> LogLevel::Verbose
Instances of PRLogModuleLevel were mapped to a fully qualified
mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a
fully qualified mozilla::LogLevel::* level, and all other instances were
mapped to us a shorter format of LogLevel::*.
Bustage for usage of the non-fully qualified LogLevel were fixed by adding
|using mozilla::LogLevel;| where appropriate.
2015-06-03 15:25:57 -07:00
Eric Rahm
6d13987359
Bug 1165515 - Part 3: Convert PR_LOG_TEST to MOZ_LOG_TEST. r=froydnj
2015-06-03 15:22:28 -07:00
Marcos Caceres
21c80fd7b7
Bug 1089255 - Implement and test manifest-src CSP directive. r=bholley, r=dveditz, r=ckerschb
...
---
dom/base/nsContentPolicyUtils.h | 1 +
dom/base/nsDataDocumentContentPolicy.cpp | 3 +-
dom/base/nsIContentPolicy.idl | 2 +-
dom/base/nsIContentPolicyBase.idl | 7 +-
dom/base/nsISimpleContentPolicy.idl | 2 +-
dom/base/test/csp/browser.ini | 4 +
dom/base/test/csp/browser_test_web_manifest.js | 265 +++++++++++++++++++++
.../csp/browser_test_web_manifest_mixed_content.js | 55 +++++
dom/base/test/csp/file_CSP_web_manifest.html | 6 +
dom/base/test/csp/file_CSP_web_manifest.json | 1 +
.../test/csp/file_CSP_web_manifest.json^headers^ | 1 +
dom/base/test/csp/file_CSP_web_manifest_https.html | 4 +
dom/base/test/csp/file_CSP_web_manifest_https.json | 1 +
.../csp/file_CSP_web_manifest_mixed_content.html | 9 +
.../test/csp/file_CSP_web_manifest_remote.html | 8 +
dom/base/test/csp/file_csp_testserver.sjs | 14 +-
dom/base/test/csp/mochitest.ini | 7 +
dom/base/test/moz.build | 5 +-
dom/fetch/InternalRequest.cpp | 3 +
dom/fetch/InternalRequest.h | 2 +-
.../security/nsIContentSecurityPolicy.idl | 3 +-
dom/ipc/manifestMessages.js | 25 +-
dom/security/nsCSPUtils.cpp | 7 +
dom/security/nsCSPUtils.h | 10 +-
dom/security/nsMixedContentBlocker.cpp | 1 +
dom/webidl/CSPDictionaries.webidl | 1 +
extensions/permissions/nsContentBlocker.cpp | 6 +-
netwerk/mime/nsMimeTypes.h | 1 +
28 files changed, 439 insertions(+), 15 deletions(-)
create mode 100644 dom/base/test/csp/browser.ini
create mode 100644 dom/base/test/csp/browser_test_web_manifest.js
create mode 100644 dom/base/test/csp/browser_test_web_manifest_mixed_content.js
create mode 100644 dom/base/test/csp/file_CSP_web_manifest.html
create mode 100644 dom/base/test/csp/file_CSP_web_manifest.json
create mode 100644 dom/base/test/csp/file_CSP_web_manifest.json^headers^
create mode 100644 dom/base/test/csp/file_CSP_web_manifest_https.html
create mode 100644 dom/base/test/csp/file_CSP_web_manifest_https.json
create mode 100644 dom/base/test/csp/file_CSP_web_manifest_mixed_content.html
create mode 100644 dom/base/test/csp/file_CSP_web_manifest_remote.html
2015-06-02 15:42:19 -04:00
Carsten "Tomcat" Book
9432818a46
Backed out 14 changesets (bug 1165515) for linux x64 e10s m2 test failures
...
Backed out changeset d68dcf2ef372 (bug 1165515)
Backed out changeset 7c3b45a47811 (bug 1165515)
Backed out changeset b668b617bef2 (bug 1165515)
Backed out changeset d0916e1283a2 (bug 1165515)
Backed out changeset ac4dc7489942 (bug 1165515)
Backed out changeset e9632ce8bc65 (bug 1165515)
Backed out changeset c16d215cc7e4 (bug 1165515)
Backed out changeset e4d474f3c51a (bug 1165515)
Backed out changeset d87680bf9f7c (bug 1165515)
Backed out changeset b3c0a45ba99e (bug 1165515)
Backed out changeset 9370fa197674 (bug 1165515)
Backed out changeset 50970d668ca1 (bug 1165515)
Backed out changeset ffa4eb6d24b9 (bug 1165515)
Backed out changeset 5fcf1203cc1d (bug 1165515)
2015-06-02 13:05:56 +02:00
Eric Rahm
14740fdf18
Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
...
This is straightforward mapping of PR_LOG levels to their LogLevel
counterparts:
PR_LOG_ERROR -> LogLevel::Error
PR_LOG_WARNING -> LogLevel::Warning
PR_LOG_WARN -> LogLevel::Warning
PR_LOG_INFO -> LogLevel::Info
PR_LOG_DEBUG -> LogLevel::Debug
PR_LOG_NOTICE -> LogLevel::Debug
PR_LOG_VERBOSE -> LogLevel::Verbose
Instances of PRLogModuleLevel were mapped to a fully qualified
mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a
fully qualified mozilla::LogLevel::* level, and all other instances were
mapped to us a shorter format of LogLevel::*.
Bustage for usage of the non-fully qualified LogLevel were fixed by adding
|using mozilla::LogLevel;| where appropriate.
2015-06-01 22:17:33 -07:00
Eric Rahm
83ec610692
Bug 1165515 - Part 3: Convert PR_LOG_TEST to MOZ_LOG_TEST. r=froydnj
2015-06-01 22:17:19 -07:00
Wes Kocher
fcc808d96c
Backed out 14 changesets (bug 1165515) for b2g mochitest-6 permafail CLOSED TREE
...
Backed out changeset 9b97e2aa2ed9 (bug 1165515)
Backed out changeset 150606c022a2 (bug 1165515)
Backed out changeset 4e875a488349 (bug 1165515)
Backed out changeset 467e7feeb546 (bug 1165515)
Backed out changeset d6b6cc373197 (bug 1165515)
Backed out changeset 0615265b593c (bug 1165515)
Backed out changeset fafd1dce9f08 (bug 1165515)
Backed out changeset d1df869245f9 (bug 1165515)
Backed out changeset 6876a7c63611 (bug 1165515)
Backed out changeset b7841c94a9a3 (bug 1165515)
Backed out changeset e5e3617f7c73 (bug 1165515)
Backed out changeset 39be3db95978 (bug 1165515)
Backed out changeset 0ec74176f8de (bug 1165515)
Backed out changeset 5b928dd10d71 (bug 1165515)
2015-06-01 17:57:58 -07:00
Eric Rahm
579c7d8013
Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
...
This is straightforward mapping of PR_LOG levels to their LogLevel
counterparts:
PR_LOG_ERROR -> LogLevel::Error
PR_LOG_WARNING -> LogLevel::Warning
PR_LOG_WARN -> LogLevel::Warning
PR_LOG_INFO -> LogLevel::Info
PR_LOG_DEBUG -> LogLevel::Debug
PR_LOG_NOTICE -> LogLevel::Debug
PR_LOG_VERBOSE -> LogLevel::Verbose
Instances of PRLogModuleLevel were mapped to a fully qualified
mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a
fully qualified mozilla::LogLevel::* level, and all other instances were
mapped to us a shorter format of LogLevel::*.
Bustage for usage of the non-fully qualified LogLevel were fixed by adding
|using mozilla::LogLevel;| where appropriate.
2015-06-01 14:31:01 -07:00
Eric Rahm
a50b98baa8
Bug 1165515 - Part 3: Convert PR_LOG_TEST to MOZ_LOG_TEST. r=froydnj
2015-06-01 14:31:00 -07:00
Birunthan Mohanathas
084be39cfd
Bug 968520 - Add mozilla::fallible to FallibleTArray::AppendElement calls. r=froydnj
2015-05-28 11:07:44 -07:00
Christoph Kerschbaumer
2c5657e1e0
Bug 1129999 - Implement CSP devtool using GCLI; CSP to JSON (r=sstamm,bholley)
2015-05-21 11:16:04 -07:00
Eric Rahm
bac140c6c1
Bug 1165515 - Part 1: Convert PR_LOG to MOZ_LOG. r=froydnj
2015-05-21 13:22:04 -07:00
Eric Rahm
32b4ff6b18
Bug 1165518 - Part 2: Replace prlog.h with Logging.h. rs=froydnj
2015-05-19 11:15:34 -07:00
Eric Rahm
a835bb429e
Bug 1163196 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj
...
Check that logging is enabled before performing potentially expensive
operations.
2015-05-11 14:22:04 -07:00
Eric Rahm
a5379cc832
Bug 1163196 - Part 1: Remove instances of #ifdef PR_LOGGING in dom/security. r=froydnj
...
PR_LOGGING is now always defined, we can remove #ifdefs checking for it.
2015-05-11 14:22:03 -07:00
Andrew McCreight
c979f253c0
Bug 1152551, part 2 - Fix mode lines in dom/. r=jst
2015-05-03 15:32:37 -04:00
Boris Zbarsky
ee1cd19f1a
Bug 1157451. Make nsCORSListenerProxy::Init take an enum, not a boolean, to indicate what to do with data: URIs. And make it required, not defaulted to disallowing. r=smaug
2015-04-22 20:30:10 -04:00
Andrea Marchesini
eff949a801
Bug 1156632 - Remove unused forward class declarations - patch 4 - netwerk image and dom, r=ehsan
2015-04-22 08:29:20 +02:00
Nathan Froyd
fba75178ed
Bug 1153988 - create nsNullPrincipals directly, rather than going through do_CreateInstance; r=smaug
...
There's a better way to create null principals than
do_CreateInstance("@mozilla.org/nullprincipal;1"). Let's do that and
save ourselves some XPCOM overhead.
2015-04-13 14:47:41 -04:00
Tanvi Vyas
dad0ba9181
Bug 1148732 - When checking a document's scheme, check the innermost uri. r=dveditz, smaug
2015-04-15 10:18:27 -07:00
Wes Kocher
599525318e
Backed out changeset 050848a5273c (bug 1153988) for Windows build bustage CLOSED TREE
2015-04-14 14:42:59 -07:00
Nathan Froyd
5ba322e426
Bug 1153988 - create nsNullPrincipals directly, rather than going through do_CreateInstance; r=smaug
...
There's a better way to create null principals than
do_CreateInstance("@mozilla.org/nullprincipal;1"). Let's do that and
save ourselves some XPCOM overhead.
2015-04-13 14:47:41 -04:00
Christoph Kerschbaumer
c6b14e7e90
Bug 1004703 - ignore 'unsafe-inline' if nonce- or hash-source specified (r=sstamm)
2015-04-07 09:06:05 -07:00
Christoph Kerschbaumer
e4a73f690c
Bug 1086999 - CSP: Asterisk (*) wildcard should not allow blob:, data:, or filesystem: when matching source expressions (r=fabrice,pauljt)
2015-03-25 15:54:13 -07:00
Christoph Kerschbaumer
9f6f8915d8
Bug 1086999 - CSP: Asterisk (*) wildcard should not allow blob:, data:, or filesystem: when matching source expressions (r=sstamm)
2015-02-06 14:54:11 -08:00
Ehsan Akhgari
f2fdcdb534
Bug 1147996 - Enable interception of CSP reports through service workers; r=nsm
...
Currently when sending a CSP report, HttpBaseChannel::ShouldIntercept tries to
get access to the nsINetworkInterceptController interface through the channel's
notification callbacks, but in this case the notification callback is the
CSPReportRedirectSink object (thanks to nsCORSListenerProxy::Init).
This patch extends CSPReportRedirectSink to make it aware of
nsINetworkInterceptController, and have it route the request for
nsINetworkInterceptController correctly to the docshell without the need to
mess with the notification callbacks.
This will be tested in bug 1147699.
2015-03-28 16:28:40 -04:00
Ehsan Akhgari
b5cfb9bee0
Bug 1147695 - Enable interception of beacons through service workers; r=nsm
...
Currently when sending a beacon, HttpBaseChannel::ShouldIntercept tries
to get access to the nsINetworkInterceptController interface through the
channel's notification callbacks, but in this case the notification
callback is the nsCORSListenerProxy object (thanks to
nsCORSListenerProxy::Init).
nsCORSListenerProxy already knows how to forward calls to
nsIInterfaceRequestor::GetInterface to mOuterNotificationCallbacks, and
ShouldIntercept calls GetInterfce. But mOuterNotificationCallbacks is
set by default to the callbacks of the channel at the time
nsCORSListenerProxy is called, and the callbacks on this channel is
intentionally null, so ShouldIntercept bails out and the beacon never
gets intercepted.
This patch extends nsCORSListenerProxy to make it aware of
nsINetworkInterceptController, and have it route the request for
nsINetworkInterceptController correctly to the docshell without the need
to mess with the notification callbacks.
This will be tested in bug 1147699.
2015-03-28 16:28:37 -04:00
Andrea Marchesini
94545cbb2e
Bug 1148527 - Indentation fix after bug 1145631, r=ehsan
2015-03-27 18:52:19 +00:00
Christoph Kerschbaumer
d1707b1b87
Bug 1147026 - CSP should ignore query string when checking a resource load (r=dveditz)
2015-03-25 22:09:10 -07:00
Tanvi Vyas
3564d8631d
Bug 1082947 - Make sure the security state is set properly in nsMixedContentBlocker. r=smaug
2015-03-25 11:23:42 -07:00
Tanvi Vyas
40ecefd3d9
Bug 1082837 - Use nsresult for static ShouldLoad and use NS_IMETHODIMP for nsIContentPolicy::ShouldLoad(). CLOSED TREE
2015-03-24 10:51:15 -07:00
Tanvi Vyas
6455ea6848
Bug 1082837 - Call content policies on cached image redirects in imgLoader::ValidateSecurityInfo. Content policies check the last hop (final uri) of the cached image. For Mixed Content Blocker, we do an additional check to see if any of the intermediary hops went through an insecure redirect. r=smaug, feedback=seth
2015-03-24 09:18:48 -07:00
Nikhil Marathe
d7a9e5691b
Bug 1134324 - Set CORS mode and credentials on Fetch event Request. r=michal
...
renames fetch to fetchXHR() since fetch() is now a superpower.
2015-03-17 08:47:02 -07:00
Ryan VanderMeulen
321d8637a6
Backed out changesets 772945b1130d, cb83b6efa9ea, and 5f23080673ee (bug 1086999) for Gaia context_menu_test.js failures.
...
CLOSED TREE
2015-03-23 14:22:23 -04:00
Christoph Kerschbaumer
a3e5541984
Bug 1086999 - CSP: Asterisk (*) wildcard should not allow blob:, data:, or filesystem: when matching source expressions (r=sstamm)
2015-02-06 14:54:11 -08:00
Ehsan Akhgari
5cccea6f0f
Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj
...
This patch was automatically generated using the following script:
function convert() {
echo "Converting $1 to $2..."
find . \
! -wholename "*/.git*" \
! -wholename "obj-ff-dbg*" \
-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 MOZ_OVERRIDE override
convert MOZ_FINAL final
2015-03-21 12:28:04 -04:00
Alexandre Lissy
d834b67bad
Bug 1138895 - Use proper origin for CSP fast path cache. r=geekboy
2015-03-08 09:21:00 -04:00
Tanvi Vyas
4df1ca192f
Bug 1084504 - fix Mixed Content Blocking for redirects in e10s. r=mrbkap
2015-02-19 17:01:04 -08:00
Honza Bambas
241148d1bd
Bug 881830 - Make CORS redirect handling ignore redirects due to an STS upgrade. r=bz
2015-02-10 08:00:00 -05:00
Ryan VanderMeulen
d495ea5eb4
Backed out 4 changesets (bug 671389) for frequent B2G debug test_tcpsocket_client_and_server_basics.html crashes.
...
Backed out changeset b782435e5640 (bug 671389)
Backed out changeset 0f8d62109bfe (bug 671389)
Backed out changeset 8d6021f66c49 (bug 671389)
Backed out changeset cd3e227df9dc (bug 671389)
2015-02-05 16:48:18 -05:00
Deian Stefan
9c223b02e1
Bug 671389 - Part 1: Implement CSP sandbox directive r=ckerschb,smaug
2015-02-03 23:40:00 +01:00
Christoph Kerschbaumer
76bbe3bb9f
Bug 1121824 - Improve CORS console messages when request is blocked (r=sicking)
2015-01-22 17:20:58 -08:00
Carsten "Tomcat" Book
308953e270
Backed out changeset 0287d2e29d56 (bug 1121824) for m-1 test failures on a CLOSED TREE
2015-01-22 08:29:13 +01:00
Christoph Kerschbaumer
445d680ce3
Bug 1121824 - Improve CORS console messages when request is blocked (r=sicking)
2015-01-21 19:44:43 -08:00
Christoph Kerschbaumer
480ea3b45f
Bug 1122445 - CSP: don't normalize path for CSP checks (r=sstamm)
2015-01-21 13:48:03 -08:00
Wes Kocher
0f016d6a1b
Backed out 2 changesets (bug 1122445) for cppunit failures
...
Backed out changeset 1481719fc830 (bug 1122445)
Backed out changeset b685648927c6 (bug 1122445)
2015-01-21 15:16:05 -08:00
Christoph Kerschbaumer
ba75ca4b71
Bug 1122445 - CSP: don't normalize path for CSP checks (r=sstamm)
2015-01-21 13:48:03 -08:00
Phil Ringnalda
cd848381e8
Backed out 4 changesets (bug 1117650) because moving tests causes WebRTC tests to move from running first in a linux64 debug mochitest-e10s chunk to running last in another chunk, and they fail if they run last in a chunk
...
CLOSED TREE
Backed out changeset 9318cab3bd13 (bug 1117650)
Backed out changeset aff44058c799 (bug 1117650)
Backed out changeset eef01ed4d406 (bug 1117650)
Backed out changeset 1b25392be437 (bug 1117650)
2015-01-20 22:48:32 -08:00
James Kitchener
6a912052bb
Bug 1100184 - Flatten netwerk/base/{public,src}/ directories. r=mcmanus, r=poiru
2015-01-20 03:58:00 -05:00
Christoph Kerschbaumer
fedb3d2381
Bug 1117650 - Part 3 - Move all CORS tests into dom/security/test (r=sicking)
2015-01-05 09:47:13 -08:00