Closed Bug 1615297 Opened 6 months ago Closed 4 months ago

Refactor GetURI usage for StorageUtils.cpp

Categories

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

task

Tracking

()

RESOLVED FIXED
mozilla76
Tracking Status
firefox76 --- fixed

People

(Reporter: sstreich, Assigned: sstreich)

References

(Blocks 1 open bug)

Details

(Whiteboard: [domsecurity-active])

Attachments

(1 file)

See Metabug

Assignee: nobody → sstreich
No longer depends on: 1615259
Blocks: 1615321
No longer blocks: 1615321
Blocks: 1618194
No longer blocks: 1618194

Couldn't land:
We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again. applying /tmp/tmpB6U0bP caps/nsIPrincipal.idl Hunk #1 succeeded at 299 with fuzz 2 (offset -5 lines). caps/BasePrincipal.h Hunk #1 FAILED at 145. 1 out of 1 hunk FAILED -- saving rejects to file caps/BasePrincipal.h.rej caps/BasePrincipal.cpp Hunk #1 FAILED at 24. 1 out of 3 hunks FAILED -- saving rejects to file caps/BasePrincipal.cpp.rej abort: patch command failed: exited with status 256

Please rebase.

Tried to land again but encountered this:

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.
applying /tmp/tmpSkIEVb
caps/nsIPrincipal.idl
Hunk #1 succeeded at 325 with fuzz 2 (offset 2 lines).
caps/BasePrincipal.h
Hunk #1 FAILED at 150. 1 out of 1 hunk FAILED -- saving rejects to file caps/BasePrincipal.h.rej
abort: patch command failed: exited with status 256

Flags: needinfo?(sstreich)

Rebased onto current central, should work hopefully 🤞

Flags: needinfo?(sstreich)
Pushed by ccoroiu@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/d15b968aa6d1
Move Localstorage Keygen into Principal r=ckerschb,baku

Backed out changeset d15b968aa6d1 (Bug 1615297) for causing build bustage

Push with failures: https://treeherder.mozilla.org/#/jobs?repo=autoland&collapsedPushes=659858&resultStatus=testfailed%2Cbusted%2Cexception&classifiedState=unclassified&revision=d15b968aa6d1ee531650bc0dd55438021cad809a

https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=292603522&repo=autoland&lineNumber=52326

Backout link: https://treeherder.mozilla.org/#/jobs?repo=autoland&collapsedPushes=659858&searchStr=build&revision=43269f6c47816c6642323e918c3cf62642e6a0de

