nokogiri 1.10.3 → 1.11.4

data/ext/nokogiri/xml_element_content.h

@@ -1,10 +0,0 @@
-#ifndef NOKOGIRI_XML_ELEMENT_CONTENT
-#define NOKOGIRI_XML_ELEMENT_CONTENT
-
-#include <nokogiri.h>
-
-
-VALUE Nokogiri_wrap_element_content(VALUE doc, xmlElementContentPtr element);
-void init_xml_element_content();
-
-#endif

data/ext/nokogiri/xml_element_decl.h

@@ -1,9 +0,0 @@
-#ifndef NOKOGIRI_XML_ELEMENT_DECL
-#define NOKOGIRI_XML_ELEMENT_DECL
-
-#include <nokogiri.h>
-
-void init_xml_element_decl();
-
-extern VALUE cNokogiriXmlElementDecl;
-#endif

data/ext/nokogiri/xml_encoding_handler.h

@@ -1,8 +0,0 @@
-#ifndef NOKOGIRI_XML_ENCODING_HANDLER
-#define NOKOGIRI_XML_ENCODING_HANDLER
-
-#include <nokogiri.h>
-
-void init_xml_encoding_handler();
-
-#endif

data/ext/nokogiri/xml_entity_decl.h

@@ -1,10 +0,0 @@
-#ifndef NOKOGIRI_XML_ENTITY_DECL
-#define NOKOGIRI_XML_ENTITY_DECL
-
-#include <nokogiri.h>
-
-void init_xml_entity_decl();
-
-extern VALUE cNokogiriXmlEntityDecl;
-#endif
-

data/ext/nokogiri/xml_entity_reference.h

@@ -1,9 +0,0 @@
-#ifndef NOKOGIRI_XML_ENTITY_REFERENCE
-#define NOKOGIRI_XML_ENTITY_REFERENCE
-
-#include <nokogiri.h>
-
-void init_xml_entity_reference();
-
-extern VALUE cNokogiriXmlEntityReference;
-#endif

data/ext/nokogiri/xml_io.c

@@ -1,61 +0,0 @@
-#include <xml_io.h>
-
-static ID id_read, id_write;
-
-VALUE read_check(VALUE *args) {
-  return rb_funcall(args[0], id_read, 1, args[1]);
-}
-
-VALUE read_failed(void) {
-	return Qundef;
-}
-
-int io_read_callback(void * ctx, char * buffer, int len) {
-  VALUE string, args[2];
-  size_t str_len, safe_len;
-
-  args[0] = (VALUE)ctx;
-  args[1] = INT2NUM(len);
-
-  string = rb_rescue(read_check, (VALUE)args, read_failed, 0);
-
-  if (NIL_P(string)) return 0;
-  if (string == Qundef) return -1;
-  if (TYPE(string) != T_STRING) return -1;
-
-  str_len = (size_t)RSTRING_LEN(string);
-  safe_len = str_len > (size_t)len ? (size_t)len : str_len;
-  memcpy(buffer, StringValuePtr(string), safe_len);
-
-  return (int)safe_len;
-}
-
-VALUE write_check(VALUE *args) {
-  return rb_funcall(args[0], id_write, 1, args[1]);
-}
-
-VALUE write_failed(void) {
-	return Qundef;
-}
-
-int io_write_callback(void * ctx, char * buffer, int len) {
-  VALUE args[2], size;
-
-  args[0] = (VALUE)ctx;
-  args[1] = rb_str_new(buffer, (long)len);
-
-  size = rb_rescue(write_check, (VALUE)args, write_failed, 0);
-
-  if (size == Qundef) return -1;
-
-  return NUM2INT(size);
-}
-
-int io_close_callback(void * ctx) {
-  return 0;
-}
-
-void init_nokogiri_io() {
-  id_read = rb_intern("read");
-  id_write = rb_intern("write");
-}

data/ext/nokogiri/xml_io.h

@@ -1,11 +0,0 @@
-#ifndef NOKOGIRI_XML_IO
-#define NOKOGIRI_XML_IO
-
-#include <nokogiri.h>
-
-int io_read_callback(void * ctx, char * buffer, int len);
-int io_write_callback(void * ctx, char * buffer, int len);
-int io_close_callback(void * ctx);
-void init_nokogiri_io();
-
-#endif

