Allow tainted scripts to extract text from some fields#52705
Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom Oct 23, 2025
Merged
Conversation
sysrqb
added
the
Forms
Collaborator
|
EWS run on previous version of this PR (hash 25aae35) Details |
webkit-ews-buildbot
added
the
merging-blocked
sysrqb
force-pushed
the
eng/Allow-tainted-scripts-to-extract-text-from-some-fields
branch
from
25aae35 to
0ecd3e6
Compare
Collaborator
|
EWS run on previous version of this PR (hash 0ecd3e6) Details |
whsieh
approved these changes
Oct 21, 2025
| @@ -155,6 +155,7 @@ void HTMLTextFormControlElement::didEditInnerTextValue(bool wasUserEdit) | |||
| LOG(Editing, "HTMLTextFormControlElement %p didEditInnerTextValue", this); | |||
|
|
|||
| m_lastChangeWasUserEdit = wasUserEdit; | |||
| m_wasChangeEverUserEdit |= wasUserEdit; | |||
Member
There was a problem hiding this comment.
Suggested change
| m_wasChangeEverUserEdit |= wasUserEdit; | |
| m_wasEverChangedByUserEdit |= wasUserEdit; |
Maybe m_wasEverChangedByUserEdit or m_wasEverUserEdited might read a bit more nicely?
Comment on lines
+960
to
+961
| return protectedDocument()->requiresScriptTrackingPrivacyProtection(ScriptTrackingPrivacyCategory::FormControls) | ||
| && (wasChangeEverUserEdit() || !wasCreatedByTaintedScript()); |
Member
There was a problem hiding this comment.
I think if you make this (wasChangeEverUserEdit() || !wasCreatedByTaintedScript()) && …, we might be able to avoid the (potentially more expensive) script tracking privacy check.
| @@ -66,6 +66,7 @@ HTMLFormControlElement::HTMLFormControlElement(const QualifiedName& tagName, Doc | |||
| , m_isRequired(false) | |||
| , m_valueMatchesRenderer(false) | |||
| , m_wasChangedSinceLastFormControlChangeEvent(false) | |||
| , m_wasCreatedByTaintedScript(document.requiresScriptTrackingPrivacyProtection(ScriptTrackingPrivacyCategory::FormControls)) | |||
Member
There was a problem hiding this comment.
Might be worth adding a new argument flag to requiresScriptTrackingPrivacyProtection, which would prevent us from adding a console log message in the case where it's tainted (or perhaps, a different message, that would make it clear that returning true here doesn't, by itself, block form access).
sysrqb
force-pushed
the
eng/Allow-tainted-scripts-to-extract-text-from-some-fields
branch
from
0ecd3e6 to
ec2e341
Compare
Collaborator
|
EWS run on current version of this PR (hash ec2e341) Details
|
https://bugs.webkit.org/show_bug.cgi?id=301157 rdar://161669359 Reviewed by Wenson Hsieh. The form control protection prevents tainted scripts from accessing the value of all text form fields. That protection causes some web compatibility issues that we can fix by slightly relaxing the restriction which is what I'm doing in this patch. We can let tainted scripts extract the value if that element was created by a tainted script and it wasn't modified by user input. Test: Tools/TestWebKitAPI/Tests/WebKitCocoa/ScriptTrackingPrivacyTests.mm * Source/WebCore/html/HTMLFormControlElement.cpp: (WebCore::m_wasCreatedByTaintedScript): (WebCore::m_wasChangedSinceLastFormControlChangeEvent): Deleted. * Source/WebCore/html/HTMLFormControlElement.h: (WebCore::HTMLFormControlElement::wasCreatedByTaintedScript const): * Source/WebCore/html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::value const): * Source/WebCore/html/HTMLTextAreaElement.cpp: (WebCore::HTMLTextAreaElement::value const): * Source/WebCore/html/HTMLTextFormControlElement.cpp: (WebCore::HTMLTextFormControlElement::didEditInnerTextValue): (WebCore::HTMLTextFormControlElement::wasChangeEverUserEdit const): (WebCore::HTMLTextFormControlElement::shouldApplyScriptTrackingPrivacyProtection const): * Source/WebCore/html/HTMLTextFormControlElement.h: * Tools/TestWebKitAPI/Tests/WebKitCocoa/ScriptTrackingPrivacyTests.mm: (TestWebKitAPI::(ScriptTrackingPrivacyTests, DirectFormFieldAccess)): Canonical link: https://commits.webkit.org/302031@main
webkit-commit-queue
force-pushed
the
eng/Allow-tainted-scripts-to-extract-text-from-some-fields
branch
from
ec2e341 to
614b6dc
Compare
Collaborator
|
Committed 302031@main (614b6dc): https://commits.webkit.org/302031@main Reviewed commits have been landed. Closing PR #52705 and removing active labels. |
webkit-commit-queue
removed
the
merge-queue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
614b6dc
ec2e341