schemacop 3.0.27 → 3.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c0fc96299ed96cd4716792ebff5cd534a382bf0b3b986cf857a36041cba6da3
-  data.tar.gz: 2d3c689728bc7e9ebc5138be0b2b2cb9a06d2e77557914cc18880507c3d59cfb
+  metadata.gz: ff2b18b4f3426f6a06e4a9183c3b20375c5d55496929bdf30a569c19ad1cc28c
+  data.tar.gz: edb96299b93d5e49b6d5a8125fa2c95a73d6158c2cae4d4428c3fe9066b41244
 SHA512:
-  metadata.gz: 1b9d0c4299ab4a94b70ecddcaf90ffee54b810f2b02f311afdd9d63dd7491f27382813211c2d4d66ceffbf2ab761f8b37b5a878daea227211c9bdfbf12214054
-  data.tar.gz: 381b90a930cc66ff5e098db51daf97aef4b30906ab4d0d9824d2616453e3144eb3adb42c84604a11608d1f83564722fff72d53d64eb1b9b433cc95d9773eadb9
+  metadata.gz: 49b290cbf2a7fdfc4b938fbdad9d4bd54469867fa46be22dc1a2158c32fe68266d1cce136d824a263689b9fdd9797ddfd601c7fa9fafbd37bb9adf3634f126ba
+  data.tar.gz: 73241d7daed75ad77a230904821749dcb0e954f8c3c858bc207d9487dd4b7cffbe806ea7a64dffc28010e6dc27281133d5191129781ad2c462dbe2f395b76278

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log
 
+## 3.0.28 (2023-12-20)
+
+* Fix `mailbox` format allowing incorrectly formatted strings
+
 ## 3.0.27 (2023-12-13)
 
 * Add format `mailbox` to `str` node for Schemacop3 schemas

data/VERSION

@@ -1 +1 @@
-3.0.27
+3.0.28

data/lib/schemacop.rb