data/ext/nokogiri/xml_libxml2_hacks.c

@@ -1,112 +0,0 @@
-#ifndef HAVE_XMLFIRSTELEMENTCHILD
-#include <libxml/tree.h>
-/**
- * xmlFirstElementChild:
- * @parent: the parent node
- *
- * Finds the first child node of that element which is a Element node
- * Note the handling of entities references is different than in
- * the W3C DOM element traversal spec since we don't have back reference
- * from entities content to entities references.
- *
- * Returns the first element child or NULL if not available
- */
-xmlNodePtr
-xmlFirstElementChild(xmlNodePtr parent) {
-    xmlNodePtr cur = NULL;
-
-    if (parent == NULL)
-        return(NULL);
-    switch (parent->type) {
-        case XML_ELEMENT_NODE:
-        case XML_ENTITY_NODE:
-        case XML_DOCUMENT_NODE:
-        case XML_HTML_DOCUMENT_NODE:
-            cur = parent->children;
-            break;
-        default:
-            return(NULL);
-    }
-    while (cur != NULL) {
-        if (cur->type == XML_ELEMENT_NODE)
-            return(cur);
-        cur = cur->next;
-    }
-    return(NULL);
-}
-
-/**
- * xmlNextElementSibling:
- * @node: the current node
- *
- * Finds the first closest next sibling of the node which is an
- * element node.
- * Note the handling of entities references is different than in
- * the W3C DOM element traversal spec since we don't have back reference
- * from entities content to entities references.
- *
- * Returns the next element sibling or NULL if not available
- */
-xmlNodePtr
-xmlNextElementSibling(xmlNodePtr node) {
-    if (node == NULL)
-        return(NULL);
-    switch (node->type) {
-        case XML_ELEMENT_NODE:
-        case XML_TEXT_NODE:
-        case XML_CDATA_SECTION_NODE:
-        case XML_ENTITY_REF_NODE:
-        case XML_ENTITY_NODE:
-        case XML_PI_NODE:
-        case XML_COMMENT_NODE:
-        case XML_DTD_NODE:
-        case XML_XINCLUDE_START:
-        case XML_XINCLUDE_END:
-            node = node->next;
-            break;
-        default:
-            return(NULL);
-    }
-    while (node != NULL) {
-        if (node->type == XML_ELEMENT_NODE)
-            return(node);
-        node = node->next;
-    }
-    return(NULL);
-}
-
-/**
- * xmlLastElementChild:
- * @parent: the parent node
- *
- * Finds the last child node of that element which is a Element node
- * Note the handling of entities references is different than in
- * the W3C DOM element traversal spec since we don't have back reference
- * from entities content to entities references.
- *
- * Returns the last element child or NULL if not available
- */
-xmlNodePtr
-xmlLastElementChild(xmlNodePtr parent) {
-    xmlNodePtr cur = NULL;
-
-    if (parent == NULL)
-        return(NULL);
-    switch (parent->type) {
-        case XML_ELEMENT_NODE:
-        case XML_ENTITY_NODE:
-        case XML_DOCUMENT_NODE:
-        case XML_HTML_DOCUMENT_NODE:
-            cur = parent->last;
-            break;
-        default:
-            return(NULL);
-    }
-    while (cur != NULL) {
-        if (cur->type == XML_ELEMENT_NODE)
-            return(cur);
-        cur = cur->prev;
-    }
-    return(NULL);
-}
-#endif

data/ext/nokogiri/xml_libxml2_hacks.h

@@ -1,12 +0,0 @@
-#ifndef HAVE_XMLFIRSTELEMENTCHILD
-
-#ifndef XML_LIBXML2_HACKS
-#define XML_LIBXML2_HACKS
-
-xmlNodePtr xmlFirstElementChild(xmlNodePtr parent);
-xmlNodePtr xmlNextElementSibling(xmlNodePtr node);
-xmlNodePtr xmlLastElementChild(xmlNodePtr parent);
-
-#endif
-
-#endif

