nokogiri 1.19.4-java → 1.19.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32e93c6e2814b80a5552965415a65afff14ae5c0253df5b08fdc0e036dd67a1b
-  data.tar.gz: 61a91323350c59f22132ca3e67266dc46f9d69bbd7ecec92c192d7a079b84c33
+  metadata.gz: e6d7d6a8cdaeda70bba537e8bb1776407fae18003ff7d1b7a1bd406c9704902a
+  data.tar.gz: 4de017065a52bc5fe46178fc40313b0a469a81d6508826e4b75909b07832383d
 SHA512:
-  metadata.gz: daeef7e9be94229f49fba17511aa0f3be1fefe88a82cac0c94a2ea3b5452e6c937584ec6f1383ac1cbbbcd223c46f91cceb1044e10068b9649ab64fb239d82c6
-  data.tar.gz: 7f5552b74774881aa06739963f1368b69b3b8e937fc3ce91a89e6c4fd55056acb1bb11d56f5916d35115bc862314eccc7a9cca8a2e4bcf794d88a195fd5de833
+  metadata.gz: 8203156eb8d63b7e0edb4ea37a1cc3820b349101931e20d83a08bd2f4734004403f63b1ed6b09366dc70907f11cf5404194e8bb901433dd090321e1db2cf57c4
+  data.tar.gz: 2709de3b7f5b823e8b051ee81b2c84e46b4b6465d7801d63797004bbca078e39ba7723b2a2471d32c457a465cdb216b063f4854c00b1ca74ef9f19170040b05c

data/LICENSE-DEPENDENCIES.md

