byte string format

Author: p1c2u

openapi_core/schema/schemas/models.py

@@ -2,13 +2,14 @@
 import attr
 import functools
 import logging
+from base64 import b64decode, b64encode
 from collections import defaultdict
 from datetime import date, datetime
+from uuid import UUID
 import re
 import warnings
 
 from six import iteritems, integer_types, binary_type, text_type
-from uuid import UUID
 
 from openapi_core.extensions.models.factories import ModelFactory
 from openapi_core.schema.schemas.enums import SchemaFormat, SchemaType
@@ -21,7 +22,7 @@
     forcebool, format_date, format_datetime,
 )
 from openapi_core.schema.schemas.validators import (
-    TypeValidator, AttributeValidator,
+    TypeValidator, AttributeValidator, DecodeEncodeValidator,
 )
 
 log = logging.getLogger(__name__)
@@ -44,10 +45,13 @@ class Schema(object):
 
     STRING_FORMAT_CALLABLE_GETTER = {
         SchemaFormat.NONE: Format(text_type, TypeValidator(text_type)),
-        SchemaFormat.DATE: Format(format_date, TypeValidator(date, exclude=datetime)),
+        SchemaFormat.DATE: Format(
+            format_date, TypeValidator(date, exclude=datetime)),
         SchemaFormat.DATETIME: Format(format_datetime, TypeValidator(datetime)),
         SchemaFormat.BINARY: Format(binary_type, TypeValidator(binary_type)),
         SchemaFormat.UUID: Format(UUID, TypeValidator(UUID)),
+        SchemaFormat.BYTE: Format(
+            b64decode, DecodeEncodeValidator(b64decode, b64encode))
     }
 
     TYPE_VALIDATOR_CALLABLE_GETTER = {

openapi_core/schema/schemas/validators.py

@@ -24,3 +24,16 @@ def __call__(self, value):
             return False
 
         return True
+
+
+class DecodeEncodeValidator(object):
+
+    def __init__(self, decode_callable, encode_callable):
+        self.decode_callable = decode_callable
+        self.encode_callable = encode_callable
+
+    def __call__(self, value):
+        try:
+            return self.encode_callable(self.decode_callable(value)) == value
+        except:
+            return False

tests/unit/schema/test_schemas.py

@@ -478,6 +478,25 @@ def test_string_format_binary(self, value):
 
         assert result == value
 
+    @pytest.mark.parametrize('value', [
+        u('tsssst'), b('tsssst'), u('dGVzdA=='), 
+    ])
+    def test_string_format_byte_invalid(self, value):
+        schema = Schema('string', schema_format='byte')
+
+        with pytest.raises(OpenAPISchemaError):
+            schema.validate(value)
+
+    @pytest.mark.parametrize('value', [
+        b('dGVzdA=='),
+    ])
+    def test_string_format_byte(self, value):
+        schema = Schema('string', schema_format='byte')
+
+        result =schema.validate(value)
+
+        assert result == value
+
     @pytest.mark.parametrize('value', [
         u('test'), b('stream'), datetime.date(1989, 1, 2),
         datetime.datetime(1989, 1, 2, 0, 0, 0),