@@ -57,10 +57,9 @@ module Schemacop
 
   register_string_formatter(
     :mailbox,
-    pattern: %r{^.*\s?<[a-zA-Z0-9.!\#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*>$},
+    pattern: /^("\p{Print}+"\s)?<#{URI::MailTo::EMAIL_REGEXP.source[2...-2]}>$/,
     handler: ->(value) { value }
   )
-
   register_string_formatter(
     :boolean,
     pattern: /^(true|false|0|1)$/i,

data/schemacop.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.27 ruby lib
+# stub: schemacop 3.0.28 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.27".freeze
+  s.version = "3.0.28".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sitrox".freeze]
-  s.date = "2023-12-13"
+  s.date = "2023-12-20"
   s.files = [".github/workflows/ruby.yml".freeze, ".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, ".yardopts".freeze, "CHANGELOG.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "README_V2.md".freeze, "README_V3.md".freeze, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "lib/schemacop.rb".freeze, "lib/schemacop/base_schema.rb".freeze, "lib/schemacop/exceptions.rb".freeze, "lib/schemacop/railtie.rb".freeze, "lib/schemacop/schema.rb".freeze, "lib/schemacop/schema2.rb".freeze, "lib/schemacop/schema3.rb".freeze, "lib/schemacop/scoped_env.rb".freeze, "lib/schemacop/v2.rb".freeze, "lib/schemacop/v2/caster.rb".freeze, "lib/schemacop/v2/collector.rb".freeze, "lib/schemacop/v2/dupper.rb".freeze, "lib/schemacop/v2/field_node.rb".freeze, "lib/schemacop/v2/node.rb".freeze, "lib/schemacop/v2/node_resolver.rb".freeze, "lib/schemacop/v2/node_supporting_field.rb".freeze, "lib/schemacop/v2/node_supporting_type.rb".freeze, "lib/schemacop/v2/node_with_block.rb".freeze, "lib/schemacop/v2/validator/array_validator.rb".freeze, "lib/schemacop/v2/validator/boolean_validator.rb".freeze, "lib/schemacop/v2/validator/float_validator.rb".freeze, "lib/schemacop/v2/validator/hash_validator.rb".freeze, "lib/schemacop/v2/validator/integer_validator.rb".freeze, "lib/schemacop/v2/validator/nil_validator.rb".freeze, "lib/schemacop/v2/validator/number_validator.rb".freeze, "lib/schemacop/v2/validator/object_validator.rb".freeze, "lib/schemacop/v2/validator/string_validator.rb".freeze, "lib/schemacop/v2/validator/symbol_validator.rb".freeze, "lib/schemacop/v3.rb".freeze, "lib/schemacop/v3/all_of_node.rb".freeze, "lib/schemacop/v3/any_of_node.rb".freeze, "lib/schemacop/v3/array_node.rb".freeze, "lib/schemacop/v3/boolean_node.rb".freeze, "lib/schemacop/v3/combination_node.rb".freeze, "lib/schemacop/v3/context.rb".freeze, "lib/schemacop/v3/dsl_scope.rb".freeze, "lib/schemacop/v3/global_context.rb".freeze, "lib/schemacop/v3/hash_node.rb".freeze, "lib/schemacop/v3/integer_node.rb".freeze, "lib/schemacop/v3/is_not_node.rb".freeze, "lib/schemacop/v3/node.rb".freeze, "lib/schemacop/v3/node_registry.rb".freeze, "lib/schemacop/v3/number_node.rb".freeze, "lib/schemacop/v3/numeric_node.rb".freeze, "lib/schemacop/v3/object_node.rb".freeze, "lib/schemacop/v3/one_of_node.rb".freeze, "lib/schemacop/v3/reference_node.rb".freeze, "lib/schemacop/v3/result.rb".freeze, "lib/schemacop/v3/string_node.rb".freeze, "lib/schemacop/v3/symbol_node.rb".freeze, "schemacop.gemspec".freeze, "test/lib/test_helper.rb".freeze, "test/schemas/nested/group.rb".freeze, "test/schemas/user.rb".freeze, "test/unit/schemacop/v2/casting_test.rb".freeze, "test/unit/schemacop/v2/collector_test.rb".freeze, "test/unit/schemacop/v2/custom_check_test.rb".freeze, "test/unit/schemacop/v2/custom_if_test.rb".freeze, "test/unit/schemacop/v2/defaults_test.rb".freeze, "test/unit/schemacop/v2/empty_test.rb".freeze, "test/unit/schemacop/v2/nil_dis_allow_test.rb".freeze, "test/unit/schemacop/v2/node_resolver_test.rb".freeze, "test/unit/schemacop/v2/short_forms_test.rb".freeze, "test/unit/schemacop/v2/types_test.rb".freeze, "test/unit/schemacop/v2/validator_array_test.rb".freeze, "test/unit/schemacop/v2/validator_boolean_test.rb".freeze, "test/unit/schemacop/v2/validator_float_test.rb".freeze, "test/unit/schemacop/v2/validator_hash_test.rb".freeze, "test/unit/schemacop/v2/validator_integer_test.rb".freeze, "test/unit/schemacop/v2/validator_nil_test.rb".freeze, "test/unit/schemacop/v2/validator_number_test.rb".freeze, "test/unit/schemacop/v2/validator_object_test.rb".freeze, "test/unit/schemacop/v2/validator_string_test.rb".freeze, "test/unit/schemacop/v2/validator_symbol_test.rb".freeze, "test/unit/schemacop/v3/all_of_node_test.rb".freeze, "test/unit/schemacop/v3/any_of_node_test.rb".freeze, "test/unit/schemacop/v3/array_node_test.rb".freeze, "test/unit/schemacop/v3/boolean_node_test.rb".freeze, "test/unit/schemacop/v3/global_context_test.rb".freeze, "test/unit/schemacop/v3/hash_node_test.rb".freeze, "test/unit/schemacop/v3/integer_node_test.rb".freeze, "test/unit/schemacop/v3/is_not_node_test.rb".freeze, "test/unit/schemacop/v3/node_test.rb".freeze, "test/unit/schemacop/v3/number_node_test.rb".freeze, "test/unit/schemacop/v3/object_node_test.rb".freeze, "test/unit/schemacop/v3/one_of_node_test.rb".freeze, "test/unit/schemacop/v3/reference_node_test.rb".freeze, "test/unit/schemacop/v3/string_node_test.rb".freeze, "test/unit/schemacop/v3/symbol_node_test.rb".freeze]
   s.homepage = "https://github.com/sitrox/schemacop".freeze
   s.licenses = ["MIT".freeze]

data/test/unit/schemacop/v3/string_node_test.rb

@@ -196,43 +196,87 @@ module Schemacop
 
         assert_json(type: :string, format: :mailbox)
 
+        # No angle brackets given
         assert_validation 'john.doe@example.com' do
           error '/', 'String does not match format "mailbox".'
         end
 
-        assert_validation 'john.doe+foo-bar_baz@example.com' do
+        # Only leading angle bracket given
+        assert_validation '<john.doe@example.com' do
           error '/', 'String does not match format "mailbox".'
         end
 
-        assert_validation 'JOHN.DOE+FOO-BAR_BAZ@EXAMPLE.COM' do
+        # Only trailing angle bracket given
+        assert_validation 'john.doe@example.com>' do
           error '/', 'String does not match format "mailbox".'
         end
 
-        assert_validation 'someemail' do
+        # Both angle brackets given, OK
+        assert_validation '<john.doe@example.com>'
+
+        # Both angle brackets given but leading space, not okay
+        assert_validation ' <john.doe@example.com>' do
           error '/', 'String does not match format "mailbox".'
         end
 
-        assert_validation 'john doe@example.com' do
+        # Invalid email address given
+        assert_validation ' <john>' do
           error '/', 'String does not match format "mailbox".'
         end
 
-        assert_validation '@john@example.com' do
+        # Invalid email address given
+        assert_validation ' <john@>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Invalid email address given
+        assert_validation ' <@example.com>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Name given but no quotes
+        assert_validation 'John Doe <john.doe@example.com>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Name given but only leading quote
+        assert_validation '"John Doe <john.doe@example.com>' do
           error '/', 'String does not match format "mailbox".'
         end
 
-        assert_validation 'John Doe <john.doe@example.com>'
-        assert_validation 'John Doe <john.doe+foo-bar_baz@example.com>'
-        assert_validation 'John Doe <JOHN.DOE+FOO-BAR_BAZ@EXAMPLE.COM>'
+        # Name given but only trailing quote
+        assert_validation 'John Doe" <john.doe@example.com>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Name given but no space between mail and name
+        assert_validation '"John Doe"<john.doe@example.com>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Too many brackets at start
+        assert_validation '"John Doe" <<john.doe@example.com>' do
+          error '/', 'String does not match format "mailbox".'
+        end
+
+        # Too many brackets at end
+        assert_validation '"John Doe" <john.doe@example.com>>' do
+          error '/', 'String does not match format "mailbox".'
+        end
 
-        assert_validation 'John <john.doe@example.com>'
-        assert_validation 'John Doe 123 <john.doe@example.com>'
-        assert_validation 'John_Doe <john.doe@example.com>'
-        assert_validation 'John-Doe ÖÄ <john.doe@example.com>'
+        # Name with quotes and space before mail, OK
         assert_validation '"John Doe" <john.doe@example.com>'
-        assert_validation '<john.doe@example.com>'
+
+        # Name with quotes and space before mail with special characters, OK
+        assert_validation '"Jöhn Doé-Test" <john.doe@example.com>'
+
+        # Name with quotes and space before mail with angle bracket in name, OK
+        assert_validation '"John < Doe" <john.doe@example.com>'
 
         assert_cast(nil, nil)
-        assert_cast('John Doe <john.doe@example.com>', 'John Doe <john.doe@example.com>')
+        assert_cast('<john.doe@example.com>', '<john.doe@example.com>')
+        assert_cast('"John Doe" <john.doe@example.com>', '"John Doe" <john.doe@example.com>')
+        assert_cast('"Jöhn Doé-Test" <john.doe@example.com>', '"Jöhn Doé-Test" <john.doe@example.com>')
       end
 
       def test_format_boolean

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.27
+  version: 3.0.28
 platform: ruby
 authors:
 - Sitrox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-13 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport