Commit 34df9a72 authored by Neil Deakin's avatar Neil Deakin
Browse files

Bug 1829981, reduce maximum filename length to 254, as Windows File Explorer... 

Bug 1829981, reduce maximum filename length to 254, as Windows File Explorer won't allow deleting filenames longer than this, r=Gijs

Differential Revision: https://phabricator.services.mozilla.com/D176911
parent 53840805

uriloader/exthandler/nsExternalHelperAppService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ using namespace mozilla; 
using namespace mozilla::ipc;

using namespace mozilla::dom;



#define kDefaultMaxFileNameLength 255

#define kDefaultMaxFileNameLength 254



// Download Folder location constants

#define NS_PREF_DOWNLOAD_DIR "browser.download.dir"

uriloader/exthandler/tests/mochitest/save_filenames.html

+5 −5
Original line number Diff line number Diff line
@@ -37,15 +37,15 @@ 


<!-- long filename -->

<img id="i8" src="http://localhost:8000/save_filename.sjs?type=png&filename=averylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilename.png"

     data-filename="averylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfi.png">

     data-filename="averylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongf.png">



<!-- long filename with invalid extension -->

<img id="i9" src="http://localhost:8000/save_filename.sjs?type=png&filename=bverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilename.exe"

     data-filename="bverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfi.png">

     data-filename="bverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongf.png">



<!-- long filename with invalid extension -->

<img id="i10" src="http://localhost:8000/save_filename.sjs?type=png&filename=cverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilename.exe.jpg"

     data-filename="cverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfi.png">

     data-filename="cverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongfilenameverylongf.png">



<!-- jpeg with jpg extension -->

<img id="i11" src="http://localhost:8000/save_filename.sjs?type=jpeg&filename=thejpg.jpg" data-filename="thejpg.jpg">
@@ -97,7 +97,7 @@ 


<!-- script with long filename -->

<script id="i25" src="http://localhost:8000/save_filename.sjs?type=js&filename=script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789.js"

        data-filename="script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456.js"></script>

        data-filename="script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script123456789script12345.js"></script>



<!-- binary with exe extension -->

<object id="i26" data="http://localhost:8000/save_filename.sjs?type=binary&filename=download1.exe"
@@ -188,7 +188,7 @@ 
     data-nodrag="true" data-filename="text3.gonk">



<!-- text with long filename -->

<img id="i50" src="http://localhost:8000/text3.gonk?type=text&filename=text0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789text0123456789zztext0123456789zztext0123456789zztext01234567.exe.txt" data-nodrag="true" data-filename="text0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456.txt">

<img id="i50" src="http://localhost:8000/text3.gonk?type=text&filename=text0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789text0123456789zztext0123456789zztext0123456789zztext01234567.exe.txt" data-nodrag="true" data-filename="text0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext0123456789zztext012345.txt">



<!-- webp image -->

<img id="i51" src="http://localhost:8000/save_filename.sjs?type=webp&filename=webpimage.webp"

uriloader/exthandler/tests/unit/test_filename_sanitize.js

+13 −13
Original line number Diff line number Diff line
@@ -41,19 +41,19 @@ add_task(async function validate_filename_method() { 
  Assert.equal(checkFilename(" happy\u061c\u2069.png", 0), "happy__.png");

  Assert.equal(

    checkFilename("12345678".repeat(31) + "abcdefgh.png", 0),

    "12345678".repeat(31) + "abc.png"

    "12345678".repeat(31) + "ab.png"

  );

  Assert.equal(

    checkFilename("簡単".repeat(41) + ".png", 0),

    "簡単".repeat(41) + ".png"

  );

  Assert.equal(

    checkFilename("簡単".repeat(42) + ".png", 0),

    "簡単".repeat(41) + "簡.png"

    checkFilename("a" + "簡単".repeat(42) + ".png", 0),

    "a" + "簡単".repeat(40) + "簡.png"

  );

  Assert.equal(

    checkFilename("簡単".repeat(56) + ".png", 0),

    "簡単".repeat(40) + "簡.png"

    checkFilename("a" + "簡単".repeat(56) + ".png", 0),

    "a" + "簡単".repeat(40) + ".png"

  );

  Assert.equal(checkFilename("café.png", 0), "café.png");

  Assert.equal(
@@ -62,7 +62,7 @@ add_task(async function validate_filename_method() { 
  );

  Assert.equal(

    checkFilename("café".repeat(51) + ".png", 0),

    "café".repeat(50) + ".png"

    "café".repeat(49) + "caf.png"

  );



  Assert.equal(
@@ -84,11 +84,11 @@ add_task(async function validate_filename_method() { 
  );

  Assert.equal(

    checkFilename("noextensionfile".repeat(17), 0),

    "noextensionfile".repeat(16) + "noextension.png"

    "noextensionfile".repeat(16) + "noextensio.png"

  );

  Assert.equal(

    checkFilename("noextensionfile".repeat(16) + "noextensionfil.", 0),

    "noextensionfile".repeat(16) + "noextension.png"

    "noextensionfile".repeat(16) + "noextensio.png"

  );



  Assert.equal(checkFilename("  first  .png  ", 0), "first .png");
@@ -130,7 +130,7 @@ add_task(async function validate_filename_method() { 
  );

  Assert.equal(

    checkFilename(repeatStr + "seventh.png", 0),

    repeatStr + "sev.png"

    repeatStr + "se.png"

  );



  // no filename, so index is used by default.
@@ -154,19 +154,19 @@ add_task(async function validate_filename_method() { 
  let ext = ".fairlyLongExtension";

  Assert.equal(

    checkFilename(repeatStr + ext, mimeService.VALIDATE_SANITIZE_ONLY),

    repeatStr.substring(0, 255 - ext.length) + ext

    repeatStr.substring(0, 254 - ext.length) + ext

  );



  ext = "lo%?ng/invalid? ch\\ars";

  ext = "lo%?n/ginvalid? ch\\ars";

  Assert.equal(

    checkFilename(repeatStr + ext, mimeService.VALIDATE_SANITIZE_ONLY),

    repeatStr + "lo% ng_"

    repeatStr + "lo% n_"

  );



  ext = ".long/invalid%? ch\\ars";

  Assert.equal(

    checkFilename(repeatStr + ext, mimeService.VALIDATE_SANITIZE_ONLY),

    repeatStr.substring(0, 234) + ".long_invalid% ch_ars"

    repeatStr.substring(0, 233) + ".long_invalid% ch_ars"

  );



  Assert.equal(