@@ -15,6 +15,7 @@ Note that this document is broken into multiple sections, each of which describe
   * [Native WindowsⓇ platform releases ("x64-mingw-ucrt")](#native-windows%E2%93%A1-platform-releases-x64-mingw-ucrt)
   * [JavaⓇ (JRuby) platform release ("java")](#java%E2%93%A1-jruby-platform-release-java)
 - [Appendix: Dependencies' License Texts](#appendix-dependencies-license-texts)
+  * [hashmap.c](#hashmapc)
   * [libgumbo](#libgumbo)
   * [libxml2](#libxml2)
   * [libxslt](#libxslt)
@@ -114,6 +115,34 @@ This section contains a subsection for each potentially-distributed dependency,
 Please see previous sections to understand which of these potential dependencies is actually distributed in the gem file you're downloading and using.
 
 
+### hashmap.c
+
+MIT
+
+https://github.com/tidwall/hashmap.c/blob/master/LICENSE
+
+    The MIT License (MIT)
+
+    Copyright (c) 2020 Joshua J Baker
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of
+    this software and associated documentation files (the "Software"), to deal in
+    the Software without restriction, including without limitation the rights to
+    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+    the Software, and to permit persons to whom the Software is furnished to do so,
+    subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+    FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 ### libgumbo
 
 Apache 2.0

data/ext/java/nokogiri/XmlNode.java

@@ -323,7 +323,7 @@ public class XmlNode extends RubyObject
     String node_name = rubyStringToString(name);
     String prefix = NokogiriHelpers.getPrefix(node_name);
     String namespace_uri = null;
-    if (document.getDocumentElement() != null) {
+    if (prefix != null && document.getDocumentElement() != null) {
       namespace_uri = document.getDocumentElement().lookupNamespaceURI(prefix);
     }
     element = document.createElementNS(namespace_uri, node_name);
@@ -438,25 +438,24 @@ public class XmlNode extends RubyObject
       if (ns_inherit.isTrue()) {
         set_namespace(context, ((XmlNode)parent(context)).namespace(context));
       }
-      return;
-    }
-
-    String currentPrefix = e.getParentNode().lookupPrefix(nsURI);
-    String currentURI = e.getParentNode().lookupNamespaceURI(prefix);
-    boolean isDefault = e.getParentNode().isDefaultNamespace(nsURI);
-
-    // add xmlns attribute if this is a new root node or if the node's
-    // namespace isn't a default namespace in the new document
-    if (e.getParentNode().getNodeType() == Node.DOCUMENT_NODE) {
-      // this is the root node, so we must set the namespaces attributes anyway
-      e.setAttribute(prefix == null ? "xmlns" : "xmlns:" + prefix, nsURI);
-    } else if (prefix == null) {
-      // this is a default namespace but isn't the default where this node is being added
-      if (!isDefault) { e.setAttribute("xmlns", nsURI); }
-    } else if (!prefix.equals(currentPrefix) || nsURI.equals(currentURI)) {
-      // this is a prefixed namespace
-      // but doesn't have the same prefix or the prefix is set to a different URI
-      e.setAttribute("xmlns:" + prefix, nsURI);
+    } else {
+      String currentPrefix = e.getParentNode().lookupPrefix(nsURI);
+      String currentURI = e.getParentNode().lookupNamespaceURI(prefix);
+      boolean isDefault = e.getParentNode().isDefaultNamespace(nsURI);
+
+      // add xmlns attribute if this is a new root node or if the node's
+      // namespace isn't a default namespace in the new document
+      if (e.getParentNode().getNodeType() == Node.DOCUMENT_NODE) {
+        // this is the root node, so we must set the namespaces attributes anyway
+        e.setAttribute(prefix == null ? "xmlns" : "xmlns:" + prefix, nsURI);
+      } else if (prefix == null) {
+        // this is a default namespace but isn't the default where this node is being added
+        if (!isDefault) { e.setAttribute("xmlns", nsURI); }
+      } else if (!prefix.equals(currentPrefix) || !nsURI.equals(currentURI)) {
+        // this is a prefixed namespace
+        // but doesn't have the same prefix or the prefix is set to a different URI
+        e.setAttribute("xmlns:" + prefix, nsURI);
+      }
     }
 
     if (e.hasAttributes()) {
@@ -491,6 +490,32 @@ public class XmlNode extends RubyObject
       }
     }
 
+    // if this namespace is a duplicate of what's already in the document, remove it.
+    // a "duplicate" here is if the prefix and the URI both match what resolves in the parent.
+    if (e.getParentNode().getNodeType() == Node.ELEMENT_NODE) {
+      RubyArray<?> nsdefs = this.namespace_definitions(context);
+      for (int j = 0 ; j < nsdefs.getLength() ; j++) {
+        XmlNamespace ns = (XmlNamespace)nsdefs.get(j);
+
+        String selfPrefix = ns.getPrefix();
+        String selfURI = ns.getHref();
+        String parentPrefix = e.getParentNode().lookupPrefix(selfURI);
+        String parentURI = e.getParentNode().lookupNamespaceURI(selfPrefix);
+
+        boolean prefixMatch = ((selfPrefix == null && parentPrefix == null) ||
+                               (selfPrefix != null && selfPrefix.equals(parentPrefix)));
+        boolean uriMatch = ((selfURI == null && parentURI == null) ||
+                            (selfURI != null && selfURI.equals(parentURI)));
+
+        if (prefixMatch && uriMatch) {
+          String attrName = "xmlns";
+          if (selfPrefix != null && !selfPrefix.isEmpty()) { attrName = attrName + ':' + selfPrefix; }
+
+          e.removeAttribute(attrName);
+        }
+      }
+    }
+
     if (this.node.hasChildNodes()) {
       relink_namespace(context, getChildren());
     }
@@ -1175,28 +1200,21 @@ public class XmlNode extends RubyObject
   public RubyArray<?>
   namespace_definitions(ThreadContext context)
   {
-    // don't use namespace_definitions cache anymore since
-    // namespaces might be deleted. Reflecting the result of
-    // namespace removals is complicated, so the cache might not be
-    // updated.
+    // don't use namespace_definitions cache anymore since namespaces might be deleted. Reflecting
+    // the result of namespace removals is complicated, so the cache might not be updated.
     final XmlDocument doc = document(context.runtime);
     if (doc == null) { return context.runtime.newEmptyArray(); }
     if (doc instanceof Html4Document) { return context.runtime.newEmptyArray(); }
 
-    List<XmlNamespace> namespaces = doc.getNamespaceCache().get(node);
-    return RubyArray.newArray(context.runtime, namespaces);
-
-    // // TODO: I think this implementation would be better but there are edge cases
-    // // See https://github.com/sparklemotion/nokogiri/issues/2543
-    // RubyArray<?> nsdefs = RubyArray.newArray(context.getRuntime());
-    // NamedNodeMap attrs = node.getAttributes();
-    // for (int j = 0 ; j < attrs.getLength() ; j++) {
-    //   Attr attr = (Attr)attrs.item(j);
-    //   if ("http://www.w3.org/2000/xmlns/" == attr.getNamespaceURI()) {
-    //     nsdefs.append(XmlNamespace.createFromAttr(context.getRuntime(), attr));
-    //   }
-    // }
-    // return nsdefs;
+    RubyArray<?> nsdefs = RubyArray.newArray(context.getRuntime());
+    NamedNodeMap attrs = node.getAttributes();
+    for (int j = 0 ; j < attrs.getLength() ; j++) {
+      Attr attr = (Attr)attrs.item(j);
+      if ("http://www.w3.org/2000/xmlns/" == attr.getNamespaceURI()) {
+        nsdefs.append(XmlNamespace.createFromAttr(context.getRuntime(), attr));
+      }
+    }
+    return nsdefs;
   }
 
   /**
@@ -1506,6 +1524,19 @@ public class XmlNode extends RubyObject
       // and keep the return value. -mbklein
       String new_name = NokogiriHelpers.newQName(ns.getPrefix(), node);
       this.node = NokogiriHelpers.renameNode(node, ns.getHref(), new_name);
+
+      if (node instanceof Element) {
+        Element e = (Element) node;
+        String prefix = ns.getPrefix();
+        String attrName = prefix == null ? "xmlns" : "xmlns:" + prefix;
+        Node parent = e.getParentNode();
+        boolean inScope = "xml".equals(prefix) ||
+                          e.hasAttribute(attrName) ||
+                          (parent != null && parent.lookupNamespaceURI(prefix) != null);
+        if (!inScope) {
+          e.setAttributeNS("http://www.w3.org/2000/xmlns/", attrName, ns.getHref());
+        }
+      }
     }
 
     clearXpathContext(getNode());

data/ext/java/nokogiri/XmlReader.java

@@ -31,6 +31,7 @@ import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
 import org.jruby.RubyFixnum;
 import org.jruby.RubyObject;
+import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
@@ -253,7 +254,9 @@ public class XmlReader extends RubyObject
       // use the default options RECOVER | NONET
       options = new ParserContext.Options(2048 | 1);
     }
-    IRubyObject stringIO = runtime.getClass("StringIO").newInstance(context, args[0], Block.NULL_BLOCK);
+    // The parser reads lazily, so hand it a copy the caller cannot change.
+    RubyString frozenSource = args[0].convertToString().newFrozen();
+    IRubyObject stringIO = runtime.getClass("StringIO").newInstance(context, frozenSource, Block.NULL_BLOCK);
     InputStream in = new IOInputStream(stringIO);
     reader.setInput(context, in, url, options);
     return reader;

data/ext/java/nokogiri/XmlSchema.java

@@ -1,6 +1,7 @@
 package nokogiri;
 
 import static nokogiri.internals.NokogiriHelpers.adjustSystemIdIfNecessary;
+import static nokogiri.internals.NokogiriHelpers.effectiveResourceIsLocal;
 import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
 
 import java.io.IOException;
@@ -8,9 +9,6 @@ import java.io.InputStream;
 import java.io.Reader;
 import java.io.StringReader;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-
 import javax.xml.XMLConstants;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
@@ -288,6 +286,10 @@ public class XmlSchema extends RubyObject
                     String systemId,
                     String baseURI)
     {
+      // We enforce NONET for schema resolution by hand because Xerces-J (the JAXP implementation
+      // backing XML::Schema on JRuby) does not implement the standard JAXP property
+      // XMLConstants.ACCESS_EXTERNAL_SCHEMA — so we cannot simply restrict external access on the
+      // SchemaFactory and must classify each resolved resource in the LSResourceResolver instead.
       if (noNet && !effectiveResourceIsLocal(systemId, baseURI)) {
         try {
           this.errorHandler.warning(new SAXParseException(String.format("Attempt to load network entity '%s'", systemId), null));
@@ -304,35 +306,6 @@ public class XmlSchema extends RubyObject
     }
   }
 
-  // We enforce NONET for schema resolution by hand because Xerces-J (the JAXP implementation
-  // backing XML::Schema on JRuby) does not implement the standard JAXP property
-  // XMLConstants.ACCESS_EXTERNAL_SCHEMA — so we cannot simply restrict external access on the
-  // SchemaFactory and must classify each resolved resource in the LSResourceResolver instead.
-  //
-  // Decides whether a schema-import resource may be resolved while NONET is on: true means
-  // local (allowed), false means a network resource (blocked). A relative systemId inherits
-  // its document's base, so it is resolved against baseURI before classification — a relative
-  // import under a remote base is a network fetch even though the systemId alone looks local.
-  private static boolean
-  effectiveResourceIsLocal(String systemId, String baseURI)
-  {
-    // a null systemId means there is nothing external to resolve
-    if (systemId == null) {
-      return true;
-    }
-    try {
-      URI uri = new URI(systemId);
-      if (baseURI != null && !baseURI.isEmpty()) {
-        uri = new URI(baseURI).resolve(uri);
-      }
-      return isLocalResource(uri);
-    } catch (URISyntaxException | IllegalArgumentException e) {
-      // fail closed: an unparseable base or systemId (e.g. a raw UNC path "\\host\share") is
-      // not provably local, and the JVM's file/URL handling may still reach the network
-      return false;
-    }
-  }
-
   // Test seam for the Ruby suite: local_resource?(systemId, baseURI = nil).
   @JRubyMethod(meta = true, name = "local_resource?", required = 1, optional = 1, visibility = Visibility.PRIVATE)
   public static IRubyObject
@@ -343,48 +316,6 @@ public class XmlSchema extends RubyObject
     return context.runtime.newBoolean(effectiveResourceIsLocal(systemId, baseURI));
   }
 
-  // Classifies an already-parsed URI. Local is a missing scheme, or the "file" scheme, with
-  // no remote authority and no UNC-shaped path. This is intentionally stricter than libxml2's
-  // xmlNoNetExternalEntityLoader, which folds a remote host (file://host/...) into a local
-  // path rather than rejecting it.
-  //
-  // TODO: a Windows drive-letter path like "C:\path" parses as scheme "c" and would be
-  // blocked; support those if we need it later.
-  private static boolean
-  isLocalResource(URI uri)
-  {
-    // only a missing scheme (a relative or absolute path) or file: can be local; any
-    // other scheme is a network resource
-    String scheme = uri.getScheme();
-    if (scheme != null && !scheme.equalsIgnoreCase("file")) {
-      return false;
-    }
-
-    // an opaque "file:" URI (e.g. file:foo, with no "//") is not a usable local path; reject
-    // it, matching libxml2, which does not resolve that form as a local file either
-    if (uri.isOpaque()) {
-      return false;
-    }
-
-    // a non-empty, non-localhost authority is a remote host — file://host/path, or the
-    // schemeless network-path form //host/path. Stricter than libxml2, which folds such a
-    // host into a (failing) local path.
-    String authority = uri.getRawAuthority();
-    if (authority != null && !authority.isEmpty() && !authority.equalsIgnoreCase("localhost")) {
-      return false;
-    }
-
-    // reject UNC-shaped paths even under an allowed authority: file:////host/share,
-    // file://localhost//host/share, and %2f/%5c-encoded variants. getPath() is decoded, so
-    // the encoded forms are normalized before this check.
-    String path = uri.getPath();
-    if (path != null && (path.startsWith("//") || path.indexOf('\\') >= 0)) {
-      return false;
-    }
-
-    return true;
-  }
-
   private class SchemaLSInput implements LSInput
   {
     protected String fPublicId;

data/ext/java/nokogiri/XmlXpathContext.java

@@ -20,10 +20,10 @@ import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.util.SafePropertyAccessor;
 import org.w3c.dom.Node;
 
 import nokogiri.internals.NokogiriNamespaceContext;
+import nokogiri.internals.NokogiriXPathContext;
 import nokogiri.internals.NokogiriXPathFunctionResolver;
 import nokogiri.internals.NokogiriXPathVariableResolver;
 
@@ -41,16 +41,6 @@ public class XmlXpathContext extends RubyObject
 {
   private static final long serialVersionUID = 1L;
 
-  static
-  {
-    final String DTMManager = "org.apache.xml.dtm.DTMManager";
-    if (SafePropertyAccessor.getProperty(DTMManager) == null) {
-      try { // use patched "org.apache.xml.dtm.ref.DTMManagerDefault"
-        System.setProperty(DTMManager, nokogiri.internals.XalanDTMManagerPatch.class.getName());
-      } catch (SecurityException ex) { /* no-op - will work although might be slower */ }
-    }
-  }
-
   /**
    * user-data key for (cached) {@link XPathContext}
    */
@@ -82,7 +72,7 @@ public class XmlXpathContext extends RubyObject
   rbNew(ThreadContext context, IRubyObject klazz, IRubyObject node)
   {
     try {
-      return new XmlXpathContext(context.runtime, (RubyClass) klazz, (XmlNode) node);
+      return new XmlXpathContext(context.runtime, (RubyClass) klazz, XmlNode.asXmlNode(context, node));
     } catch (IllegalArgumentException e) {
       throw context.getRuntime().newRuntimeError(e.getMessage());
     }
@@ -185,7 +175,7 @@ public class XmlXpathContext extends RubyObject
   public IRubyObject
   set_node(ThreadContext context, IRubyObject rb_node)
   {
-    this.context = (XmlNode) rb_node;
+    this.context = XmlNode.asXmlNode(context, rb_node);
     return rb_node;
   }
 
@@ -268,8 +258,8 @@ public class XmlXpathContext extends RubyObject
   private static XPathContext
   newXPathContext(final NokogiriXPathFunctionResolver functionResolver)
   {
-    if (functionResolver == null) { return new XPathContext(false); }
-    return new XPathContext(new JAXPExtensionsProvider(functionResolver), false);
+    if (functionResolver == null) { return new NokogiriXPathContext(); }
+    return new NokogiriXPathContext(new JAXPExtensionsProvider(functionResolver));
   }
 
   private boolean

data/ext/java/nokogiri/internals/NokogiriEntityResolver.java

@@ -1,5 +1,7 @@
 package nokogiri.internals;
 
+import static nokogiri.internals.NokogiriHelpers.effectiveResourceIsLocal;
+
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -103,12 +105,12 @@ public class NokogiriEntityResolver implements EntityResolver2
     } else if (!name.equals("[dtd]") && !options.noEnt) {
       return emptyInputSource(s);
     }
-    String adjustedSystemId;
-    URI uri = URI.create(systemId);
-    if (options.noNet && uri.getHost() != null) {
+    if (options.noNet && !effectiveResourceIsLocal(systemId, baseURI)) {
       addError("Attempt to load network entity " + systemId);
       return emptyInputSource(s);
     }
+    String adjustedSystemId;
+    URI uri = URI.create(systemId);
     // if this is a url or absolute file name then use it
     if (uri.isAbsolute() && !uri.isOpaque()) {
       adjustedSystemId = uri.toURL().toString();
@@ -116,10 +118,6 @@ public class NokogiriEntityResolver implements EntityResolver2
       adjustedSystemId = uri.getPath();
     } else if (baseURI != null) {
       URI baseuri = URI.create(baseURI);
-      if (options.noNet && baseuri.getHost() != null) {
-        addError("Attempt to load network entity " + systemId);
-        return emptyInputSource(s);
-      }
       if (baseuri.getHost() == null) {
         // this is a local file
         adjustedSystemId = join(baseuri.getPath(), uri.getPath()).getCanonicalPath();

data/ext/java/nokogiri/internals/NokogiriHelpers.java

@@ -4,6 +4,8 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
@@ -674,6 +676,72 @@ public class NokogiriHelpers
 
   private static final Set<String> CharsetNames = Charset.availableCharsets().keySet();
 
+  // Decides whether an external resource may be resolved while NONET is on: true means
+  // local (allowed), false means a network resource (blocked). A relative systemId inherits
+  // its document's base, so it is resolved against baseURI before classification — a relative
+  // reference under a remote base is a network fetch even though the systemId alone looks local.
+  public static boolean
+  effectiveResourceIsLocal(String systemId, String baseURI)
+  {
+    // a null systemId means there is nothing external to resolve
+    if (systemId == null) {
+      return true;
+    }
+    try {
+      URI uri = new URI(systemId);
+      if (baseURI != null && !baseURI.isEmpty()) {
+        uri = new URI(baseURI).resolve(uri);
+      }
+      return isLocalResource(uri);
+    } catch (URISyntaxException | IllegalArgumentException e) {
+      // fail closed: an unparseable base or systemId (e.g. a raw UNC path "\\host\share") is
+      // not provably local, and the JVM's file/URL handling may still reach the network
+      return false;
+    }
+  }
+
+  // Classifies an already-parsed URI. Local is a missing scheme, or the "file" scheme, with
+  // no remote authority and no UNC-shaped path. This is intentionally stricter than libxml2's
+  // xmlNoNetExternalEntityLoader, which folds a remote host (file://host/...) into a local
+  // path rather than rejecting it.
+  //
+  // TODO: a Windows drive-letter path like "C:\path" parses as scheme "c" and would be
+  // blocked; support those if we need it later.
+  private static boolean
+  isLocalResource(URI uri)
+  {
+    // only a missing scheme (a relative or absolute path) or file: can be local; any
+    // other scheme is a network resource
+    String scheme = uri.getScheme();
+    if (scheme != null && !scheme.equalsIgnoreCase("file")) {
+      return false;
+    }
+
+    // an opaque "file:" URI (e.g. file:foo, with no "//") is not a usable local path; reject
+    // it, matching libxml2, which does not resolve that form as a local file either
+    if (uri.isOpaque()) {
+      return false;
+    }
+
+    // a non-empty, non-localhost authority is a remote host — file://host/path, or the
+    // schemeless network-path form //host/path. Stricter than libxml2, which folds such a
+    // host into a (failing) local path.
+    String authority = uri.getRawAuthority();
+    if (authority != null && !authority.isEmpty() && !authority.equalsIgnoreCase("localhost")) {
+      return false;
+    }
+
+    // reject UNC-shaped paths even under an allowed authority: file:////host/share,
+    // file://localhost//host/share, and %2f/%5c-encoded variants. getPath() is decoded, so
+    // the encoded forms are normalized before this check.
+    String path = uri.getPath();
+    if (path != null && (path.startsWith("//") || path.indexOf('\\') >= 0)) {
+      return false;
+    }
+
+    return true;
+  }
+
   public static String
   adjustSystemIdIfNecessary(String currentDir, String scriptFileName, String baseURI, String systemId)
   {

data/ext/java/nokogiri/internals/NokogiriXPathContext.java

@@ -0,0 +1,37 @@
+package nokogiri.internals;
+
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XMLStringFactoryImpl;
+
+/**
+ * An XPathContext that uses XalanDTMManagerPatch without looking it up by class name.
+ *
+ * Xalan's DTMManager.newInstance() looks up the manager class in the thread's context class loader
+ * and in the class loader that loaded Xalan. In a servlet container with Xalan in WEB-INF/lib,
+ * both are the webapp class loader, which cannot see nokogiri's classes.
+ */
+public final class NokogiriXPathContext extends XPathContext
+{
+  public
+  NokogiriXPathContext()
+  {
+    super(false);
+    m_dtmManager = newDTMManager();
+  }
+
+  public
+  NokogiriXPathContext(Object owner)
+  {
+    super(owner, false);
+    m_dtmManager = newDTMManager();
+  }
+
+  private static DTMManager
+  newDTMManager()
+  {
+    DTMManager manager = new XalanDTMManagerPatch();
+    manager.setXMLStringFactory(XMLStringFactoryImpl.getFactory());
+    return manager;
+  }
+}

data/ext/nokogiri/extconf.rb

@@ -1125,6 +1125,7 @@ end
 have_func("xmlCtxtSetOptions") # introduced in libxml2 2.13.0
 have_func("xmlCtxtGetOptions") # introduced in libxml2 2.14.0
 have_func("xmlSwitchEncodingName") # introduced in libxml2 2.13.0
+have_func("xmlAddIDSafe") # introduced in libxml2 2.13.0
 have_func("rb_category_warning") # introduced in Ruby 3.0 but had trouble resolving this symbol in truffleruby
 
 other_library_versions_string = OTHER_LIBRARY_VERSIONS.map { |k, v| [k, v].join(":") }.join(",")