Closed Bug 1584204 Opened 2 months ago Closed 28 days ago

Remove requestingLocation from nsContentPolicy.cpp

Categories

(Core :: DOM: Security, task, P2)

task

Tracking

()

RESOLVED FIXED
mozilla71
Tracking Status
firefox71 --- fixed

People

(Reporter: sstreich, Assigned: sstreich)

References

(Blocks 1 open bug)

Details

(Whiteboard: [domsecurity-active])

Attachments

(1 file)

nsContentPolicy.cpp::CheckPolicy we get the requestingLocation via the Principal->GetURI but its never used. As it doesn't have an effect i guess we can remove it from CheckPolicy and also from the Log Macro.

Assignee: nobody → sstreich
Status: NEW → ASSIGNED
Priority: -- → P2
Whiteboard: [domsecurity-active]
Keywords: checkin-needed

Pushed by ccoroiu@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/bda8ceea80d0
Remove requestingLocation from nsContentPolicy.cpp r=ckerschb

Keywords: checkin-needed

Backed out changeset bda8ceea80d0 (bug 1584204) for build bustage at build/src/dom/base/nsContentPolicy.cpp

Backout: https://hg.mozilla.org/integration/autoland/rev/10ce0c2900a19187e51f991ff89443cb07db0f78

Failure push: https://treeherder.mozilla.org/#/jobs?repo=autoland&revision=bda8ceea80d0d53bfd79d5db5828c6a66dd2d221

Failure log: https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=269032257&repo=autoland&lineNumber=32168

