D311311- Lando - Mozilla

firefox-beta

Manual merge conflict resolution and submission with moz-phab uplift required

While applying revision D311311 to firefox-beta, the following files had conflicts:

(Hint: try rebasing your changes on the latest commits from firefox-beta and re-submitting.)

dom/security/nsContentSecurityUtils.cpp @ 6110cc45255376135d98d467668bfcd7e53759e9

diff a/dom/security/nsContentSecurityUtils.cpp b/dom/security/nsContentSecurityUtils.cpp	(rejected hunks)
@@ -1884,19 +1904,20 @@
...

diff a/dom/security/nsContentSecurityUtils.cpp b/dom/security/nsContentSecurityUtils.cpp	(rejected hunks)
@@ -1884,19 +1904,20 @@
   CHECK_DIR(SCRIPT_SRC_DIRECTIVE, AllowBuiltinSrcVisitor);
   CHECK_DIR(STYLE_SRC_DIRECTIVE, StyleSrcVisitor);
   CHECK_DIR(IMG_SRC_DIRECTIVE, ImgSrcVisitor);
   CHECK_DIR(MEDIA_SRC_DIRECTIVE, MediaSrcVisitor);
   CHECK_DIR(CONNECT_SRC_DIRECTIVE, ConnectSrcVisitor);
+  CHECK_DIR(FRAME_SRC_DIRECTIVE, FrameSrcVisitor);
 
   // Make sure we have a checker for all the directives that are being used.
   nsTArray<nsString> directiveNames;
   policy->getDirectiveNames(directiveNames);
   for (nsString dir : directiveNames) {
     if (dir.EqualsLiteral("default-src") || dir.EqualsLiteral("object-src") ||
         dir.EqualsLiteral("script-src") || dir.EqualsLiteral("style-src") ||
         dir.EqualsLiteral("img-src") || dir.EqualsLiteral("media-src") ||
-        dir.EqualsLiteral("connect-src")) {
+        dir.EqualsLiteral("connect-src") || dir.EqualsLiteral("frame-src")) {
       continue;
     }
 
     NS_WARNING(
         nsPrintfCString(

in addition, Git reported this error: while searching for:
  CHECK_DIR(SCRIPT_SRC_DIRECTIVE, AllowBuiltinSrcVisitor);
  CHECK_DIR(STYLE_SRC_DIRECTIVE, StyleSrcVisitor);
  CHECK_DIR(IMG_SRC_DIRECTIVE, ImgSrcVisitor);
  CHECK_DIR(MEDIA_SRC_DIRECTIVE, MediaSrcVisitor);
  CHECK_DIR(CONNECT_SRC_DIRECTIVE, ConnectSrcVisitor);

  // Make sure we have a checker for all the directives that are being used.
  nsTArray<nsString> directiveNames;
  policy->getDirectiveNames(directiveNames);
  for (nsString dir : directiveNames) {
    if (dir.EqualsLiteral("default-src") || dir.EqualsLiteral("object-src") ||
        dir.EqualsLiteral("script-src") || dir.EqualsLiteral("style-src") ||
        dir.EqualsLiteral("img-src") || dir.EqualsLiteral("media-src") ||
        dir.EqualsLiteral("connect-src")) {
      continue;
    }

    NS_WARNING(
        nsPrintfCString(

Raw error output:
Problem while applying patch in revision 311311:

Checking patch dom/security/nsContentSecurityUtils.cpp...
Hunk #1 succeeded at 1451 (offset 1 line).
Hunk #2 succeeded at 1709 (offset 1 line).
error: while searching for:
  CHECK_DIR(SCRIPT_SRC_DIRECTIVE, AllowBuiltinSrcVisitor);
  CHECK_DIR(STYLE_SRC_DIRECTIVE, StyleSrcVisitor);
  CHECK_DIR(IMG_SRC_DIRECTIVE, ImgSrcVisitor);
  CHECK_DIR(MEDIA_SRC_DIRECTIVE, MediaSrcVisitor);
  CHECK_DIR(CONNECT_SRC_DIRECTIVE, ConnectSrcVisitor);

  // Make sure we have a checker for all the directives that are being used.
  nsTArray<nsString> directiveNames;
  policy->getDirectiveNames(directiveNames);
  for (nsString dir : directiveNames) {
    if (dir.EqualsLiteral("default-src") || dir.EqualsLiteral("object-src") ||
        dir.EqualsLiteral("script-src") || dir.EqualsLiteral("style-src") ||
        dir.EqualsLiteral("img-src") || dir.EqualsLiteral("media-src") ||
        dir.EqualsLiteral("connect-src")) {
      continue;
    }

    NS_WARNING(
        nsPrintfCString(

error: patch failed: dom/security/nsContentSecurityUtils.cpp:1884
Applying patch dom/security/nsContentSecurityUtils.cpp with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.

To manually resolve conflicts and submit your uplift:

git fetch origin
git switch -c uplift-firefox-beta-D311311 origin/beta
moz-phab patch D311311 --apply-to here
moz-phab uplift --train firefox-beta --assessment-id 3635

Run these commands from your Firefox checkout. Resolve any merge conflicts during the patch application process, then submit with moz-phab uplift.

Note: These commands assume your official Firefox remote is named origin. If you use a different remote name, adjust the commands accordingly.

View job

Landings for Stack Containing D311311

Uplifts

Stack containing revision D311311