Merge pull request #17 from stolen/string-length-in-code-points

openapi_schema: count UTF8 code points when checking string length constraints

Author: maxlapshin

src/openapi_schema.erl

@@ -486,11 +486,12 @@ encode3(#{type := <<"string">>} = Spec, #{auto_convert := Convert} = Options, In
     {error, _} ->
       Input1;
     _ ->
+      Length = string:length(InputForValidation),
       case Spec of
-        #{minLength := MinLength} when size(InputForValidation) < MinLength ->
-          {error, #{error => too_short, path => Path, input => Input, detail => length(Input), min_length => MinLength}};
-        #{maxLength := MaxLength} when size(InputForValidation) > MaxLength ->
-          {error, #{error => too_long, path => Path, input => Input, detail => length(Input), max_length => MaxLength}};
+        #{minLength := MinLength} when Length < MinLength ->
+          {error, #{error => too_short, path => Path, input => Input, detail => Length, min_length => MinLength}};
+        #{maxLength := MaxLength} when Length > MaxLength ->
+          {error, #{error => too_long, path => Path, input => Input, detail => Length, max_length => MaxLength}};
         #{} ->
           Format = maps:get(format, Spec, undefined),
           Validators = maps:get(validators, Options),

test/openapi_schema_SUITE.erl

@@ -333,10 +333,21 @@ external_validators(_) ->
 
 
 min_max_length(_) ->
-  {error, #{error := too_short}} = 
+  {error, #{error := too_short, detail := 3}} =
     openapi_schema:process(<<"123">>, #{schema => #{type => <<"string">>, minLength => 5}}),
-  {error, #{error := too_long}} = 
+  {error, #{error := too_long, detail := 3}} =
     openapi_schema:process(<<"123">>, #{schema => #{type => <<"string">>, maxLength => 2}}),
+
+  {error, #{error := too_short, detail := 4}} =
+    openapi_schema:process(atom, #{schema => #{type => <<"string">>, minLength => 5}}),
+  {error, #{error := too_long, detail := 4}} =
+    openapi_schema:process(atom, #{schema => #{type => <<"string">>, maxLength => 2}}),
+
+  UTFString = unicode:characters_to_binary([128578,128579]), % 2 code points, but 8 bytes
+  {error, #{error := too_short, detail := 2}} =
+    openapi_schema:process(UTFString, #{schema => #{type => <<"string">>, minLength => 3}}),
+  {error, #{error := too_long, detail := 2}} =
+    openapi_schema:process(UTFString, #{schema => #{type => <<"string">>, maxLength => 1}}),
   ok.