task 2019-09-30T12:03:24.466Z] 12:03:24 INFO - make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/dom/bindings'
[task 2019-09-30T12:03:24.661Z] 12:03:24 INFO - make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/dom/events'
[task 2019-09-30T12:03:24.662Z] 12:03:24 INFO - /builds/worker/fetches/sccache/sccache /builds/worker/fetches/clang/bin/clang++ -o Unified_cpp_dom_events1.o -c -I/builds/worker/workspace/build/src/obj-firefox/dist/stl_wrappers -I/builds/worker/workspace/build/src/obj-firefox/dist/system_wrappers -include /builds/worker/workspace/build/src/config/gcc_hidden.h -DNDEBUG=1 -DTRIMMED=1 -DOS_POSIX=1 -DOS_LINUX=1 -DSTATIC_EXPORTABLE_JS_API -DMOZ_HAS_MOZGLUE -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL -I/builds/worker/workspace/build/src/dom/events -I/builds/worker/workspace/build/src/obj-firefox/dom/events -I/builds/worker/workspace/build/src/obj-firefox/ipc/ipdl/_ipdlheaders -I/builds/worker/workspace/build/src/ipc/chromium/src -I/builds/worker/workspace/build/src/ipc/glue -I/builds/worker/workspace/build/src/docshell/base -I/builds/worker/workspace/build/src/dom/base -I/builds/worker/workspace/build/src/dom/html -I/builds/worker/workspace/build/src/dom/storage -I/builds/worker/workspace/build/src/dom/svg -I/builds/worker/workspace/build/src/dom/xml -I/builds/worker/workspace/build/src/dom/xul -I/builds/worker/workspace/build/src/js/xpconnect/wrappers -I/builds/worker/workspace/build/src/layout/forms -I/builds/worker/workspace/build/src/layout/generic -I/builds/worker/workspace/build/src/layout/xul -I/builds/worker/workspace/build/src/layout/xul/tree -I/builds/worker/workspace/build/src/obj-firefox/dist/include -I/builds/worker/workspace/build/src/obj-firefox/dist/include/nspr -I/builds/worker/workspace/build/src/obj-firefox/dist/include/nss -fPIC -DMOZILLA_CLIENT -include /builds/worker/workspace/build/src/obj-firefox/mozilla-config.h -Qunused-arguments -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -Qunused-arguments -Wall -Wbitfield-enum-conversion -Wempty-body -Wignored-qualifiers -Woverloaded-virtual -Wpointer-arith -Wshadow-field-in-constructor-modified -Wsign-compare -Wtype-limits -Wunreachable-code -Wunreachable-code-return -Wwrite-strings -Wno-invalid-offsetof -Wclass-varargs -Wfloat-overflow-conversion -Wfloat-zero-conversion -Wloop-analysis -Wc++1z-compat -Wc++2a-compat -Wcomma -Wimplicit-fallthrough -Werror=non-literal-null-conversion -Wstring-conversion -Wtautological-overlap-compare -Wtautological-unsigned-enum-zero-compare -Wtautological-unsigned-zero-compare -Wno-error=tautological-type-limit-compare -Wno-inline-new-delete -Wno-error=deprecated-declarations -Wno-error=array-bounds -Wno-error=backend-plugin -Wno-error=return-std-move -Wno-error=atomic-alignment -Wformat -Wformat-security -Wno-gnu-zero-variadic-macro-arguments -Wno-unknown-warning-option -Wno-return-type-c-linkage -D_GLIBCXX_USE_CXX11_ABI=0 -fno-sized-deallocation -fno-aligned-new -fcrash-diagnostics-dir=/builds/worker/artifacts -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -fno-math-errno -pthread -pipe -g -Xclang -load -Xclang /builds/worker/workspace/build/src/obj-firefox/build/clang-plugin/libclang-plugin.so -Xclang -add-plugin -Xclang moz-check -O2 -fno-omit-frame-pointer -funwind-tables -Werror -Wno-error=shadow -MD -MP -MF .deps/Unified_cpp_dom_events1.o.pp Unified_cpp_dom_events1.cpp
[task 2019-09-30T12:03:24.662Z] 12:03:24 INFO - make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/dom/events'
[task 2019-09-30T12:03:24.662Z] 12:03:24 INFO - make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/dom/bindings'
[task 2019-09-30T12:03:24.662Z] 12:03:24 INFO - dom/bindings/UnifiedBindings16.o
[task 2019-09-30T12:03:24.662Z] 12:03:24 INFO - make[4]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/dom/bindings'
[task 2019-09-30T12:03:25.543Z] 12:03:25 INFO - make[4]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/dom/base'
[task 2019-09-30T12:03:25.558Z] 12:03:25 INFO - /builds/worker/fetches/sccache/sccache /builds/worker/fetches/clang/bin/clang++ -o Unified_cpp_dom_base7.o -c -I/builds/worker/workspace/build/src/obj-firefox/dist/stl_wrappers -I/builds/worker/workspace/build/src/obj-firefox/dist/system_wrappers -include /builds/worker/workspace/build/src/config/gcc_hidden.h -DNDEBUG=1 -DTRIMMED=1 -DOS_POSIX=1 -DOS_LINUX=1 -DHAVE_SIDEBAR -DSTATIC_EXPORTABLE_JS_API -DMOZ_HAS_MOZGLUE -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL -I/builds/worker/workspace/build/src/dom/base -I/builds/worker/workspace/build/src/obj-firefox/dom/base -I/builds/worker/workspace/build/src/dom/battery -I/builds/worker/workspace/build/src/dom/events -I/builds/worker/workspace/build/src/dom/media -I/builds/worker/workspace/build/src/dom/network -I/builds/worker/workspace/build/src/caps -I/builds/worker/workspace/build/src/docshell/base -I/builds/worker/workspace/build/src/dom/base -I/builds/worker/workspace/build/src/dom/file -I/builds/worker/workspace/build/src/dom/geolocation -I/builds/worker/workspace/build/src/dom/html -I/builds/worker/workspace/build/src/dom/ipc -I/builds/worker/workspace/build/src/dom/storage -I/builds/worker/workspace/build/src/dom/svg -I/builds/worker/workspace/build/src/dom/u2f -I/builds/worker/workspace/build/src/dom/xbl -I/builds/worker/workspace/build/src/dom/xml -I/builds/worker/workspace/build/src/dom/xslt/xpath -I/builds/worker/workspace/build/src/dom/xul -I/builds/worker/workspace/build/src/extensions/permissions -I/builds/worker/workspace/build/src/gfx/2d -I/builds/worker/workspace/build/src/image -I/builds/worker/workspace/build/src/js/xpconnect/loader -I/builds/worker/workspace/build/src/js/xpconnect/src -I/builds/worker/workspace/build/src/js/xpconnect/wrappers -I/builds/worker/workspace/build/src/layout/base -I/builds/worker/workspace/build/src/layout/forms -I/builds/worker/workspace/build/src/layout/generic -I/builds/worker/workspace/build/src/layout/style -I/builds/worker/workspace/build/src/layout/svg -I/builds/worker/workspace/build/src/layout/xul -I/builds/worker/workspace/build/src/netwerk/base -I/builds/worker/workspace/build/src/netwerk/url-classifier -I/builds/worker/workspace/build/src/security/manager/ssl -I/builds/worker/workspace/build/src/widget -I/builds/worker/workspace/build/src/xpcom/ds -I/builds/worker/workspace/build/src/netwerk/sctp/datachannel -I/builds/worker/workspace/build/src/obj-firefox/ipc/ipdl/_ipdlheaders -I/builds/worker/workspace/build/src/ipc/chromium/src -I/builds/worker/workspace/build/src/ipc/glue -I/builds/worker/workspace/build/src/obj-firefox/dist/include -I/builds/worker/workspace/build/src/obj-firefox/dist/include/nspr -I/builds/worker/workspace/build/src/obj-firefox/dist/include/nss -fPIC -DMOZILLA_CLIENT -include /builds/worker/workspace/build/src/obj-firefox/mozilla-config.h -Qunused-arguments -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -Qunused-arguments -Wall -Wbitfield-enum-conversion -Wempty-body -Wignored-qualifiers -Woverloaded-virtual -Wpointer-arith -Wshadow-field-in-constructor-modified -Wsign-compare -Wtype-limits -Wunreachable-code -Wunreachable-code-return -Wwrite-strings -Wno-invalid-offsetof -Wclass-varargs -Wfloat-overflow-conversion -Wfloat-zero-conversion -Wloop-analysis -Wc++1z-compat -Wc++2a-compat -Wcomma -Wimplicit-fallthrough -Werror=non-literal-null-conversion -Wstring-conversion -Wtautological-overlap-compare -Wtautological-unsigned-enum-zero-compare -Wtautological-unsigned-zero-compare -Wno-error=tautological-type-limit-compare -Wno-inline-new-delete -Wno-error=deprecated-declarations -Wno-error=array-bounds -Wno-error=backend-plugin -Wno-error=return-std-move -Wno-error=atomic-alignment -Wformat -Wformat-security -Wno-gnu-zero-variadic-macro-arguments -Wno-unknown-warning-option -Wno-return-type-c-linkage -D_GLIBCXX_USE_CXX11_ABI=0 -fno-sized-deallocation -fno-aligned-new -fcrash-diagnostics-dir=/builds/worker/artifacts -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -fno-math-errno -pthread -pipe -g -Xclang -load -Xclang /builds/worker/workspace/build/src/obj-firefox/build/clang-plugin/libclang-plugin.so -Xclang -add-plugin -Xclang moz-check -O2 -fno-omit-frame-pointer -funwind-tables -Werror -I/builds/worker/workspace/build/src/widget/gtk/compat-gtk3 -pthread -I/usr/include/gtk-3.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gtk-3.0/unix-print -Wno-error=shadow -MD -MP -MF .deps/Unified_cpp_dom_base7.o.pp Unified_cpp_dom_base7.cpp
[task 2019-09-30T12:03:25.558Z] 12:03:25 INFO - In file included from Unified_cpp_dom_base7.cpp:38:
[task 2019-09-30T12:03:25.558Z] 12:03:25 ERROR - /builds/worker/workspace/build/src/dom/base/nsContentPolicy.cpp:178:3: error: more '%' conversions than data arguments [-Werror,-Wformat]
[task 2019-09-30T12:03:25.558Z] 12:03:25 INFO - LOG_CHECK("ShouldLoad");
[task 2019-09-30T12:03:25.558Z] 12:03:25 INFO - ^~~~~~~~~~~~~~~~~~~~~~~
[task 2019-09-30T12:03:25.558Z] 12:03:25 INFO - /builds/worker/workspace/build/src/dom/base/nsContentPolicy.cpp:165:62: note: expanded from macro 'LOG_CHECK'
[task 2019-09-30T12:03:25.558Z] 12:03:25 INFO - ("Content Policy: " logType ": <%s> <Ref:%s> result=%s",
[task 2019-09-30T12:03:25.558Z] 12:03:25 INFO - ^
[task 2019-09-30T12:03:25.558Z] 12:03:25 INFO - /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/Logging.h:271:56: note: expanded from macro 'MOZ_LOG'
[task 2019-09-30T12:03:25.558Z] 12:03:25 INFO - MOZ_LOG_EXPAND_ARGS _args);
[task 2019-09-30T12:03:25.558Z] 12:03:25 INFO - ^