data/ext/nokogiri/xml_namespace.h

@@ -1,14 +0,0 @@
-#ifndef NOKOGIRI_XML_NAMESPACE
-#define NOKOGIRI_XML_NAMESPACE
-
-#include <nokogiri.h>
-
-void init_xml_namespace();
-
-extern VALUE cNokogiriXmlNamespace ;
-
-VALUE Nokogiri_wrap_xml_namespace(xmlDocPtr doc, xmlNsPtr node);
-
-#define NOKOGIRI_NAMESPACE_EH(node) ((node)->type == XML_NAMESPACE_DECL)
-
-#endif

data/ext/nokogiri/xml_node.h

@@ -1,13 +0,0 @@
-#ifndef NOKOGIRI_XML_NODE
-#define NOKOGIRI_XML_NODE
-
-#include <nokogiri.h>
-
-void init_xml_node();
-
-extern VALUE cNokogiriXmlNode ;
-extern VALUE cNokogiriXmlElement ;
-
-VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node) ;
-void Nokogiri_xml_node_properties(xmlNodePtr node, VALUE attr_hash) ;
-#endif

data/ext/nokogiri/xml_node_set.h

@@ -1,12 +0,0 @@
-#ifndef NOKOGIRI_XML_NODE_SET
-#define NOKOGIRI_XML_NODE_SET
-
-#include <nokogiri.h>
-void init_xml_node_set();
-
-extern VALUE cNokogiriXmlNodeSet ;
-VALUE Nokogiri_wrap_xml_node_set(xmlNodeSetPtr node_set, VALUE document) ;
-VALUE Nokogiri_wrap_xml_node_set_node(xmlNodePtr node, VALUE node_set) ;
-VALUE Nokogiri_wrap_xml_node_set_namespace(xmlNsPtr node, VALUE node_set) ;
-
-#endif

data/ext/nokogiri/xml_processing_instruction.h

@@ -1,9 +0,0 @@
-#ifndef NOKOGIRI_XML_PROCESSING_INSTRUCTION
-#define NOKOGIRI_XML_PROCESSING_INSTRUCTION
-
-#include <nokogiri.h>
-
-void init_xml_processing_instruction();
-
-extern VALUE cNokogiriXmlProcessingInstruction;
-#endif

data/ext/nokogiri/xml_reader.h

@@ -1,10 +0,0 @@
-#ifndef NOKOGIRI_XML_READER
-#define NOKOGIRI_XML_READER
-
-#include <nokogiri.h>
-
-void init_xml_reader();
-
-extern VALUE cNokogiriXmlReader;
-
-#endif

data/ext/nokogiri/xml_relax_ng.h

@@ -1,9 +0,0 @@
-#ifndef NOKOGIRI_XML_RELAX_NG
-#define NOKOGIRI_XML_RELAX_NG
-
-#include <nokogiri.h>
-
-void init_xml_relax_ng();
-
-extern VALUE cNokogiriXmlRelaxNG;
-#endif

data/ext/nokogiri/xml_sax_parser.h

@@ -1,39 +0,0 @@
-#ifndef NOKOGIRI_XML_SAX_PARSER
-#define NOKOGIRI_XML_SAX_PARSER
-
-#include <nokogiri.h>
-
-void init_xml_sax_parser();
-
-extern VALUE cNokogiriXmlSaxParser ;
-
-typedef struct _nokogiriSAXTuple {
-  xmlParserCtxtPtr  ctxt;
-  VALUE             self;
-} nokogiriSAXTuple;
-
-typedef nokogiriSAXTuple * nokogiriSAXTuplePtr;
-
-#define NOKOGIRI_SAX_SELF(_ctxt) \
-  ((nokogiriSAXTuplePtr)(_ctxt))->self
-
-#define NOKOGIRI_SAX_CTXT(_ctxt) \
-  ((nokogiriSAXTuplePtr)(_ctxt))->ctxt
-
-#define NOKOGIRI_SAX_TUPLE_NEW(_ctxt, _self) \
-  nokogiri_sax_tuple_new(_ctxt, _self)
-
-static inline nokogiriSAXTuplePtr
-nokogiri_sax_tuple_new(xmlParserCtxtPtr ctxt, VALUE self)
-{
-  nokogiriSAXTuplePtr tuple = malloc(sizeof(nokogiriSAXTuple));
-  tuple->self = self;
-  tuple->ctxt = ctxt;
-  return tuple;
-}
-
-#define NOKOGIRI_SAX_TUPLE_DESTROY(_tuple) \
-  free(_tuple) \
-
-#endif
-

