nokogiri 1.6.7.rc3-java → 1.6.7.rc4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38087b7757a57f1c1569fd0a042d8745338b05d8
-  data.tar.gz: c1f8fbba16563a2ea9b09b111cc389c702e8c643
+  metadata.gz: a2daa390eb37d01bcc6fa00c0c6b07545667a8e1
+  data.tar.gz: 3c882ca3bd998e59c9961f594d82ef415ada59e1
 SHA512:
-  metadata.gz: 8d4b8b6fe2b22b14fea32a53dac4d038ae04f764f78fdd6fdf8b48823b51a819e9bff534c45bd31ec981f98a7e40805db016f6ef99761f6fbf489b935c22bf2c
-  data.tar.gz: baf4849c6e03a41ab524950ada426a9d55bc30ab9d665b47827d91c91da0a199852f6ff4b237b31877306c7a2e266778dfb236bee2a9f131904b66392799c0e7
+  metadata.gz: 1222d2dd3fd9189cdaeee8486817a2791b4b961fdcecf09664f53be8a51fb24f44d03128b8d012a757d164ca4080b81cacabb66bdab8bf49aafd839423d90ef8
+  data.tar.gz: 00810db59e1bb49bbc0ef19ddcec65a0845e0d526dbb065a4450107fc94f2406241a00b0ae2776dccea411f341a1b34d0835f855cf320216850f3f48cd74b176

data/CHANGELOG.ja.rdoc

