HtmlFileInput.reset() / HtmlFileInput.isValid() fixed;

rbri · rbri · commit ebdca9d62a94 · 2026-08-01T14:17:39.000+02:00
data handling also improved and many more tests added
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,6 +8,14 @@
 
     <body>
         <release version="5.4.0" date="August xx, 2026" description="Firefox 153, Bugfixes">
+            <action type="fix" dev="rbri">
+                HtmlFileInput.reset(): a form reset no longer tries to reconstruct a fake File from the
+                'value' attribute; it now simply clears the selected files, without firing a change event.
+            </action>
+            <action type="fix" dev="rbri">
+                 HtmlFileInput.isValid(): a disabled file input is no longer incorrectly reported as invalid
+                 by checkValidity() when 'required' is set and no file is selected
+            </action>
             <action type="add" dev="rbri">
                 Method reportValidity() support to various form controls added.
             </action>
diff --git a/src/main/java/org/htmlunit/HttpWebConnection.java b/src/main/java/org/htmlunit/HttpWebConnection.java
@@ -467,8 +467,7 @@ void buildFilePart(final KeyDataPair pairWithFile, final MultipartEntityBuilder
                 filename = pairWithFile.getValue();
             }
 
-            builder.addBinaryBody(pairWithFile.getName(), new ByteArrayInputStream(data),
-                    contentType, filename);
+            builder.addBinaryBody(pairWithFile.getName(), data, contentType, filename);
             return;
         }
 
diff --git a/src/main/java/org/htmlunit/html/HtmlFileInput.java b/src/main/java/org/htmlunit/html/HtmlFileInput.java
@@ -107,19 +107,28 @@ public NameValuePair[] getSubmitNameValuePairs() {
 
         final List<NameValuePair> list = new ArrayList<>();
         for (final File file : files_) {
-            String contentType;
-            if (contentType_ == null) {
-                contentType = getPage().getWebClient().getBrowserVersion().getUploadMimeType(file);
-                if (StringUtils.isEmptyOrNull(contentType)) {
-                    contentType = MimeType.APPLICATION_OCTET_STREAM;
+            final Charset charset = getPage().getCharset();
+
+            final KeyDataPair keyDataPair;
+            if (data_ == null) {
+                String contentType;
+                if (contentType_ == null) {
+                    contentType = getPage().getWebClient().getBrowserVersion().getUploadMimeType(file);
+                    if (StringUtils.isEmptyOrNull(contentType)) {
+                        contentType = MimeType.APPLICATION_OCTET_STREAM;
+                    }
                 }
+                else {
+                    contentType = contentType_;
+                }
+
+                keyDataPair = new KeyDataPair(getNameAttribute(), file, null, contentType, charset);
             }
             else {
-                contentType = contentType_;
+                keyDataPair = new KeyDataPair(getNameAttribute(), null, file.getName(),
+                                                MimeType.APPLICATION_OCTET_STREAM, charset);
+                keyDataPair.setData(data_);
             }
-            final Charset charset = getPage().getCharset();
-            final KeyDataPair keyDataPair = new KeyDataPair(getNameAttribute(), file, null, contentType, charset);
-            keyDataPair.setData(data_);
             list.add(keyDataPair);
         }
         return list.toArray(new NameValuePair[0]);
@@ -279,12 +288,35 @@ public File[] getFiles() {
         return files_;
     }
 
+    /**
+     * {@inheritDoc}
+     * Per spec, the reset algorithm for a file upload control is special-cased:
+     * it simply empties the list of selected files. Unlike other input types,
+     * there is no "restore to the value attribute" step at all -- a browser can
+     * never resurrect a specific file selection from markup, for the same
+     * security reason the 'value' attribute is unsettable and fake-pathed in
+     * the first place. Deliberately does NOT call super.reset() (which would
+     * try to reconstruct a fake File from the 'value' attribute via setValue())
+     * and deliberately does NOT fire a change event, matching the same
+     * "reset fires a reset event, not a change event" principle already applied
+     * to HtmlInput/HtmlTextArea.
+     * @see SubmittableElement#reset()
+     */
+    @Override
+    public void reset() {
+        files_ = new File[0];
+    }
+
     /**
      * Returns whether this element satisfies all form validation constraints set.
      * @return whether this element satisfies all form validation constraints set
      */
     @Override
     public boolean isValid() {
+        if (isDisabled()) {
+            return true;
+        }
+
         return isCustomValidityValid()
                 && (!isRequiredSupported()
                         || ATTRIBUTE_NOT_DEFINED == getAttributeDirect("required")
diff --git a/src/test/java/org/htmlunit/html/HtmlFileInput2Test.java b/src/test/java/org/htmlunit/html/HtmlFileInput2Test.java
@@ -15,6 +15,7 @@
 package org.htmlunit.html;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -762,4 +763,74 @@ public void clearFromJava() throws Exception {
         file.setValue("");
         assertEquals(0, file.getFiles().length);
     }
+
+    /**
+     * Methods setData()/getData() are pure Java API (not exposed to JS at all, since
+     * real browsers have no equivalent) and are completely untested in this
+     * file. Verifies the getter/setter round-trip and that in-memory data is
+     * actually used during submission instead of reading the file from disk.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void setDataIsUsedInsteadOfFileContentOnSubmit() throws Exception {
+        final String htmlContent = DOCTYPE_HTML
+                + "<html>\n"
+                + "<body>\n"
+                + "<form action='upload2' method='post' enctype='multipart/form-data'>\n"
+                + "  <input name='myInput' type='file' id='myInput'><br>\n"
+                + "  <input type='submit' value='Upload' id='mySubmit'>\n"
+                + "</form>\n"
+                + "</body></html>\n";
+        getMockWebConnection().setDefaultResponse("hello", MimeType.TEXT_PLAIN);
+
+        final HtmlPage page = loadPage(htmlContent);
+        final HtmlFileInput input = (HtmlFileInput) page.getElementById("myInput");
+
+        final File tmpFile = File.createTempFile("htmlunit-test", ".txt");
+        try {
+            org.apache.commons.io.FileUtils.writeStringToFile(tmpFile, "content on disk", "UTF-8");
+            input.setFiles(tmpFile);
+
+            input.setData("in-memory content".getBytes("UTF-8"));
+            page.getElementById("mySubmit").click();
+        }
+        finally {
+            assertTrue(tmpFile.delete());
+        }
+
+        final String requestBody = getMockWebConnection().getLastWebRequest().getRequestBody();
+        assertTrue(requestBody, requestBody.contains("in-memory content"));
+        assertFalse(requestBody, requestBody.contains("content on disk"));
+    }
+
+    /**
+     * Plain Java-level round trip for setData()/getData()/setContentType()/
+     * getContentType().
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void setDataGetDataSetContentTypeRoundTrip() throws Exception {
+        final String htmlContent = DOCTYPE_HTML
+                + "<html><body>\n"
+                + "<form id='form1'>\n"
+                + "  <input type='file' id='f' name='f'>\n"
+                + "</form>\n"
+                + "</body></html>";
+
+        final HtmlPage page = loadPage(htmlContent);
+        final HtmlFileInput input = (HtmlFileInput) page.getElementById("f");
+
+        assertNull(input.getData());
+        assertNull(input.getContentType());
+
+        final byte[] data = "hello".getBytes("UTF-8");
+        input.setData(data);
+        input.setContentType("text/custom");
+
+        assertArrayEquals(data, input.getData());
+        assertEquals("text/custom", input.getContentType());
+
+        input.setContentType(null);
+        assertNull(input.getContentType());
+    }
 }
diff --git a/src/test/java/org/htmlunit/html/HtmlFileInputTest.java b/src/test/java/org/htmlunit/html/HtmlFileInputTest.java
@@ -339,21 +339,21 @@ public void resetByClick() throws Exception {
             + "    var file = document.getElementById('testId');\n"
             + "    log(file.value + '-' + file.defaultValue + '-' + file.getAttribute('value'));\n"
 
-            + "    document.getElementById('testReset').click;\n"
+            + "    document.getElementById('testReset').click();\n"
             + "    log(file.value + '-' + file.defaultValue + '-' + file.getAttribute('value'));\n"
 
             + "    try{\n"
             + "      file.value = 'newValue';\n"
             + "    } catch(e) { logEx(e); }\n"
             + "    log(file.value + '-' + file.defaultValue + '-' + file.getAttribute('value'));\n"
 
-            + "    document.getElementById('testReset').click;\n"
+            + "    document.getElementById('testReset').click();\n"
             + "    log(file.value + '-' + file.defaultValue + '-' + file.getAttribute('value'));\n"
 
             + "    file.defaultValue = 'newDefault';\n"
             + "    log(file.value + '-' + file.defaultValue + '-' + file.getAttribute('value'));\n"
 
-            + "    document.forms[0].reset;\n"
+            + "    document.forms[0].reset();\n"
             + "    log(file.value + '-' + file.defaultValue + '-' + file.getAttribute('value'));\n"
             + "  }\n"
             + "</script>\n"
@@ -383,21 +383,21 @@ public void resetByJS() throws Exception {
             + "    var file = document.getElementById('testId');\n"
             + "    log(file.value + '-' + file.defaultValue + '-' + file.getAttribute('value'));\n"
 
-            + "    document.forms[0].reset;\n"
+            + "    document.forms[0].reset();\n"
             + "    log(file.value + '-' + file.defaultValue + '-' + file.getAttribute('value'));\n"
 
             + "    try{\n"
             + "      file.value = 'newValue';\n"
             + "    } catch(e) { logEx(e); }\n"
             + "    log(file.value + '-' + file.defaultValue + '-' + file.getAttribute('value'));\n"
 
-            + "    document.forms[0].reset;\n"
+            + "    document.forms[0].reset();\n"
             + "    log(file.value + '-' + file.defaultValue + '-' + file.getAttribute('value'));\n"
 
             + "    file.defaultValue = 'newDefault';\n"
             + "    log(file.value + '-' + file.defaultValue + '-' + file.getAttribute('value'));\n"
 
-            + "    document.forms[0].reset;\n"
+            + "    document.forms[0].reset();\n"
             + "    log(file.value + '-' + file.defaultValue + '-' + file.getAttribute('value'));\n"
             + "  }\n"
             + "</script>\n"
@@ -896,6 +896,20 @@ public void validationRequired() throws Exception {
         validation("<input type='file' id='e1' required>\n", "");
     }
 
+    /**
+     * A DISABLED + required file input with no files selected must
+     * still report itself as valid, since disabled fields are barred from
+     * constraint validation entirely.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    @Alerts({"true",
+             "false-false-false-false-false-false-false-false-false-false-true",
+             "false"})
+    public void validationRequiredDisabled() throws Exception {
+        validation("<input type='file' id='e1' required disabled>\n", "");
+    }
+
     private void validation(final String htmlPart, final String jsPart) throws Exception {
         final String html = DOCTYPE_HTML
                 + "<html><head>\n"
@@ -1021,4 +1035,118 @@ public void valueWebkitdirectory() throws Exception {
         driver.findElement(By.id("clickMe")).click();
         verifyTitle2(driver, getExpectedAlerts());
     }
+
+    /**
+     * Method reset() must not fire a change event, and must not try to
+     * resurrect a fake File from the 'value' attribute. This uses
+     * a REAL file selection (via sendKeys) so reset() has something genuine to
+     * clear, and counts onchange firings across the whole sequence.
+     * @throws Exception if the test fails
+     */
+    @Test
+    @Alerts({"0-1"})
+    public void resetClearsRealFileSelectionWithoutSpuriousChange() throws Exception {
+        final String html = DOCTYPE_HTML
+            + "<html><body>\n"
+            + "<script>\n"
+            + LOG_TITLE_FUNCTION
+            + "var changeCount = 0;\n"
+            + "</script>\n"
+            + "<form id='form1'>\n"
+            + "  <input type='file' id='f' onchange='changeCount++;'>\n"
+            + "  <input type='reset' id='resetBtn'>\n"
+            + "</form>\n"
+            + "<button id='check' onclick='"
+                    + "log(document.getElementById(\"f\").files.length + \"-\" + changeCount);"
+                    + "'>check</button>\n"
+            + "</body></html>";
+
+        final WebDriver driver = loadPage2(html);
+        final File tmpFile = File.createTempFile("htmlunit-test", ".txt");
+        try {
+            driver.findElement(By.id("f")).sendKeys(tmpFile.getAbsolutePath());
+        }
+        finally {
+            assertTrue(tmpFile.delete());
+        }
+
+        driver.findElement(By.id("resetBtn")).click();
+        driver.findElement(By.id("check")).click();
+
+        verifyTitle2(driver, getExpectedAlerts());
+    }
+
+    /**
+     * Calling reset() on a file input that was NEVER touched (no real selection made)
+     * must be a true no-op -- specifically must NOT fire a change event, since
+     * nothing actually changed.
+     * @throws Exception if the test fails
+     */
+    @Test
+    @Alerts({"0"})
+    public void resetOnNeverTouchedFileInput_noChangeEventFired() throws Exception {
+        final String html = DOCTYPE_HTML
+            + "<html><head>\n"
+            + "<script>\n"
+            + LOG_TITLE_FUNCTION
+            + "  function test() {\n"
+            + "    document.getElementById('resetBtn').click();\n"
+            + "    log(document.getElementById('f').files.length);\n"
+            + "  }\n"
+            + "</script>\n"
+            + "</head>\n"
+            + "<body>\n"
+            + "<form id='form1'>\n"
+            + "  <input type='file' id='f' onchange='log(\"unexpected change\");'>\n"
+            + "  <input type='reset' id='resetBtn'>\n"
+            + "</form>\n"
+            + "<button id='go' onclick='test()'>go</button>\n"
+            + "</body></html>";
+
+        final WebDriver driver = loadPage2(html);
+        driver.findElement(By.id("go")).click();
+
+        verifyTitle2(DEFAULT_WAIT_TIME, driver, getExpectedAlerts());
+    }
+
+    /**
+     * Changing the 'type' attribute of an
+     * input away from 'file' and then back to 'file' should leave it with an
+     * empty value/file selection, not retain a stale selection from before the
+     * type change.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    @Alerts({"", "0"})
+    public void changingTypeAwayFromFileAndBackClearsSelection() throws Exception {
+        final String html = DOCTYPE_HTML
+            + "<html><head>\n"
+            + "<script>\n"
+            + LOG_TITLE_FUNCTION
+            + "  function test() {\n"
+            + "    var input = document.getElementById('f');\n"
+            + "    input.type = 'text';\n"
+            + "    input.type = 'file';\n"
+            + "    log(input.value);\n"
+            + "    log(input.files.length);\n"
+            + "  }\n"
+            + "</script>\n"
+            + "</head>\n"
+            + "<body>\n"
+            + "  <input type='file' id='f'>\n"
+            + "  <button id='go' onclick='test()'>go</button>\n"
+            + "</body></html>";
+
+        final WebDriver driver = loadPage2(html);
+        final File tmpFile = File.createTempFile("htmlunit-test", ".txt");
+        try {
+            driver.findElement(By.id("f")).sendKeys(tmpFile.getAbsolutePath());
+        }
+        finally {
+            assertTrue(tmpFile.delete());
+        }
+
+        driver.findElement(By.id("go")).click();
+        verifyTitle2(driver, getExpectedAlerts());   // expect "" and "0"
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -467,8 +467,7 @@ void buildFilePart(final KeyDataPair pairWithFile, final MultipartEntityBuilder`
`467`	`467`	`filename = pairWithFile.getValue();`
`468`	`468`	`}`
`469`	`469`
`470`		`- builder.addBinaryBody(pairWithFile.getName(), new ByteArrayInputStream(data),`
`471`		`- contentType, filename);`
	`470`	`+ builder.addBinaryBody(pairWithFile.getName(), data, contentType, filename);`
`472`	`471`	`return;`
`473`	`472`	`}`
`474`	`473`