data/ext/nokogiri/xml_sax_parser_context.h

@@ -1,10 +0,0 @@
-#ifndef NOKOGIRI_XML_SAX_PARSER_CONTEXT
-#define NOKOGIRI_XML_SAX_PARSER_CONTEXT
-
-#include <nokogiri.h>
-
-extern VALUE cNokogiriXmlSaxParserContext;
-
-void init_xml_sax_parser_context();
-
-#endif

data/ext/nokogiri/xml_sax_push_parser.h

@@ -1,9 +0,0 @@
-#ifndef NOKOGIRI_XML_SAX_PUSH_PARSER
-#define NOKOGIRI_XML_SAX_PUSH_PARSER
-
-#include <nokogiri.h>
-
-void init_xml_sax_push_parser();
-
-extern VALUE cNokogiriXmlSaxPushParser ;
-#endif

data/ext/nokogiri/xml_schema.h

@@ -1,9 +0,0 @@
-#ifndef NOKOGIRI_XML_SCHEMA
-#define NOKOGIRI_XML_SCHEMA
-
-#include <nokogiri.h>
-
-void init_xml_schema();
-
-extern VALUE cNokogiriXmlSchema;
-#endif

data/ext/nokogiri/xml_syntax_error.h

@@ -1,13 +0,0 @@
-#ifndef NOKOGIRI_XML_SYNTAX_ERROR
-#define NOKOGIRI_XML_SYNTAX_ERROR
-
-#include <nokogiri.h>
-
-void init_xml_syntax_error();
-VALUE Nokogiri_wrap_xml_syntax_error(xmlErrorPtr error);
-void Nokogiri_error_array_pusher(void * ctx, xmlErrorPtr error);
-NORETURN(void Nokogiri_error_raise(void * ctx, xmlErrorPtr error));
-
-extern VALUE cNokogiriXmlSyntaxError;
-#endif
-

data/ext/nokogiri/xml_text.h

@@ -1,9 +0,0 @@
-#ifndef NOKOGIRI_XML_TEXT
-#define NOKOGIRI_XML_TEXT
-
-#include <nokogiri.h>
-
-void init_xml_text();
-
-extern VALUE cNokogiriXmlText ;
-#endif

data/ext/nokogiri/xml_xpath_context.h

@@ -1,10 +0,0 @@
-#ifndef NOKOGIRI_XML_XPATH_CONTEXT
-#define NOKOGIRI_XML_XPATH_CONTEXT
-
-#include <nokogiri.h>
-
-void init_xml_xpath_context();
-void Nokogiri_marshal_xpath_funcall_and_return_values(xmlXPathParserContextPtr ctx, int nargs, VALUE handler, const char* function_name) ;
-
-extern VALUE cNokogiriXmlXpathContext;
-#endif

data/ext/nokogiri/xslt_stylesheet.h

@@ -1,14 +0,0 @@
-#ifndef NOKOGIRI_XSLT_STYLESHEET
-#define NOKOGIRI_XSLT_STYLESHEET
-
-#include <nokogiri.h>
-
-void init_xslt_stylesheet();
-
-extern VALUE cNokogiriXsltStylesheet ;
-
-typedef struct _nokogiriXsltStylesheetTuple {
-  xsltStylesheetPtr ss;
-  VALUE func_instances;
-} nokogiriXsltStylesheetTuple;
-#endif

data/patches/libxml2/0001-Revert-Do-not-URI-escape-in-server-side-includes.patch