[task 2020-03-11T03:17:45.274Z] 03:17:45     INFO -      Finished release [optimized] target(s) in 4m 33s
[task 2020-03-11T03:17:45.274Z] 03:17:45     INFO -  make[4]: Leaving directory '/builds/worker/workspace/obj-build/toolkit/library/gtest/rust'
[task 2020-03-11T03:17:45.470Z] 03:17:45     INFO -  make[4]: Entering directory '/builds/worker/workspace/obj-build/toolkit/library/gtest'
[task 2020-03-11T03:17:45.470Z] 03:17:45     INFO -  toolkit/library/gtest/symverscript.stub
[task 2020-03-11T03:17:45.470Z] 03:17:45     INFO -  /builds/worker/workspace/obj-build/_virtualenvs/init_py3/bin/python -m mozbuild.action.file_generate /builds/worker/checkouts/gecko/build/gen_symverscript.py main symverscript .deps/symverscript.pp .deps/symverscript.stub /builds/worker/checkouts/gecko/toolkit/library/symverscript.in xul76a1
[task 2020-03-11T03:17:45.470Z] 03:17:45     INFO -  make[4]: Leaving directory '/builds/worker/workspace/obj-build/toolkit/library/gtest'
[task 2020-03-11T03:17:45.471Z] 03:17:45     INFO -  make[4]: Entering directory '/builds/worker/workspace/obj-build/toolkit/library/gtest'
[task 2020-03-11T03:17:45.471Z] 03:17:45     INFO -  toolkit/library/gtest/libxul.so
[task 2020-03-11T03:17:45.471Z] 03:17:45     INFO -  rm -f libxul.so
[task 2020-03-11T03:17:45.471Z] 03:17:45     INFO -  make[4]: Leaving directory '/builds/worker/workspace/obj-build/toolkit/library/gtest'
[task 2020-03-11T03:18:32.692Z] 03:18:32     INFO -  make[4]: Entering directory '/builds/worker/workspace/obj-build/toolkit/library/gtest'
[task 2020-03-11T03:18:32.692Z] 03:18:32     INFO -  /builds/worker/fetches/sccache/sccache /builds/worker/fetches/clang/bin/clang++ -std=gnu++17 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -Qunused-arguments -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 -Wempty-init-stmt -Wfloat-overflow-conversion -Wfloat-zero-conversion -Wloop-analysis -Wc++2a-compat -Wcomma -Wimplicit-fallthrough -Wunused-function -Wunused-variable -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 -D_GLIBCXX_USE_CXX11_ABI=0 -fno-sized-deallocation -fno-aligned-new -fcrash-diagnostics-dir=/builds/worker/artifacts -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/obj-build/build/clang-plugin/libclang-plugin.so -Xclang -add-plugin -Xclang moz-check -O2 -fno-omit-frame-pointer -funwind-tables -Werror  -fPIC -shared -Wl,-z,defs -Wl,--gc-sections -Wl,-h,libxul.so -o libxul.so /builds/worker/workspace/obj-build/toolkit/library/gtest/libxul_so.list   -lpthread -Wl,-z,noexecstack -Wl,-z,text -Wl,-z,relro -Wl,-z,nocopyreloc -Wl,-Bsymbolic-functions -Wl,--build-id=sha1 -fstack-protector-strong -Wl,-rpath-link,/builds/worker/workspace/obj-build/dist/bin -Wl,-rpath-link,/usr/local/lib   ../../../security/nss/lib/crmf/crmf_crmf/libcrmf.a ../../../js/src/build/libjs_static.a /builds/worker/workspace/obj-build/x86_64-unknown-linux-gnu/release/libgkrust_gtest.a ../../../security/sandbox/linux/libmozsandbox.so ../../../config/external/nspr/pr/libnspr4.so ../../../config/external/nspr/libc/libplc4.so ../../../config/external/nspr/ds/libplds4.so ../../../config/external/lgpllibs/liblgpllibs.so ../../../security/nss/lib/nss/nss_nss3/libnss3.so ../../../security/nss/lib/util/util_nssutil3/libnssutil3.so ../../../security/nss/lib/smime/smime_smime3/libsmime3.so ../../../config/external/sqlite/libmozsqlite3.so ../../../security/nss/lib/ssl/ssl_ssl3/libssl3.so ../../../widget/gtk/mozgtk/stub/libmozgtk_stub.so ../../../widget/gtk/mozwayland/libmozwayland.so -Wl,--version-script,symverscript  -ldl  -lrt -lm -lX11 -lX11-xcb -lxcb -lXcomposite -lXcursor -lXdamage -lXext -lXfixes -lXi -lXrender -lpthread -ldl -lc -lfreetype -lfontconfig -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -latk-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgio-2.0 -lxcb-shm -lpangoft2-1.0 -lXt -lgthread-2.0 -Wl,--version-script,/builds/worker/checkouts/gecko/build/unix/stdc++compat/hide_std.ld
[task 2020-03-11T03:18:32.693Z] 03:18:32     INFO -  /builds/worker/fetches/binutils/bin/ld: ../../../caps/BasePrincipal.o:(.data.rel.ro._ZTVN7mozilla13BasePrincipalE+0x140): undefined reference to `mozilla::BasePrincipal::GetStorageOriginKey(nsTSubstring<char>&)'
[task 2020-03-11T03:18:32.693Z] 03:18:32     INFO -  /builds/worker/fetches/binutils/bin/ld: ../../../caps/Unified_cpp_caps0.o:(.data.rel.ro._ZTVN7mozilla16ContentPrincipalE+0x140): undefined reference to `mozilla::BasePrincipal::GetStorageOriginKey(nsTSubstring<char>&)'
[task 2020-03-11T03:18:32.693Z] 03:18:32     INFO -  /builds/worker/fetches/binutils/bin/ld: ../../../caps/Unified_cpp_caps0.o:(.data.rel.ro._ZTV17ExpandedPrincipal+0x1f8): undefined reference to `mozilla::BasePrincipal::GetStorageOriginKey(nsTSubstring<char>&)'
[task 2020-03-11T03:18:32.693Z] 03:18:32     INFO -  /builds/worker/fetches/binutils/bin/ld: ../../../caps/Unified_cpp_caps0.o:(.data.rel.ro._ZTVN7mozilla13NullPrincipalE+0x140): undefined reference to `mozilla::BasePrincipal::GetStorageOriginKey(nsTSubstring<char>&)'
[task 2020-03-11T03:18:32.693Z] 03:18:32     INFO -  /builds/worker/fetches/binutils/bin/ld: ../../../caps/Unified_cpp_caps0.o:(.data.rel.ro._ZTVN7mozilla15SystemPrincipalE+0x140): undefined reference to `mozilla::BasePrincipal::GetStorageOriginKey(nsTSubstring<char>&)'
[task 2020-03-11T03:18:32.693Z] 03:18:32     INFO -  clang-9: error: linker command failed with exit code 1 (use -v to see invocation)
[task 2020-03-11T03:18:32.693Z] 03:18:32     INFO -  /builds/worker/checkouts/gecko/config/rules.mk:608: recipe for target 'libxul.so' failed
[task 2020-03-11T03:18:32.693Z] 03:18:32    ERROR -  make[4]: *** [libxul.so] Error 1
[task 2020-03-11T03:18:32.693Z] 03:18:32     INFO -  make[4]: Leaving directory '/builds/worker/workspace/obj-build/toolkit/library/gtest'
[task 2020-03-11T03:18:32.693Z] 03:18:32     INFO -  /builds/worker/checkouts/gecko/config/recurse.mk:74: recipe for target 'toolkit/library/gtest/target' failed
[task 2020-03-11T03:18:32.693Z] 03:18:32    ERROR -  make[3]: *** [toolkit/library/gtest/target] Error 2
[task 2020-03-11T03:18:32.693Z] 03:18:32     INFO -  make[3]: *** Waiting for unfinished jobs....
[task 2020-03-11T03:23:17.067Z] 03:23:17     INFO -  make[4]: Entering directory '/builds/worker/workspace/obj-build/toolkit/library/rust'
[task 2020-03-11T03:23:17.068Z] 03:23:17     INFO -  toolkit/library/rust/force-cargo-library-build
[task 2020-03-11T03:23:17.068Z] 03:23:17     INFO -  /builds/worker/fetches/rustc/bin/cargo rustc  --release --frozen --manifest-path /builds/worker/checkouts/gecko/toolkit/library/rust/Cargo.toml -vv --lib --target=x86_64-unknown-linux-gnu --features 'quantum_render webgpu cubeb_pulse_rust simd-accel cubeb-remoting moz_memory moz_places spidermonkey_rust cranelift_x86 gecko_profiler gecko_profiler_parse_elf new_xulstore new_cert_storage webrtc remote_agent fogotype wasm_library_sandboxing' --  -Clto
[task 2020-03-11T03:23:17.068Z] 03:23:17     INFO -         Fresh unicode-xid v0.2.0
[task 2020-03-11T03:23:17.068Z] 03:23:17     INFO -         Fresh cc v1.0.47
[task 2020-03-11T03:23:17.068Z] 03:23:17     INFO -         Fresh autocfg v0.1.6
[task 2020-03-11T03:23:17.068Z] 03:23:17     INFO -         Fresh pkg-config v0.3.9
[task 2020-03-11T03:23:17.068Z] 03:23:17     INFO -         Fresh lazy_static v1.4.0
[task 2020-03-11T03:23:17.068Z] 03:23:17     INFO -  warning: missing documentation for macro
[task 2020-03-11T03:23:17.068Z] 03:23:17     INFO -    --> /builds/worker/checkouts/gecko/third_party/rust/cfg-if/src/lib.rs:36:1
Flags: needinfo?(sstreich)
Pushed by archaeopteryx@coole-files.de:
https://hg.mozilla.org/integration/autoland/rev/dc6091aecfec
Move Localstorage Keygen into Principal r=ckerschb,baku
Status: NEW → RESOLVED
Closed: 4 months ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla76
Flags: needinfo?(sstreich)
You need to log in before you can comment on or make changes to this bug.