@@ -1,4 +1,32 @@
-=== 1.6.7.rc2 / 2015年08月31日
+=== 1.6.7.rc4 / 2015年11月22日
+
+==== Security patches
+
+This version pulls in several upstream patches to the vendored libxml2 and libxslt to address:
+
+* CVE-2015-1819
+* CVE-2015-7941_1
+* CVE-2015-7941_2
+* CVE-2015-7942
+* CVE-2015-7942-2
+* CVE-2015-8035
+* CVE-2015-7995
+* unclosed comment uninitialized access issue (does not have a CVE assigned)
+
+See #1374 and #1376 for details.
+
+==== Features
+
+* [MRI] libxml2 and libxslt `config.guess` files brought up to date. (#1326) (Thanks, @hernan-erasmo!)
+* [JRuby] fix error in validating files with jruby (#1355, #1361) (Thanks, @twalpole!)
+* [MRI, OSX] Patch to handle nonstandard location of `iconv.h`. (#1206, #1210, #1218, #1345) (Thanks, @neonichu!)
+
+==== Bug Fixes
+
+* [JRuby] reset the namespace cache when replacing the document's innerHtml (#1265) (Thanks, @mkristian!)
+
+
+=== 1.6.7.rc3 / 2015年09月04日 and 1.6.7.rc2 / 2015年08月31日
 
 Note that rc1 was not released.
 

data/CHANGELOG.rdoc

@@ -1,3 +1,31 @@
+=== 1.6.7.rc4 / 2015-11-22
+
+==== Security patches
+
+This version pulls in several upstream patches to the vendored libxml2 and libxslt to address:
+
+* CVE-2015-1819
+* CVE-2015-7941_1
+* CVE-2015-7941_2
+* CVE-2015-7942
+* CVE-2015-7942-2
+* CVE-2015-8035
+* CVE-2015-7995
+* unclosed comment uninitialized access issue (does not have a CVE assigned)
+
+See #1374 and #1376 for details.
+
+==== Features
+
+* [MRI] libxml2 and libxslt `config.guess` files brought up to date. (#1326) (Thanks, @hernan-erasmo!)
+* [JRuby] fix error in validating files with jruby (#1355, #1361) (Thanks, @twalpole!)
+* [MRI, OSX] Patch to handle nonstandard location of `iconv.h`. (#1206, #1210, #1218, #1345) (Thanks, @neonichu!)
+
+==== Bug Fixes
+
+* [JRuby] reset the namespace cache when replacing the document's innerHtml (#1265) (Thanks, @mkristian!)
+
+
 === 1.6.7.rc3 / 2015-09-04 and 1.6.7.rc2 / 2015-08-31
 
 Note that rc1 was not released.

data/Gemfile

@@ -4,7 +4,7 @@
 
 source "https://rubygems.org/"
 
-gem "mini_portile", "~>0.7.0.rc4"
+gem "mini_portile2", "~>2.0.0.rc2"
 
 gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", ">=1.1", :group => [:development, :test]
@@ -17,6 +17,6 @@ gem "rake-compiler", "~>0.9.2", :group => [:development, :test]
 gem "rake-compiler-dock", "~>0.4.2", :group => [:development, :test]
 gem "racc", ">=1.4.6", :group => [:development, :test], :platform => :ruby
 gem "rexical", ">=1.0.5", :group => [:development, :test], :platform => :ruby
-gem "hoe", "~>3.13", :group => [:development, :test]
+gem "hoe", "~>3.14", :group => [:development, :test]
 
 # vim: syntax=ruby

data/Rakefile

@@ -128,7 +128,8 @@ HOE = Hoe.spec 'nokogiri' do
 
   unless java?
     self.extra_deps += [
-      ["mini_portile",    "~> 0.7.0.rc4"],
+      # Keep this version in sync with the one in extconf.rb !
+      ["mini_portile2",    "~> 2.0.0.rc2"],
     ]
   end
 

data/ext/java/nokogiri/XmlDocument.java

@@ -639,4 +639,9 @@ public class XmlDocument extends XmlNode {
         }
         return this;
     }
+
+    public void resetNamespaceCache(ThreadContext context) {
+        nsCache = new NokogiriNamespaceCache();
+        createAndCacheNamespaces(context.getRuntime(), node);
+    }
 }

data/ext/java/nokogiri/XmlNode.java

@@ -1551,6 +1551,10 @@ public class XmlNode extends RubyObject {
             coalesceTextNodes(context, other, scheme);
         }
 
+        if (this instanceof XmlDocument) {
+            ((XmlDocument) this).resetNamespaceCache(context);
+        }
+
         relink_namespace(context);
         // post_add_child(context, this, other);
 

data/ext/java/nokogiri/XmlSchema.java

@@ -17,10 +17,10 @@
  * 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.
@@ -71,7 +71,7 @@ import org.xml.sax.SAXException;
 
 /**
  * Class for Nokogiri::XML::Schema
- * 
+ *
  * @author sergio
  * @author Yoko Harada <yokolet@gmail.com>
  */
@@ -82,7 +82,7 @@ public class XmlSchema extends RubyObject {
     public XmlSchema(Ruby ruby, RubyClass klazz) {
         super(ruby, klazz);
     }
-    
+
     /**
      * Create and return a copy of this object.
      *
@@ -100,7 +100,7 @@ public class XmlSchema extends RubyObject {
         schemaFactory.setErrorHandler(new IgnoreSchemaErrorsErrorHandler());
         return schemaFactory.newSchema(source);
     }
-    
+
     private void setValidator(Validator validator) {
         this.validator = validator;
     }
@@ -109,7 +109,7 @@ public class XmlSchema extends RubyObject {
         Ruby runtime = context.getRuntime();
         XmlSchema xmlSchema = (XmlSchema) NokogiriService.XML_SCHEMA_ALLOCATOR.allocate(runtime, klazz);
         xmlSchema.setInstanceVariable("@errors", runtime.newEmptyArray());
-        
+
         try {
             Schema schema = xmlSchema.getSchema(source, context.getRuntime().getCurrentDirectory(), context.getRuntime().getInstanceConfig().getScriptFileName());
             xmlSchema.setValidator(schema.newValidator());
@@ -137,14 +137,14 @@ public class XmlSchema extends RubyObject {
         DOMSource source = new DOMSource(doc.getDocument());
 
         IRubyObject uri = doc.url(context);
-        
+
         if (!uri.isNil()) {
             source.setSystemId(uri.convertToString().asJavaString());
         }
-        
+
         return getSchema(context, (RubyClass)klazz, source);
     }
-    
+
     private static IRubyObject getSchema(ThreadContext context, RubyClass klazz, Source source) {
         String moduleName = klazz.getName();
         if ("Nokogiri::XML::Schema".equals(moduleName)) {
@@ -165,17 +165,17 @@ public class XmlSchema extends RubyObject {
     public IRubyObject validate_document(ThreadContext context, IRubyObject document) {
         return validate_document_or_file(context, (XmlDocument)document);
     }
-    
+
     @JRubyMethod(visibility=Visibility.PRIVATE)
     public IRubyObject validate_file(ThreadContext context, IRubyObject file) {
         Ruby ruby = context.getRuntime();
 
         XmlDomParserContext ctx = new XmlDomParserContext(ruby, RubyFixnum.newFixnum(ruby, 1L));
-        ctx.setInputSource(context, file, context.getRuntime().getNil());
+        ctx.setInputSourceFile(context, file);
         XmlDocument xmlDocument = ctx.parse(context, getNokogiriClass(ruby, "Nokogiri::XML::Document"), ruby.getNil());
         return validate_document_or_file(context, xmlDocument);
     }
-    
+
     IRubyObject validate_document_or_file(ThreadContext context, XmlDocument xmlDocument) {
         RubyArray errors = (RubyArray) this.getInstanceVariable("@errors");
         ErrorHandler errorHandler = new SchemaErrorHandler(context.getRuntime(), errors);
@@ -193,22 +193,22 @@ public class XmlSchema extends RubyObject {
 
         return errors;
     }
-    
+
     protected void setErrorHandler(ErrorHandler errorHandler) {
         validator.setErrorHandler(errorHandler);
     }
-    
+
     protected void validate(Document document) throws SAXException, IOException {
         DOMSource docSource = new DOMSource(document);
         validator.validate(docSource);
     }
-    
+
     private class SchemaResourceResolver implements LSResourceResolver {
         SchemaLSInput lsInput = new SchemaLSInput();
         String currentDir;
         String scriptFileName;
         //String defaultURI;
-        
+
         SchemaResourceResolver(String currentDir, String scriptFileName, Object input) {
             this.currentDir = currentDir;
             this.scriptFileName = scriptFileName;
@@ -231,7 +231,7 @@ public class XmlSchema extends RubyObject {
             return lsInput;
         }
     }
-    
+
     private class SchemaLSInput implements LSInput {
         protected String fPublicId;
         protected String fSystemId;
@@ -241,7 +241,7 @@ public class XmlSchema extends RubyObject {
         protected String fData;
         protected String fEncoding;
         protected boolean fCertifiedText = false;
-        
+
         @Override
         public String getBaseURI() {
             return fBaseSystemId;
@@ -289,7 +289,7 @@ public class XmlSchema extends RubyObject {
 
         @Override
         public void setByteStream(InputStream byteStream) {
-            fByteStream = byteStream;   
+            fByteStream = byteStream;
         }
 
         @Override
@@ -321,6 +321,6 @@ public class XmlSchema extends RubyObject {
         public void setSystemId(String sysId) {
             fSystemId = sysId;
         }
-        
+
     }
 }

data/ext/java/nokogiri/internals/NokogiriHandler.java

@@ -128,12 +128,10 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
     }
 
     /*
-     * This has to call either "start_element" or
-     * "start_element_namespace" depending on whether there are any
-     * namespace attributes.
+     * This calls "start_element_namespace".
      *
      * Attributes that define namespaces are passed in a separate
-     * array of of <code>[:prefix, :uri]</code> arrays and are not
+     * array of <code>[:prefix, :uri]</code> arrays and are not
      * passed with the other attributes.
      */
     @Override
@@ -158,7 +156,7 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
 
             if (isNamespace(qn) && !fromFragmentHandler) {
                 // I haven't figured the reason out yet, but, in somewhere,
-                // namespace is converted to array in array in array and cause
+                // namespace is converted to array in array and cause
                 // TypeError at line 45 in fragment_handler.rb
                 RubyArray ns = RubyArray.newArray(ruby, 2);
                 if (ln.equals("xmlns")) ln = null;

data/ext/nokogiri/extconf.rb

@@ -391,7 +391,12 @@ when using_system_libraries?
 else
   message "Building nokogiri using packaged libraries.\n"
 
-  require 'mini_portile'
+  # The gem version constraint in the Rakefile is not respected at install time.
+  # Keep this version in sync with the one in the Rakefile !
+  gem "mini_portile2", "~> 2.0.0.rc2"
+  require 'mini_portile2'
+  message "Using mini_portile version #{MiniPortile::VERSION}\n"
+
   require 'yaml'
 
   static_p = enable_config('static', true) or
@@ -448,10 +453,10 @@ else
       ]
     end
   else
-    if darwin_p && !File.exist?('/usr/include/iconv.h')
+    if darwin_p && !have_header('iconv.h')
       abort <<'EOM'.chomp
 -----
-The file "/usr/include/iconv.h" is missing in your build environment,
+The file "iconv.h" is missing in your build environment,
 which means you haven't installed Xcode Command Line Tools properly.
 
 To install Command Line Tools, try running `xcode-select --install` on

data/ext/nokogiri/xml_sax_parser_context.c

@@ -206,7 +206,7 @@ static VALUE column(VALUE self)
  *  recovery=(boolean)
  *
  * Should this parser recover from structural errors? It will not stop processing
- * file on structural errors if if set to true
+ * file on structural errors if set to true
  */
 static VALUE set_recovery(VALUE self, VALUE value)
 {
@@ -226,7 +226,7 @@ static VALUE set_recovery(VALUE self, VALUE value)
  *  recovery
  *
  * Should this parser recover from structural errors? It will not stop processing
- * file on structural errors if if set to true
+ * file on structural errors if set to true
  */
 static VALUE get_recovery(VALUE self)
 {

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.6.7.rc3'
+  VERSION = '1.6.7.rc4'
 
   class VersionInfo # :nodoc:
     def jruby?

data/test/html/test_document.rb

@@ -14,6 +14,11 @@ module Nokogiri
         assert @html.xpath(nil)
       end
 
+      def test_does_not_fail_with_illformatted_html
+        doc = Nokogiri::HTML('"</html>";'.force_encoding(Encoding::BINARY))
+        assert_not_nil doc
+      end
+
       def test_exceptions_remove_newlines
         errors = @html.errors
         assert errors.length > 0, 'has errors'

data/test/xml/test_schema.rb

@@ -94,9 +94,22 @@ EOF
       end
 
       def test_validate_invalid_document
-        read_doc = File.read(PO_XML_FILE).gsub(/<city>[^<]*<\/city>/, '')
+        doc = Nokogiri::XML File.read(PO_XML_FILE)
+        doc.css("city").unlink
 
-        assert errors = @xsd.validate(Nokogiri::XML(read_doc))
+        assert errors = @xsd.validate(doc)
+        assert_equal 2, errors.length
+      end
+
+      def test_validate_invalid_file
+        tempfile = Tempfile.new("xml")
+
+        doc = Nokogiri::XML File.read(PO_XML_FILE)
+        doc.css("city").unlink
+        tempfile.write doc.to_xml
+        tempfile.close
+
+        assert errors = @xsd.validate(tempfile.path)
         assert_equal 2, errors.length
       end
 

data/test/xml/test_xpath.rb

@@ -425,6 +425,21 @@ END
         assert_equal 1, xml_doc.xpath('//mods:titleInfo',ns_hash).length
         assert_equal 'finnish', xml_doc.xpath('//mods:titleInfo[1]/@lang',ns_hash).first.value
       end
+
+      def test_xpath_after_reset_doc_via_innerhtml
+        xml = <<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<document xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0">
+  <text:section name="Section1">[TEXT_INSIDE_SECTION]</text:section>
+</document>
+XML
+
+        doc = Nokogiri::XML(xml)
+        doc.inner_html = doc.inner_html
+        sections = doc.xpath(".//text:section[@name='Section1']")
+        assert_equal 1, sections.size
+        assert_equal "[TEXT_INSIDE_SECTION]", sections.first.text
+      end
     end
   end
 end

data/test_all

@@ -14,11 +14,11 @@
 RUBIES="\
   ruby-2.2 \
   ruby-2.1 \
-  ruby-2.0.0-p598 \
+  ruby-2.0.0-p647 \
   ruby-1.9.3-p551 \
   ruby-1.9.2-p330 \
-  jruby-9.0.0.0.pre1 \
-  jruby-1.7.18
+  jruby-9.0.4.0 \
+  jruby-1.7.19
   "
 
 TEST_LOG=test.log

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.7.rc3
+  version: 1.6.7.rc4
 platform: java
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -174,12 +174,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   prerelease: false
   type: :development
 description: |-