@@ -1,78 +0,0 @@
-From c5538465c08a8ea248a370bf55bc39cd3385e4af Mon Sep 17 00:00:00 2001
-From: Mike Dalessio <mike.dalessio@gmail.com>
-Date: Thu, 29 Mar 2018 14:09:00 -0400
-Subject: [PATCH] Revert "Do not URI escape in server side includes"
-
-This reverts commit 960f0e275616cadc29671a218d7fb9b69eb35588.
----
- HTMLtree.c | 49 +++++++++++--------------------------------------
- 1 file changed, 11 insertions(+), 38 deletions(-)
-
-diff --git a/HTMLtree.c b/HTMLtree.c
-index 2fd0c9c..67160c5 100644
---- a/HTMLtree.c
-+++ b/HTMLtree.c
-@@ -717,49 +717,22 @@ htmlAttrDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, xmlAttrPtr cur,
- 		 (!xmlStrcasecmp(cur->name, BAD_CAST "src")) ||
- 		 ((!xmlStrcasecmp(cur->name, BAD_CAST "name")) &&
- 		  (!xmlStrcasecmp(cur->parent->name, BAD_CAST "a"))))) {
-+		xmlChar *escaped;
- 		xmlChar *tmp = value;
--		/* xmlURIEscapeStr() escapes '"' so it can be safely used. */
--		xmlBufCCat(buf->buffer, "\"");
- 
- 		while (IS_BLANK_CH(*tmp)) tmp++;
- 
--		/* URI Escape everything, except server side includes. */
--		for ( ; ; ) {
--		    xmlChar *escaped;
--		    xmlChar endChar;
--		    xmlChar *end = NULL;
--		    xmlChar *start = (xmlChar *)xmlStrstr(tmp, BAD_CAST "<!--");
--		    if (start != NULL) {
--			end = (xmlChar *)xmlStrstr(tmp, BAD_CAST "-->");
--			if (end != NULL) {
--			    *start = '\0';
--			}
--		    }
--
--		    /* Escape the whole string, or until start (set to '\0'). */
--		    escaped = xmlURIEscapeStr(tmp, BAD_CAST"@/:=?;#%&,+");
--		    if (escaped != NULL) {
--		        xmlBufCat(buf->buffer, escaped);
--		        xmlFree(escaped);
--		    } else {
--		        xmlBufCat(buf->buffer, tmp);
--		    }
--
--		    if (end == NULL) { /* Everything has been written. */
--			break;
--		    }
--
--		    /* Do not escape anything within server side includes. */
--		    *start = '<'; /* Restore the first character of "<!--". */
--		    end += 3; /* strlen("-->") */
--		    endChar = *end;
--		    *end = '\0';
--		    xmlBufCat(buf->buffer, start);
--		    *end = endChar;
--		    tmp = end;
-+		/*
-+		 * the < and > have already been escaped at the entity level
-+		 * And doing so here breaks server side includes
-+		 */
-+		escaped = xmlURIEscapeStr(tmp, BAD_CAST"@/:=?;#%&,+<>");
-+		if (escaped != NULL) {
-+		    xmlBufWriteQuotedString(buf->buffer, escaped);
-+		    xmlFree(escaped);
-+		} else {
-+		    xmlBufWriteQuotedString(buf->buffer, value);
- 		}
--
--		xmlBufCCat(buf->buffer, "\"");
- 	    } else {
- 		xmlBufWriteQuotedString(buf->buffer, value);
- 	    }
--- 
-2.9.5
-

data/patches/libxslt/0001-Fix-security-framework-bypass.patch

@@ -1,120 +0,0 @@
-From e03553605b45c88f0b4b2980adfbbb8f6fca2fd6 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Sun, 24 Mar 2019 09:51:39 +0100
-Subject: [PATCH] Fix security framework bypass
-
-xsltCheckRead and xsltCheckWrite return -1 in case of error but callers
-don't check for this condition and allow access. With a specially
-crafted URL, xsltCheckRead could be tricked into returning an error
-because of a supposedly invalid URL that would still be loaded
-succesfully later on.
-
-Fixes #12.
-
-Thanks to Felix Wilhelm for the report.
----
- libxslt/documents.c | 18 ++++++++++--------
- libxslt/imports.c   |  9 +++++----
- libxslt/transform.c |  9 +++++----
- libxslt/xslt.c      |  9 +++++----
- 4 files changed, 25 insertions(+), 20 deletions(-)
-
-diff --git a/libxslt/documents.c b/libxslt/documents.c
-index 3f3a731..4aad11b 100644
---- a/libxslt/documents.c
-+++ b/libxslt/documents.c
-@@ -296,10 +296,11 @@ xsltLoadDocument(xsltTransformContextPtr ctxt, const xmlChar *URI) {
- 	int res;
- 
- 	res = xsltCheckRead(ctxt->sec, ctxt, URI);
--	if (res == 0) {
--	    xsltTransformError(ctxt, NULL, NULL,
--		 "xsltLoadDocument: read rights for %s denied\n",
--			     URI);
-+	if (res <= 0) {
-+            if (res == 0)
-+                xsltTransformError(ctxt, NULL, NULL,
-+                     "xsltLoadDocument: read rights for %s denied\n",
-+                                 URI);
- 	    return(NULL);
- 	}
-     }
-@@ -372,10 +373,11 @@ xsltLoadStyleDocument(xsltStylesheetPtr style, const xmlChar *URI) {
- 	int res;
- 
- 	res = xsltCheckRead(sec, NULL, URI);
--	if (res == 0) {
--	    xsltTransformError(NULL, NULL, NULL,
--		 "xsltLoadStyleDocument: read rights for %s denied\n",
--			     URI);
-+	if (res <= 0) {
-+            if (res == 0)
-+                xsltTransformError(NULL, NULL, NULL,
-+                     "xsltLoadStyleDocument: read rights for %s denied\n",
-+                                 URI);
- 	    return(NULL);
- 	}
-     }
-diff --git a/libxslt/imports.c b/libxslt/imports.c
-index 874870c..3783b24 100644
---- a/libxslt/imports.c
-+++ b/libxslt/imports.c
-@@ -130,10 +130,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, xmlNodePtr cur) {
- 	int secres;
- 
- 	secres = xsltCheckRead(sec, NULL, URI);
--	if (secres == 0) {
--	    xsltTransformError(NULL, NULL, NULL,
--		 "xsl:import: read rights for %s denied\n",
--			     URI);
-+	if (secres <= 0) {
-+            if (secres == 0)
-+                xsltTransformError(NULL, NULL, NULL,
-+                     "xsl:import: read rights for %s denied\n",
-+                                 URI);
- 	    goto error;
- 	}
-     }
-diff --git a/libxslt/transform.c b/libxslt/transform.c
-index 1379391..0636dbd 100644
---- a/libxslt/transform.c
-+++ b/libxslt/transform.c
-@@ -3493,10 +3493,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, xmlNodePtr node,
-      */
-     if (ctxt->sec != NULL) {
- 	ret = xsltCheckWrite(ctxt->sec, ctxt, filename);
--	if (ret == 0) {
--	    xsltTransformError(ctxt, NULL, inst,
--		 "xsltDocumentElem: write rights for %s denied\n",
--			     filename);
-+	if (ret <= 0) {
-+            if (ret == 0)
-+                xsltTransformError(ctxt, NULL, inst,
-+                     "xsltDocumentElem: write rights for %s denied\n",
-+                                 filename);
- 	    xmlFree(URL);
- 	    xmlFree(filename);
- 	    return;
-diff --git a/libxslt/xslt.c b/libxslt/xslt.c
-index 780a5ad..a234eb7 100644
---- a/libxslt/xslt.c
-+++ b/libxslt/xslt.c
-@@ -6763,10 +6763,11 @@ xsltParseStylesheetFile(const xmlChar* filename) {
- 	int res;
- 
- 	res = xsltCheckRead(sec, NULL, filename);
--	if (res == 0) {
--	    xsltTransformError(NULL, NULL, NULL,
--		 "xsltParseStylesheetFile: read rights for %s denied\n",
--			     filename);
-+	if (res <= 0) {
-+            if (res == 0)
-+                xsltTransformError(NULL, NULL, NULL,
-+                     "xsltParseStylesheetFile: read rights for %s denied\n",
-+                                 filename);
- 	    return(NULL);
- 	}
-     }
--- 
-2.17.1
-