psych 3.3.1-java → 4.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5b639869782169459319acb664ad1e578b9b34a895d92f9a21b15b61aa5b105
-  data.tar.gz: 45ce044b1b49c3c192aa4650de49e632421b83a83704afa72f9b9d7f0f294876
+  metadata.gz: 5ce72ed68be903a82b40d36da89dd265af0a701a3ee4052ede7256d195019a9b
+  data.tar.gz: c29db93b6a1debdeb09c7b01d6c9840a338a00b8d20cc9ad8937884966749081
 SHA512:
-  metadata.gz: 3ebd264e253a5b951c128a9c6e1ab8730eca2f195ab3be0903bc1748a72523258b8e1217d5ceffbdb6915a17a66995f2a6d031139ee3a633219d5899f8409226
-  data.tar.gz: 77c74f09ff5fc3723ed93a3382de206b66af3612530dd886b6720df2862e24e92713926bba67f8d72cc03bf0b6c235939166d26de63644c93fbaa49fdeb848c3
+  metadata.gz: 495ed773d0916df91ff7ae075d50a1472b524fac88c516e199362b95e5d2c6df9673b921e62c1815c94903109162cccf7012ab57aae5e6c83529ab57801248ff
+  data.tar.gz: a7d3b990ee0fcf4137b05230a2af106b633b7e7d5e6b09343e2c83d7c4161dcbb969a7f4a9c1d534cbb79eab2259e30d0bb76c502c77e1fb4e62d646663eadf5

data/Gemfile

@@ -4,6 +4,6 @@ gemspec
 
 group :development do
   gem 'rake-compiler', ">= 0.4.1"
-  gem 'minitest', "~> 5.0"
+  gem 'test-unit'
   gem 'ruby-maven', :platforms => :jruby
 end

data/Rakefile

@@ -3,8 +3,8 @@ Bundler::GemHelper.install_tasks
 
 require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << "test/lib" << "test"
+  t.ruby_opts << "-rhelper"
   t.test_files = FileList['test/**/test_*.rb']
   t.verbose = true
   t.warning = true
@@ -31,4 +31,11 @@ else
   Rake::ExtensionTask.new("psych")
 end
 
+task :sync_tool do
+  require 'fileutils'
+  FileUtils.cp "../ruby/tool/lib/core_assertions.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/envutil.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/find_executable.rb", "./test/lib"
+end
+
 task :default => [:compile, :test]

data/ext/java/org/jruby/ext/psych/PsychEmitter.java

@@ -29,13 +29,16 @@ package org.jruby.ext.psych;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.jcodings.Encoding;
+import org.jcodings.specific.UTF8Encoding;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
+import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
 import org.jruby.RubyFixnum;
 import org.jruby.RubyModule;
@@ -46,6 +49,8 @@ import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.IOOutputStream;
+import org.jruby.util.TypeConverter;
+import org.jruby.util.io.EncodingUtils;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.emitter.Emitter;
 import org.yaml.snakeyaml.emitter.EmitterException;
@@ -110,9 +115,7 @@ public class PsychEmitter extends RubyObject {
 
     @JRubyMethod
     public IRubyObject start_stream(ThreadContext context, IRubyObject encoding) {
-        if (!(encoding instanceof RubyFixnum)) {
-            throw context.runtime.newTypeError(encoding, context.runtime.getFixnum());
-        }
+        TypeConverter.checkType(context, encoding, context.runtime.getFixnum());
 
         initEmitter(context, encoding);
 
@@ -136,6 +139,8 @@ public class PsychEmitter extends RubyObject {
         boolean implicitBool = implicit.isTrue();
         Map<String, String> tagsMap = null;
 
+        TypeConverter.checkType(context, _version, context.runtime.getArray());
+
         RubyArray versionAry = _version.convertToArray();
         if (versionAry.size() == 2) {
             int versionInt0 = (int)versionAry.eltInternal(0).convertToInteger().getLongValue();
@@ -153,19 +158,23 @@ public class PsychEmitter extends RubyObject {
             }
         }
 
-        RubyArray tagsAry = tags.convertToArray();
-        if (tagsAry.size() > 0) {
-            tagsMap = new HashMap<String, String>(tagsAry.size());
-            for (int i = 0; i < tagsAry.size(); i++) {
-                RubyArray tagsTuple = tagsAry.eltInternal(i).convertToArray();
-                if (tagsTuple.size() != 2) {
-                    throw context.runtime.newRuntimeError("tags tuple must be of length 2");
+        if (!tags.isNil()) {
+            TypeConverter.checkType(context, tags, context.runtime.getArray());
+
+            RubyArray tagsAry = tags.convertToArray();
+            if (tagsAry.size() > 0) {
+                tagsMap = new HashMap<>(tagsAry.size());
+                for (int i = 0; i < tagsAry.size(); i++) {
+                    RubyArray tagsTuple = tagsAry.eltInternal(i).convertToArray();
+                    if (tagsTuple.size() != 2) {
+                        throw context.runtime.newRuntimeError("tags tuple must be of length 2");
+                    }
+                    IRubyObject key = tagsTuple.eltInternal(0);
+                    IRubyObject value = tagsTuple.eltInternal(1);
+                    tagsMap.put(
+                            key.asJavaString(),
+                            value.asJavaString());
                 }
-                IRubyObject key = tagsTuple.eltInternal(0);
-                IRubyObject value = tagsTuple.eltInternal(1);
-                tagsMap.put(
-                        key.asJavaString(),
-                        value.asJavaString());
             }
         }
 
@@ -189,21 +198,29 @@ public class PsychEmitter extends RubyObject {
         IRubyObject plain = args[3];
         IRubyObject quoted = args[4];
         IRubyObject style = args[5];
-        
-        if (!(value instanceof RubyString)) {
-            throw context.runtime.newTypeError(value, context.runtime.getString());
-        }
+
+        RubyClass stringClass = context.runtime.getString();
+
+        TypeConverter.checkType(context, value, stringClass);
+
+        RubyString valueStr = (RubyString) value;
+
+        valueStr = EncodingUtils.strConvEnc(context, valueStr, valueStr.getEncoding(), UTF8Encoding.INSTANCE);
+
+        RubyString anchorStr = exportToUTF8(context, anchor, stringClass);
+        RubyString tagStr = exportToUTF8(context, tag, stringClass);
 
         ScalarEvent event = new ScalarEvent(
-                anchor.isNil() ? null : anchor.asJavaString(),
-                tag.isNil() ? null : tag.asJavaString(),
-                new ImplicitTuple(plain.isTrue(),
-                quoted.isTrue()),
-                value.asJavaString(),
+                anchorStr == null ? null : anchorStr.asJavaString(),
+                tagStr == null ? null : tagStr.asJavaString(),
+                new ImplicitTuple(plain.isTrue(), quoted.isTrue()),
+                valueStr.asJavaString(),
                 NULL_MARK,
                 NULL_MARK,
                 SCALAR_STYLES[style.convertToInteger().getIntValue()]);
+
         emit(context, event);
+
         return this;
     }
 
@@ -214,11 +231,14 @@ public class PsychEmitter extends RubyObject {
         IRubyObject implicit = args[2];
         IRubyObject style = args[3];
 
-        final int SEQUENCE_BLOCK = 1; // see psych/nodes/sequence.rb
+        RubyClass stringClass = context.runtime.getString();
+
+        RubyString anchorStr = exportToUTF8(context, anchor, stringClass);
+        RubyString tagStr = exportToUTF8(context, tag, stringClass);
 
         SequenceStartEvent event = new SequenceStartEvent(
-                anchor.isNil() ? null : anchor.asJavaString(),
-                tag.isNil() ? null : tag.asJavaString(),
+                anchorStr == null ? null : anchorStr.asJavaString(),
+                tagStr == null ? null : tagStr.asJavaString(),
                 implicit.isTrue(),
                 NULL_MARK,
                 NULL_MARK,
@@ -241,16 +261,21 @@ public class PsychEmitter extends RubyObject {
         IRubyObject implicit = args[2];
         IRubyObject style = args[3];
 
-        final int MAPPING_BLOCK = 1; // see psych/nodes/mapping.rb
+        RubyClass stringClass = context.runtime.getString();
+
+        RubyString anchorStr = exportToUTF8(context, anchor, stringClass);
+        RubyString tagStr = exportToUTF8(context, tag, stringClass);
 
         MappingStartEvent event = new MappingStartEvent(
-                anchor.isNil() ? null : anchor.asJavaString(),
-                tag.isNil() ? null : tag.asJavaString(),
+                anchorStr == null ? null : anchorStr.asJavaString(),
+                tagStr == null ? null : tagStr.asJavaString(),
                 implicit.isTrue(),
                 NULL_MARK,
                 NULL_MARK,
                 FLOW_STYLES[style.convertToInteger().getIntValue()]);
+
         emit(context, event);
+
         return this;
     }
 
@@ -263,7 +288,11 @@ public class PsychEmitter extends RubyObject {
     
     @JRubyMethod
     public IRubyObject alias(ThreadContext context, IRubyObject anchor) {
-        AliasEvent event = new AliasEvent(anchor.asJavaString(), NULL_MARK, NULL_MARK);
+        RubyClass stringClass = context.runtime.getString();
+
+        RubyString anchorStr = exportToUTF8(context, anchor, stringClass);
+
+        AliasEvent event = new AliasEvent(anchorStr.asJavaString(), NULL_MARK, NULL_MARK);
         emit(context, event);
         return this;
     }
@@ -278,7 +307,7 @@ public class PsychEmitter extends RubyObject {
     @JRubyMethod
     public IRubyObject canonical(ThreadContext context) {
         // TODO: unclear if this affects a running emitter
-        return context.runtime.newBoolean(options.isCanonical());
+        return RubyBoolean.newBoolean(context, options.isCanonical());
     }
 
     @JRubyMethod(name = "indentation=")
@@ -312,6 +341,9 @@ public class PsychEmitter extends RubyObject {
             if (emitter == null) throw context.runtime.newRuntimeError("uninitialized emitter");
 
             emitter.emit(event);
+
+            // flush writer after each emit
+            writer.flush();
         } catch (IOException ioe) {
             throw context.runtime.newIOErrorFromException(ioe);
         } catch (EmitterException ee) {
@@ -325,10 +357,22 @@ public class PsychEmitter extends RubyObject {
         Encoding encoding = PsychLibrary.YAMLEncoding.values()[(int)_encoding.convertToInteger().getLongValue()].encoding;
         Charset charset = context.runtime.getEncodingService().charsetForEncoding(encoding);
 
-        emitter = new Emitter(new OutputStreamWriter(new IOOutputStream(io, encoding), charset), options);
+        writer = new OutputStreamWriter(new IOOutputStream(io, encoding), charset);
+        emitter = new Emitter(writer, options);
+    }
+
+    private RubyString exportToUTF8(ThreadContext context, IRubyObject tag, RubyClass stringClass) {
+        RubyString tagStr = null;
+        if (!tag.isNil()) {
+            TypeConverter.checkType(context, tag, stringClass);
+            tagStr = (RubyString) tag;
+            tagStr = EncodingUtils.strConvEnc(context, tagStr, tagStr.getEncoding(), UTF8Encoding.INSTANCE);
+        }
+        return tagStr;
     }
 
     Emitter emitter;
+    Writer writer;
     DumperOptions options = new DumperOptions();
     IRubyObject io;
 

data/ext/java/org/jruby/ext/psych/PsychParser.java

@@ -30,6 +30,9 @@ package org.jruby.ext.psych;
 import java.io.ByteArrayInputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.MalformedInputException;
 import java.util.Map;
 
 import org.jcodings.Encoding;
@@ -61,6 +64,7 @@ import org.jruby.util.log.LoggerFactory;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.error.Mark;
 import org.yaml.snakeyaml.error.MarkedYAMLException;
+import org.yaml.snakeyaml.error.YAMLException;
 import org.yaml.snakeyaml.events.AliasEvent;
 import org.yaml.snakeyaml.events.DocumentEndEvent;
 import org.yaml.snakeyaml.events.DocumentStartEvent;
@@ -75,6 +79,8 @@ import org.yaml.snakeyaml.parser.ParserImpl;
 import org.yaml.snakeyaml.reader.ReaderException;
 import org.yaml.snakeyaml.reader.StreamReader;
 import org.yaml.snakeyaml.scanner.ScannerException;
+
+import static org.jruby.runtime.Helpers.arrayOf;
 import static org.jruby.runtime.Helpers.invoke;
 import org.jruby.util.ByteList;
 
@@ -89,8 +95,7 @@ public class PsychParser extends RubyObject {
             }
         }, psych);
 
-        RubyKernel.require(runtime.getNil(),
-                runtime.newString("psych/syntax_error"), Block.NULL_BLOCK);
+        runtime.getLoadService().require("psych/syntax_error");
         psychParser.defineConstant("ANY", runtime.newFixnum(YAML_ANY_ENCODING.ordinal()));
         psychParser.defineConstant("UTF8", runtime.newFixnum(YAML_UTF8_ENCODING.ordinal()));
         psychParser.defineConstant("UTF16LE", runtime.newFixnum(YAML_UTF16LE_ENCODING.ordinal()));
@@ -110,13 +115,15 @@ public class PsychParser extends RubyObject {
         return parse(context, yaml, runtime.getNil());
     }
 
-    private IRubyObject stringOrNilFor(Ruby runtime, String value, boolean tainted) {
-        if (value == null) return runtime.getNil(); // No need to taint nil
+    private IRubyObject stringOrNilFor(ThreadContext context, String value, boolean tainted) {
+        if (value == null) return context.nil;
 
-        return stringFor(runtime, value, tainted);
+        return stringFor(context, value, tainted);
     }
     
-    private RubyString stringFor(Ruby runtime, String value, boolean tainted) {
+    private RubyString stringFor(ThreadContext context, String value, boolean tainted) {
+        Ruby runtime = context.runtime;
+
         Encoding encoding = runtime.getDefaultInternalEncoding();
         if (encoding == null) {
             encoding = UTF8Encoding.INSTANCE;
@@ -136,8 +143,6 @@ public class PsychParser extends RubyObject {
     }
     
     private StreamReader readerFor(ThreadContext context, IRubyObject yaml) {
-        Ruby runtime = context.runtime;
-
         if (yaml instanceof RubyString) {
             ByteList byteList = ((RubyString)yaml).getByteList();
             Encoding enc = byteList.getEncoding();
@@ -175,8 +180,14 @@ public class PsychParser extends RubyObject {
                 // If we can't get it from the IO or it doesn't have a charset, fall back on UTF-8
                 charset = UTF8Encoding.INSTANCE.getCharset();
             }
-            return new StreamReader(new InputStreamReader(new IOInputStream(yaml), charset));
+            CharsetDecoder decoder = charset.newDecoder();
+            decoder.onMalformedInput(CodingErrorAction.REPORT);
+            decoder.onMalformedInput(CodingErrorAction.REPORT);
+
+            return new StreamReader(new InputStreamReader(new IOInputStream(yaml), decoder));
         } else {
+            Ruby runtime = context.runtime;
+
             throw runtime.newTypeError(yaml, runtime.getIO());
         }
     }
@@ -214,7 +225,7 @@ public class PsychParser extends RubyObject {
                     
                     invoke(context, handler, "end_document", notExplicit);
                 } else if (event.is(ID.Alias)) {
-                    IRubyObject alias = stringOrNilFor(runtime, ((AliasEvent)event).getAnchor(), tainted);
+                    IRubyObject alias = stringOrNilFor(context, ((AliasEvent)event).getAnchor(), tainted);
 
                     invoke(context, handler, "alias", alias);
                 } else if (event.is(ID.Scalar)) {
@@ -249,6 +260,16 @@ public class PsychParser extends RubyObject {
             parser = null;
             raiseParserException(context, yaml, re, path);
 
+        } catch (YAMLException ye) {
+            Throwable cause = ye.getCause();
+
+            if (cause instanceof MalformedInputException) {
+                // failure due to improperly encoded input
+                raiseParserException(context, yaml, (MalformedInputException) cause, path);
+            }
+
+            throw ye;
+
         } catch (Throwable t) {
             Helpers.throwException(t);
             return this;
@@ -268,8 +289,8 @@ public class PsychParser extends RubyObject {
         RubyArray tags = RubyArray.newArray(runtime);
         if (tagsMap != null && tagsMap.size() > 0) {
             for (Map.Entry<String, String> tag : tagsMap.entrySet()) {
-                IRubyObject key   = stringFor(runtime, tag.getKey(), tainted);
-                IRubyObject value = stringFor(runtime, tag.getValue(), tainted);
+                IRubyObject key   = stringFor(context, tag.getKey(), tainted);
+                IRubyObject value = stringFor(context, tag.getValue(), tainted);
 
                 tags.append(RubyArray.newArray(runtime, key, value));
             }
@@ -281,8 +302,8 @@ public class PsychParser extends RubyObject {
     
     private void handleMappingStart(ThreadContext context, MappingStartEvent mse, boolean tainted, IRubyObject handler) {
         Ruby runtime = context.runtime;
-        IRubyObject anchor = stringOrNilFor(runtime, mse.getAnchor(), tainted);
-        IRubyObject tag = stringOrNilFor(runtime, mse.getTag(), tainted);
+        IRubyObject anchor = stringOrNilFor(context, mse.getAnchor(), tainted);
+        IRubyObject tag = stringOrNilFor(context, mse.getTag(), tainted);
         IRubyObject implicit = runtime.newBoolean(mse.getImplicit());
         IRubyObject style = runtime.newFixnum(translateFlowStyle(mse.getFlowStyle()));
 
@@ -292,12 +313,12 @@ public class PsychParser extends RubyObject {
     private void handleScalar(ThreadContext context, ScalarEvent se, boolean tainted, IRubyObject handler) {
         Ruby runtime = context.runtime;
 
-        IRubyObject anchor = stringOrNilFor(runtime, se.getAnchor(), tainted);
-        IRubyObject tag = stringOrNilFor(runtime, se.getTag(), tainted);
+        IRubyObject anchor = stringOrNilFor(context, se.getAnchor(), tainted);
+        IRubyObject tag = stringOrNilFor(context, se.getTag(), tainted);
         IRubyObject plain_implicit = runtime.newBoolean(se.getImplicit().canOmitTagInPlainScalar());
         IRubyObject quoted_implicit = runtime.newBoolean(se.getImplicit().canOmitTagInNonPlainScalar());
         IRubyObject style = runtime.newFixnum(translateStyle(se.getScalarStyle()));
-        IRubyObject val = stringFor(runtime, se.getValue(), tainted);
+        IRubyObject val = stringFor(context, se.getValue(), tainted);
 
         invoke(context, handler, "scalar", val, anchor, tag, plain_implicit,
                 quoted_implicit, style);
@@ -305,8 +326,8 @@ public class PsychParser extends RubyObject {
     
     private void handleSequenceStart(ThreadContext context, SequenceStartEvent sse, boolean tainted, IRubyObject handler) {
         Ruby runtime = context.runtime;
-        IRubyObject anchor = stringOrNilFor(runtime, sse.getAnchor(), tainted);
-        IRubyObject tag = stringOrNilFor(runtime, sse.getTag(), tainted);
+        IRubyObject anchor = stringOrNilFor(context, sse.getAnchor(), tainted);
+        IRubyObject tag = stringOrNilFor(context, sse.getTag(), tainted);
         IRubyObject implicit = runtime.newBoolean(sse.getImplicit());
         IRubyObject style = runtime.newFixnum(translateFlowStyle(sse.getFlowStyle()));
 
@@ -360,6 +381,31 @@ public class PsychParser extends RubyObject {
         RubyKernel.raise(context, runtime.getKernel(), new IRubyObject[] { exception }, Block.NULL_BLOCK);
     }
 
+    private static void raiseParserException(ThreadContext context, IRubyObject yaml, MalformedInputException mie, IRubyObject rbPath) {
+        Ruby runtime;
+        Mark mark;
+        RubyClass se;
+        IRubyObject exception;
+
+        runtime = context.runtime;
+        se = (RubyClass)runtime.getModule("Psych").getConstant("SyntaxError");
+
+        mie.getInputLength();
+
+        exception = se.newInstance(context,
+                arrayOf(
+                        rbPath,
+                        runtime.newFixnum(-1),
+                        runtime.newFixnum(-1),
+                        runtime.newFixnum(mie.getInputLength()),
+                        runtime.getNil(),
+                        runtime.getNil()
+                ),
+                Block.NULL_BLOCK);
+
+        RubyKernel.raise(context, runtime.getKernel(), new IRubyObject[] { exception }, Block.NULL_BLOCK);
+    }
+
     private static int translateStyle(DumperOptions.ScalarStyle style) {
         if (style == null) return 0; // any
 

data/ext/psych/yaml/loader.c

@@ -541,4 +541,4 @@ yaml_parser_load_mapping_end(yaml_parser_t *parser, yaml_event_t *event,
     (void)POP(parser, *ctx);
 
     return 1;
-}
+}

data/ext/psych/yaml/scanner.c

@@ -273,7 +273,7 @@
  * The tokens BLOCK-SEQUENCE-START and BLOCK-MAPPING-START denote indentation
  * increase that precedes a block collection (cf. the INDENT token in Python).
  * The token BLOCK-END denote indentation decrease that ends a block collection
- * (cf. the DEDENT token in Python).  However YAML has some syntax pecularities
+ * (cf. the DEDENT token in Python).  However YAML has some syntax peculiarities
  * that makes detections of these tokens more complex.
  *
  * The tokens BLOCK-ENTRY, KEY, and VALUE are used to represent the indicators
@@ -3287,7 +3287,7 @@ yaml_parser_scan_flow_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
         /* Check if we are at the end of the scalar. */
 
-        /* Fix for crash unitialized value crash
+        /* Fix for crash uninitialized value crash
          * Credit for the bug and input is to OSS Fuzz
          * Credit for the fix to Alex Gaynor
          */

data/ext/psych/yaml/yaml.h

@@ -1095,7 +1095,7 @@ typedef struct yaml_parser_s {
     yaml_error_type_t error;
     /** Error description. */
     const char *problem;
-    /** The byte about which the problem occured. */
+    /** The byte about which the problem occurred. */
     size_t problem_offset;
     /** The problematic value (@c -1 is none). */
     int problem_value;
@@ -1335,7 +1335,7 @@ yaml_parser_delete(yaml_parser_t *parser);
  * Set a string input.
  *
  * Note that the @a input pointer must be valid while the @a parser object
- * exists.  The application is responsible for destroing @a input after
+ * exists.  The application is responsible for destroying @a input after
  * destroying the @a parser.
  *
  * @param[in,out]   parser  A parser object.
@@ -1950,7 +1950,7 @@ yaml_emitter_close(yaml_emitter_t *emitter);
 /**
  * Emit a YAML document.
  *
- * The documen object may be generated using the yaml_parser_load() function
+ * The document object may be generated using the yaml_parser_load() function
  * or the yaml_document_initialize() function.  The emitter takes the
  * responsibility for the document object and destroys its content after
  * it is emitted. The document object is destroyed even if the function fails.

data/ext/psych/yaml/yaml_private.h

@@ -2,7 +2,7 @@
 #include RUBY_EXTCONF_H
 #endif
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

data/lib/psych/class_loader.rb

@@ -86,7 +86,7 @@ module Psych
         if @symbols.include? sym
           super
         else
-          raise DisallowedClass, 'Symbol'
+          raise DisallowedClass.new('load', 'Symbol')
         end
       end
 
@@ -96,7 +96,7 @@ module Psych
         if @classes.include? klassname
           super
         else
-          raise DisallowedClass, klassname
+          raise DisallowedClass.new('load', klassname)
         end
       end
     end

data/lib/psych/exception.rb

@@ -7,8 +7,8 @@ module Psych
   end
 
   class DisallowedClass < Exception
-    def initialize klass_name
-      super "Tried to load unspecified class: #{klass_name}"
+    def initialize action, klass_name
+      super "Tried to #{action} unspecified class: #{klass_name}"
     end
   end
 end

data/lib/psych/handler.rb

@@ -119,7 +119,7 @@ module Psych
     # +tag+ is an associated tag or nil
     # +plain+ is a boolean value
     # +quoted+ is a boolean value
-    # +style+ is an integer idicating the string style
+    # +style+ is an integer indicating the string style
     #
     # See the constants in Psych::Nodes::Scalar for the possible values of
     # +style+

data/lib/psych/nodes/scalar.rb

@@ -50,7 +50,7 @@ module Psych
       # +tag+ is an associated tag or nil
       # +plain+ is a boolean value
       # +quoted+ is a boolean value
-      # +style+ is an integer idicating the string style
+      # +style+ is an integer indicating the string style
       #
       # == See Also
       #

data/lib/psych/scalar_scanner.rb

@@ -9,15 +9,14 @@ module Psych
     TIME = /^-?\d{4}-\d{1,2}-\d{1,2}(?:[Tt]|\s+)\d{1,2}:\d\d:\d\d(?:\.\d*)?(?:\s*(?:Z|[-+]\d{1,2}:?(?:\d\d)?))?$/
 
     # Taken from http://yaml.org/type/float.html
-    FLOAT = /^(?:[-+]?([0-9][0-9_,]*)?\.[0-9]*([eE][-+][0-9]+)?(?# base 10)
-              |[-+]?\.(inf|Inf|INF)(?# infinity)
-              |\.(nan|NaN|NAN)(?# not a number))$/x
+    # Base 60, [-+]inf and NaN are handled separately
+    FLOAT = /^(?:[-+]?([0-9][0-9_,]*)?\.[0-9]*([eE][-+][0-9]+)?(?# base 10))$/x
 
     # Taken from http://yaml.org/type/int.html
-    INTEGER = /^(?:[-+]?0b[0-1_,]+          (?# base 2)
-                  |[-+]?0[0-7_,]+           (?# base 8)
-                  |[-+]?(?:0|[1-9][0-9_,]*) (?# base 10)
-                  |[-+]?0x[0-9a-fA-F_,]+    (?# base 16))$/x
+    INTEGER = /^(?:[-+]?0b[0-1_,]+                        (?# base 2)
+                  |[-+]?0[0-7_,]+                         (?# base 8)
+                  |[-+]?(?:0|[1-9](?:[0-9]|,[0-9]|_[0-9])*) (?# base 10)
+                  |[-+]?0x[0-9a-fA-F_,]+                  (?# base 16))$/x
 
     attr_reader :class_loader
 
@@ -34,7 +33,7 @@ module Psych
 
       # Check for a String type, being careful not to get caught by hash keys, hex values, and
       # special floats (e.g., -.inf).
-      if string.match?(/^[^\d\.:-]?[A-Za-z_\s!@#\$%\^&\*\(\)\{\}\<\>\|\/\\~;=]+/) || string.match?(/\n/)
+      if string.match?(%r{^[^\d.:-]?[[:alpha:]_\s!@#$%\^&*(){}<>|/\\~;=]+}) || string.match?(/\n/)
         return string if string.length > 5
 
         if string.match?(/^[^ytonf~]/i)
@@ -61,7 +60,7 @@ module Psych
         rescue ArgumentError
           string
         end
-      elsif string.match?(/^\.inf$/i)
+      elsif string.match?(/^\+?\.inf$/i)
         Float::INFINITY
       elsif string.match?(/^-\.inf$/i)
         -Float::INFINITY

data/lib/psych/versions.rb

@@ -1,8 +1,8 @@
-
 # frozen_string_literal: true
+
 module Psych
   # The version of Psych you are using
-  VERSION = '3.3.1'
+  VERSION = '4.0.2'
 
   if RUBY_ENGINE == 'jruby'
     DEFAULT_SNAKEYAML_VERSION = '1.28'.freeze

data/lib/psych/visitors/to_ruby.rb

@@ -366,7 +366,7 @@ module Psych
               hash[key] = val
             end
           else
-            if !tagged && @symbolize_names
+            if !tagged && @symbolize_names && key.is_a?(String)
               key = key.to_sym
             elsif !@freeze
               key = deduplicate(key)

data/lib/psych/visitors/yaml_tree.rb

@@ -272,6 +272,8 @@ module Psych
           tag   = 'tag:yaml.org,2002:str'
           plain = false
           quote = false
+        elsif o == 'y' || o == 'n'
+          style = Nodes::Scalar::DOUBLE_QUOTED
         elsif @line_width && o.length > @line_width
           style = Nodes::Scalar::FOLDED
         elsif o =~ /^[^[:word:]][^"]*$/
@@ -509,9 +511,9 @@ module Psych
       def emit_coder c, o
         case c.type
         when :scalar
-          @emitter.scalar c.scalar, nil, c.tag, c.tag.nil?, false, Nodes::Scalar::ANY
+          @emitter.scalar c.scalar, nil, c.tag, c.tag.nil?, false, c.style
         when :seq
-          @emitter.start_sequence nil, c.tag, c.tag.nil?, Nodes::Sequence::BLOCK
+          @emitter.start_sequence nil, c.tag, c.tag.nil?, c.style
           c.seq.each do |thing|
             accept thing
           end
@@ -535,5 +537,51 @@ module Psych
         end
       end
     end
+
+    class RestrictedYAMLTree < YAMLTree
+      DEFAULT_PERMITTED_CLASSES = {
+        TrueClass => true,
+        FalseClass => true,
+        NilClass => true,
+        Integer => true,
+        Float => true,
+        String => true,
+        Array => true,
+        Hash => true,
+      }.compare_by_identity.freeze
+
+      def initialize emitter, ss, options
+        super
+        @permitted_classes = DEFAULT_PERMITTED_CLASSES.dup
+        Array(options[:permitted_classes]).each do |klass|
+          @permitted_classes[klass] = true
+        end
+        @permitted_symbols = {}.compare_by_identity
+        Array(options[:permitted_symbols]).each do |symbol|
+          @permitted_symbols[symbol] = true
+        end
+        @aliases = options.fetch(:aliases, false)
+      end
+
+      def accept target
+        if !@aliases && @st.key?(target)
+          raise BadAlias, "Tried to dump an aliased object"
+        end
+
+        unless @permitted_classes[target.class]
+          raise DisallowedClass.new('dump', target.class.name || target.class.inspect)
+        end
+
+        super
+      end
+
+      def visit_Symbol sym
+        unless @permitted_symbols[sym]
+          raise DisallowedClass.new('dump', "Symbol(#{sym.inspect})")
+        end
+
+        super
+      end
+    end
   end
 end

data/lib/psych.rb

@@ -33,7 +33,7 @@ require 'psych/class_loader'
 #
 # Psych is a YAML parser and emitter.
 # Psych leverages libyaml [Home page: https://pyyaml.org/wiki/LibYAML]
-# or [HG repo: https://bitbucket.org/xi/libyaml] for its YAML parsing
+# or [git repo: https://github.com/yaml/libyaml] for its YAML parsing
 # and emitting capabilities. In addition to wrapping libyaml, Psych also
 # knows how to serialize and de-serialize most Ruby objects to and from
 # the YAML format.
@@ -234,9 +234,6 @@ require 'psych/class_loader'
 module Psych
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join('.').freeze
-  # Deprecation guard
-  NOT_GIVEN = Object.new.freeze
-  private_constant :NOT_GIVEN
 
   ###
   # Load +yaml+ in to a Ruby data structure.  If multiple documents are
@@ -249,11 +246,11 @@ module Psych
   #
   # Example:
   #
-  #   Psych.load("--- a")             # => 'a'
-  #   Psych.load("---\n - a\n - b")   # => ['a', 'b']
+  #   Psych.unsafe_load("--- a")             # => 'a'
+  #   Psych.unsafe_load("---\n - a\n - b")   # => ['a', 'b']
   #
   #   begin
-  #     Psych.load("--- `", filename: "file.txt")
+  #     Psych.unsafe_load("--- `", filename: "file.txt")
   #   rescue Psych::SyntaxError => ex
   #     ex.file    # => 'file.txt'
   #     ex.message # => "(file.txt): found character that cannot start any token"
@@ -262,25 +259,21 @@ module Psych
   # When the optional +symbolize_names+ keyword argument is set to a
   # true value, returns symbols for keys in Hash objects (default: strings).
   #
-  #   Psych.load("---\n foo: bar")                         # => {"foo"=>"bar"}
-  #   Psych.load("---\n foo: bar", symbolize_names: true)  # => {:foo=>"bar"}
+  #   Psych.unsafe_load("---\n foo: bar")                         # => {"foo"=>"bar"}
+  #   Psych.unsafe_load("---\n foo: bar", symbolize_names: true)  # => {:foo=>"bar"}
   #
   # Raises a TypeError when `yaml` parameter is NilClass
   #
   # NOTE: This method *should not* be used to parse untrusted documents, such as
   # YAML documents that are supplied via user input.  Instead, please use the
-  # safe_load method.
+  # load method or the safe_load method.
   #
-  def self.load yaml, legacy_filename = NOT_GIVEN, filename: nil, fallback: false, symbolize_names: false, freeze: false
-    if legacy_filename != NOT_GIVEN
-      warn_with_uplevel 'Passing filename with the 2nd argument of Psych.load is deprecated. Use keyword argument like Psych.load(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
-      filename = legacy_filename
-    end
-
+  def self.unsafe_load yaml, filename: nil, fallback: false, symbolize_names: false, freeze: false
     result = parse(yaml, filename: filename)
     return fallback unless result
     result.to_ruby(symbolize_names: symbolize_names, freeze: freeze)
   end
+  class << self; alias :load :unsafe_load; end
 
   ###
   # Safely load the yaml string in +yaml+.  By default, only the following
@@ -289,7 +282,8 @@ module Psych
   # * TrueClass
   # * FalseClass
   # * NilClass
-  # * Numeric
+  # * Integer
+  # * Float
   # * String
   # * Array
   # * Hash
@@ -326,27 +320,7 @@ module Psych
   #   Psych.safe_load("---\n foo: bar")                         # => {"foo"=>"bar"}
   #   Psych.safe_load("---\n foo: bar", symbolize_names: true)  # => {:foo=>"bar"}
   #
-  def self.safe_load yaml, legacy_permitted_classes = NOT_GIVEN, legacy_permitted_symbols = NOT_GIVEN, legacy_aliases = NOT_GIVEN, legacy_filename = NOT_GIVEN, permitted_classes: [], permitted_symbols: [], aliases: false, filename: nil, fallback: nil, symbolize_names: false, freeze: false
-    if legacy_permitted_classes != NOT_GIVEN
-      warn_with_uplevel 'Passing permitted_classes with the 2nd argument of Psych.safe_load is deprecated. Use keyword argument like Psych.safe_load(yaml, permitted_classes: ...) instead.', uplevel: 1 if $VERBOSE
-      permitted_classes = legacy_permitted_classes
-    end
-
-    if legacy_permitted_symbols != NOT_GIVEN
-      warn_with_uplevel 'Passing permitted_symbols with the 3rd argument of Psych.safe_load is deprecated. Use keyword argument like Psych.safe_load(yaml, permitted_symbols: ...) instead.', uplevel: 1 if $VERBOSE
-      permitted_symbols = legacy_permitted_symbols
-    end
-
-    if legacy_aliases != NOT_GIVEN
-      warn_with_uplevel 'Passing aliases with the 4th argument of Psych.safe_load is deprecated. Use keyword argument like Psych.safe_load(yaml, aliases: ...) instead.', uplevel: 1 if $VERBOSE
-      aliases = legacy_aliases
-    end
-
-    if legacy_filename != NOT_GIVEN
-      warn_with_uplevel 'Passing filename with the 5th argument of Psych.safe_load is deprecated. Use keyword argument like Psych.safe_load(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
-      filename = legacy_filename
-    end
-
+  def self.safe_load yaml, permitted_classes: [], permitted_symbols: [], aliases: false, filename: nil, fallback: nil, symbolize_names: false, freeze: false
     result = parse(yaml, filename: filename)
     return fallback unless result
 
@@ -362,6 +336,46 @@ module Psych
     result
   end
 
+  ###
+  # Load +yaml+ in to a Ruby data structure.  If multiple documents are
+  # provided, the object contained in the first document will be returned.
+  # +filename+ will be used in the exception message if any exception
+  # is raised while parsing.  If +yaml+ is empty, it returns
+  # the specified +fallback+ return value, which defaults to +false+.
+  #
+  # Raises a Psych::SyntaxError when a YAML syntax error is detected.
+  #
+  # Example:
+  #
+  #   Psych.load("--- a")             # => 'a'
+  #   Psych.load("---\n - a\n - b")   # => ['a', 'b']
+  #
+  #   begin
+  #     Psych.load("--- `", filename: "file.txt")
+  #   rescue Psych::SyntaxError => ex
+  #     ex.file    # => 'file.txt'
+  #     ex.message # => "(file.txt): found character that cannot start any token"
+  #   end
+  #
+  # When the optional +symbolize_names+ keyword argument is set to a
+  # true value, returns symbols for keys in Hash objects (default: strings).
+  #
+  #   Psych.load("---\n foo: bar")                         # => {"foo"=>"bar"}
+  #   Psych.load("---\n foo: bar", symbolize_names: true)  # => {:foo=>"bar"}
+  #
+  # Raises a TypeError when `yaml` parameter is NilClass.  This method is
+  # similar to `safe_load` except that `Symbol` objects are allowed by default.
+  #
+  def self.load yaml, permitted_classes: [Symbol], permitted_symbols: [], aliases: false, filename: nil, fallback: nil, symbolize_names: false, freeze: false
+    safe_load yaml, permitted_classes: permitted_classes,
+                    permitted_symbols: permitted_symbols,
+                    aliases: aliases,
+                    filename: filename,
+                    fallback: fallback,
+                    symbolize_names: symbolize_names,
+                    freeze: freeze
+  end
+
   ###
   # Parse a YAML string in +yaml+.  Returns the Psych::Nodes::Document.
   # +filename+ is used in the exception message if a Psych::SyntaxError is
@@ -381,22 +395,12 @@ module Psych
   #   end
   #
   # See Psych::Nodes for more information about YAML AST.
-  def self.parse yaml, legacy_filename = NOT_GIVEN, filename: nil, fallback: NOT_GIVEN
-    if legacy_filename != NOT_GIVEN
-      warn_with_uplevel 'Passing filename with the 2nd argument of Psych.parse is deprecated. Use keyword argument like Psych.parse(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
-      filename = legacy_filename
-    end
-
+  def self.parse yaml, filename: nil
     parse_stream(yaml, filename: filename) do |node|
       return node
     end
 
-    if fallback != NOT_GIVEN
-      warn_with_uplevel 'Passing the `fallback` keyword argument of Psych.parse is deprecated.', uplevel: 1 if $VERBOSE
-      fallback
-    else
-      false
-    end
+    false
   end
 
   ###
@@ -445,12 +449,7 @@ module Psych
   # Raises a TypeError when NilClass is passed.
   #
   # See Psych::Nodes for more information about YAML AST.
-  def self.parse_stream yaml, legacy_filename = NOT_GIVEN, filename: nil, &block
-    if legacy_filename != NOT_GIVEN
-      warn_with_uplevel 'Passing filename with the 2nd argument of Psych.parse_stream is deprecated. Use keyword argument like Psych.parse_stream(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
-      filename = legacy_filename
-    end
-
+  def self.parse_stream yaml, filename: nil, &block
     if block_given?
       parser = Psych::Parser.new(Handlers::DocumentStream.new(&block))
       parser.parse yaml, filename
@@ -514,6 +513,79 @@ module Psych
     visitor.tree.yaml io, options
   end
 
+  ###
+  # call-seq:
+  #   Psych.safe_dump(o)               -> string of yaml
+  #   Psych.safe_dump(o, options)      -> string of yaml
+  #   Psych.safe_dump(o, io)           -> io object passed in
+  #   Psych.safe_dump(o, io, options)  -> io object passed in
+  #
+  # Safely dump Ruby object +o+ to a YAML string. Optional +options+ may be passed in
+  # to control the output format.  If an IO object is passed in, the YAML will
+  # be dumped to that IO object. By default, only the following
+  # classes are allowed to be serialized:
+  #
+  # * TrueClass
+  # * FalseClass
+  # * NilClass
+  # * Integer
+  # * Float
+  # * String
+  # * Array
+  # * Hash
+  #
+  # Arbitrary classes can be allowed by adding those classes to the +permitted_classes+
+  # keyword argument.  They are additive.  For example, to allow Date serialization:
+  #
+  #   Psych.safe_dump(yaml, permitted_classes: [Date])
+  #
+  # Now the Date class can be dumped in addition to the classes listed above.
+  #
+  # A Psych::DisallowedClass exception will be raised if the object contains a
+  # class that isn't in the +permitted_classes+ list.
+  #
+  # Currently supported options are:
+  #
+  # [<tt>:indentation</tt>]   Number of space characters used to indent.
+  #                           Acceptable value should be in <tt>0..9</tt> range,
+  #                           otherwise option is ignored.
+  #
+  #                           Default: <tt>2</tt>.
+  # [<tt>:line_width</tt>]    Max character to wrap line at.
+  #
+  #                           Default: <tt>0</tt> (meaning "wrap at 81").
+  # [<tt>:canonical</tt>]     Write "canonical" YAML form (very verbose, yet
+  #                           strictly formal).
+  #
+  #                           Default: <tt>false</tt>.
+  # [<tt>:header</tt>]        Write <tt>%YAML [version]</tt> at the beginning of document.
+  #
+  #                           Default: <tt>false</tt>.
+  #
+  # Example:
+  #
+  #   # Dump an array, get back a YAML string
+  #   Psych.safe_dump(['a', 'b'])  # => "---\n- a\n- b\n"
+  #
+  #   # Dump an array to an IO object
+  #   Psych.safe_dump(['a', 'b'], StringIO.new)  # => #<StringIO:0x000001009d0890>
+  #
+  #   # Dump an array with indentation set
+  #   Psych.safe_dump(['a', ['b']], indentation: 3) # => "---\n- a\n-  - b\n"
+  #
+  #   # Dump an array to an IO with indentation set
+  #   Psych.safe_dump(['a', ['b']], StringIO.new, indentation: 3)
+  def self.safe_dump o, io = nil, options = {}
+    if Hash === io
+      options = io
+      io      = nil
+    end
+
+    visitor = Psych::Visitors::RestrictedYAMLTree.create options
+    visitor << o
+    visitor.tree.yaml io, options
+  end
+
   ###
   # Dump a list of objects as separate documents to a document stream.
   #
@@ -551,12 +623,7 @@ module Psych
   #   end
   #   list # => ['foo', 'bar']
   #
-  def self.load_stream yaml, legacy_filename = NOT_GIVEN, filename: nil, fallback: [], **kwargs
-    if legacy_filename != NOT_GIVEN
-      warn_with_uplevel 'Passing filename with the 2nd argument of Psych.load_stream is deprecated. Use keyword argument like Psych.load_stream(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
-      filename = legacy_filename
-    end
-
+  def self.load_stream yaml, filename: nil, fallback: [], **kwargs
     result = if block_given?
                parse_stream(yaml, filename: filename) do |node|
                  yield node.to_ruby(**kwargs)
@@ -577,9 +644,9 @@ module Psych
   # NOTE: This method *should not* be used to parse untrusted documents, such as
   # YAML documents that are supplied via user input.  Instead, please use the
   # safe_load_file method.
-  def self.load_file filename, **kwargs
+  def self.unsafe_load_file filename, **kwargs
     File.open(filename, 'r:bom|utf-8') { |f|
-      self.load f, filename: filename, **kwargs
+      self.unsafe_load f, filename: filename, **kwargs
     }
   end
 
@@ -594,6 +661,17 @@ module Psych
     }
   end
 
+  ###
+  # Loads the document contained in +filename+.  Returns the yaml contained in
+  # +filename+ as a Ruby object, or if the file is empty, it returns
+  # the specified +fallback+ return value, which defaults to +false+.
+  # See load for options.
+  def self.load_file filename, **kwargs
+    File.open(filename, 'r:bom|utf-8') { |f|
+      self.load f, filename: filename, **kwargs
+    }
+  end
+
   # :stopdoc:
   def self.add_domain_type domain, type_tag, &block
     key = ['tag', domain, type_tag].join ':'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 4.0.2
 platform: java
 authors:
 - Aaron Patterson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -19,8 +19,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.7
   name: jar-dependencies
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - jar org.yaml:snakeyaml, 1.28
-rubygems_version: 3.0.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Psych is a YAML parser and emitter