[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/Logging.h:213:34: note: expanded from macro 'MOZ_LOG_EXPAND_ARGS'
[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - #define MOZ_LOG_EXPAND_ARGS(...) VA_ARGS
[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - ^~~~~~~~~~~
[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - In file included from Unified_cpp_dom_base7.cpp:38:
[task 2019-09-30T12:03:25.559Z] 12:03:25 ERROR - /builds/worker/workspace/build/src/dom/base/nsContentPolicy.cpp:188:3: error: more '%' conversions than data arguments [-Werror,-Wformat]
[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - LOG_CHECK("ShouldProcess");
[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - ^~~~~~~~~~~~~~~~~~~~~~~~~~
[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - /builds/worker/workspace/build/src/dom/base/nsContentPolicy.cpp:165:62: note: expanded from macro 'LOG_CHECK'
[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - ("Content Policy: " logType ": <%s> <Ref:%s> result=%s",
[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - ^
[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/Logging.h:271:56: note: expanded from macro 'MOZ_LOG'
[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - MOZ_LOG_EXPAND_ARGS _args);
[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - ^

[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - /builds/worker/workspace/build/src/obj-firefox/dist/include/mozilla/Logging.h:213:34: note: expanded from macro 'MOZ_LOG_EXPAND_ARGS'
[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - #define MOZ_LOG_EXPAND_ARGS(...) VA_ARGS
[task 2019-09-30T12:03:25.559Z] 12:03:25 INFO - ^~~~~~~~~~~
[task 2019-09-30T12:03:25.560Z] 12:03:25 INFO - In file included from Unified_cpp_dom_base7.cpp:38

Flags: needinfo?(sstreich)

Fixed the Error :) - Should build now

Flags: needinfo?(sstreich)
Keywords: checkin-needed

Pushed by csabou@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/494c7364c544
Remove requestingLocation from nsContentPolicy.cpp r=ckerschb

Keywords: checkin-needed

There's a r+ patch which didn't land and no activity in this bug for 2 weeks.
:sstreich, could you have a look please?
For more information, please visit auto_nag documentation.

Flags: needinfo?(sstreich)

Pushed by rmaries@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/6e923be2cf6a
Remove requestingLocation from nsContentPolicy.cpp r=ckerschb

Keywords: checkin-needed
Status: ASSIGNED → RESOLVED
Closed: 28 days ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla71
You need to log in before you can comment on or make changes to this bug.