8343001: Adjust XSLT and XPath Extension Function Property #22504

JoeWang-Java · 2024-12-03T01:04:30Z

Disables XSLT and XPath Extension Functions by default, setting jdk.xml.enableExtensionFunctions to false.

Adjusted tests accordingly.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change requires CSR request JDK-8343002 to be approved
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issues

JDK-8343001: Adjust XSLT and XPath Extension Function Property (Enhancement - P4)
JDK-8343002: Adjust XSLT and XPath Extension Function Property (CSR)

Reviewers

Lance Andersen (@LanceAndersen - Reviewer) Review applies to 6daac1ed
Roger Riggs (@RogerRiggs - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22504/head:pull/22504
$ git checkout pull/22504

Update a local copy of the PR:
$ git checkout pull/22504
$ git pull https://git.openjdk.org/jdk.git pull/22504/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22504

View PR using the GUI difftool:
$ git pr show -t 22504

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22504.diff

Using Webrev

Link to Webrev Comment

bridgekeeper · 2024-12-03T01:05:18Z

👋 Welcome back joehw! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2024-12-03T01:06:08Z

@JoeWang-Java This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8343001: Adjust XSLT and XPath Extension Function Property

Reviewed-by: rriggs, lancea

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 41 new commits pushed to the master branch:

05ee562: 8343839: Detect patched modules and abort run-time image link early
0664b51: 8344987: Test serviceability/sa/TestJhsdbJstackPrintVMLocks.java fails: NoClassDefFoundError: jdk/test/lib/Utils
157a434: 8345389: Bump missed copyright years for JDK-8336768
a49f077: 8345221: Replace legacy with new Provider APIs in SunNativeGSS
2be07b5: 8324491: Keyboard layout didn't keep its state if it was changed when dialog was active
f37f64d: 8343736: Test java/awt/Focus/UnaccessibleChoice/AccessibleChoiceTest.java failed: Choice can't be controlled by keyboard
73b8b34: 8344368: IndependenceSwingTest.java and IndependenceAWTTest.java failed: Selected text & clipboard contents differs
9267dfa: 8344589: Update IANA Language Subtag Registry to Version 2024-11-19
293323c: 8340141: C1: rework ciMethod::equals following 8338471
76e874c: 8345319: Fix the tag type in PoolEntry and AnnotationValue
... and 31 more: https://git.openjdk.org/jdk/compare/68b1b94d1be686037e2aaef57c0d9adc594fac7a...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

openjdk · 2024-12-03T01:07:10Z

@JoeWang-Java The following label will be automatically applied to this pull request:

core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2024-12-03T01:10:03Z

Webrevs

LanceAndersen

Overall Looks good Joe

please see the comment below

LanceAndersen · 2024-12-03T11:42:41Z

test/jaxp/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java

     * @param expectedResult Expected transformation result
     **/
-    @Test(dataProvider = "document")
+    //@Test(dataProvider = "document")


Is there a reason you have this commented out? If the test is not needed, it should be removed or use the 'disable' element and add a comment as to why this is disabled

Good catch - it was commented out for debugging the other tests.

RogerRiggs · 2024-12-03T17:23:40Z

src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java


        {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
-        "Use of the extension element ''{0}'' is not allowed when the secure processing feature is set to true."},
+        "Use of the extension function ''{0}'' is not allowed when extension "


Is it correct that "element" has been replaced by "function" here?

"element" it is. Fixed.

RogerRiggs · 2024-12-03T17:25:53Z

...a.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java

     * <p>State of secure processing feature.</p>
     */
-    private boolean _isNotSecureProcessing = true;
+    private boolean _isNotSecureProcessing = false;


An unfortunate double-negative state for the feature.
(Makes it hard to understand and easy to get confused about).

RogerRiggs · 2024-12-03T17:30:49Z

test/jaxp/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java

+    public static boolean isWindows = false;
+    static {
+        if (System.getProperty("os.name").contains("Windows")) {
+            isWindows = true;
+        }
+    };


Could be a direct assignment and final:

Suggested change

public static boolean isWindows = false;

static {

if (System.getProperty("os.name").contains("Windows")) {

isWindows = true;

}

};

public static final boolean isWindows = System.getProperty("os.name").contains("Windows");

RogerRiggs

Thanks for the updates

JoeWang-Java · 2024-12-04T02:27:27Z

/integrate

openjdk · 2024-12-04T02:28:06Z

Going to push as commit 7ec36bb.
Since your change was applied there have been 44 commits pushed to the master branch:

c143138: 8345351: RISC-V: Rename macro-assembler routine cmpxchg_weak to weak_cmpxchg
4237897: 8345341: Fix incorrect log message in JDI stop002t test
82e8aa6: 8345415: Rollback JDK-8301991 change on xmlsecurity_de.properties
05ee562: 8343839: Detect patched modules and abort run-time image link early
0664b51: 8344987: Test serviceability/sa/TestJhsdbJstackPrintVMLocks.java fails: NoClassDefFoundError: jdk/test/lib/Utils
157a434: 8345389: Bump missed copyright years for JDK-8336768
a49f077: 8345221: Replace legacy with new Provider APIs in SunNativeGSS
2be07b5: 8324491: Keyboard layout didn't keep its state if it was changed when dialog was active
f37f64d: 8343736: Test java/awt/Focus/UnaccessibleChoice/AccessibleChoiceTest.java failed: Choice can't be controlled by keyboard
73b8b34: 8344368: IndependenceSwingTest.java and IndependenceAWTTest.java failed: Selected text & clipboard contents differs
... and 34 more: https://git.openjdk.org/jdk/compare/68b1b94d1be686037e2aaef57c0d9adc594fac7a...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-12-04T02:28:18Z

@JoeWang-Java Pushed as commit 7ec36bb.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

8343001: Adjust XSLT and XPath Extension Function Property

6daac1e

openjdk bot added the rfr Pull request is ready for review label Dec 3, 2024

openjdk bot added the core-libs core-libs-dev@openjdk.org label Dec 3, 2024

LanceAndersen approved these changes Dec 3, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 3, 2024

RogerRiggs reviewed Dec 3, 2024

View reviewed changes

uncomment a test in XSLTFunctionsTest

83f44f4

openjdk bot removed the ready Pull request is ready to be integrated label Dec 3, 2024

fix error message and inline windows check

a4b3932

RogerRiggs approved these changes Dec 3, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 3, 2024

openjdk bot added the integrated Pull request has been integrated label Dec 4, 2024

openjdk bot closed this Dec 4, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 4, 2024

JoeWang-Java deleted the JDK-8343001 branch December 4, 2024 03:50

8343001: Adjust XSLT and XPath Extension Function Property #22504

8343001: Adjust XSLT and XPath Extension Function Property #22504

Uh oh!

Conversation

JoeWang-Java commented Dec 3, 2024 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issues

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Dec 3, 2024

Uh oh!

openjdk bot commented Dec 3, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Dec 3, 2024

Uh oh!

mlbridge bot commented Dec 3, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

LanceAndersen left a comment

Choose a reason for hiding this comment

Uh oh!

LanceAndersen Dec 3, 2024

Choose a reason for hiding this comment

Uh oh!

JoeWang-Java Dec 3, 2024

Choose a reason for hiding this comment

Uh oh!

RogerRiggs Dec 3, 2024

Choose a reason for hiding this comment

Uh oh!

JoeWang-Java Dec 3, 2024

Choose a reason for hiding this comment

Uh oh!

RogerRiggs Dec 3, 2024

Choose a reason for hiding this comment

Uh oh!

RogerRiggs Dec 3, 2024

Choose a reason for hiding this comment

Uh oh!

RogerRiggs left a comment

Choose a reason for hiding this comment

Uh oh!

JoeWang-Java commented Dec 4, 2024

Uh oh!

openjdk bot commented Dec 4, 2024

Uh oh!

openjdk bot commented Dec 4, 2024

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

JoeWang-Java commented Dec 3, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Dec 3, 2024 •

edited

Loading

mlbridge bot commented Dec 3, 2024 •

edited

Loading