validate numbers in schemas during schema compilation

ajv-validator · Jun 30, 2020 · 65b2f7d · 65b2f7d
1 parent 24d4f8f
commit 65b2f7d
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 0 deletions.
diff --git a/lib/dot/_limit.jst b/lib/dot/_limit.jst
@@ -17,6 +17,15 @@
     , $op = $isMax ? '<' : '>'
     , $notOp = $isMax ? '>' : '<'
     , $errorKeyword = undefined;
+
+  if (!($isData || typeof $schema == 'number' || $schema === undefined)) {
+    throw new Error($keyword + ' must be number');
+  }
+  if (!($isDataExcl || $schemaExcl === undefined
+                    || typeof $schemaExcl == 'number'
+                    || typeof $schemaExcl == 'boolean')) {
+    throw new Error($exclusiveKeyword + ' must be number or boolean');
+  }
 }}
 
 {{? $isDataExcl }}

diff --git a/lib/dot/_limitItems.jst b/lib/dot/_limitItems.jst
@@ -3,6 +3,8 @@
 {{# def.setupKeyword }}
 {{# def.$data }}
 
+{{# def.numberKeyword }}
+
 {{ var $op = $keyword == 'maxItems' ? '>' : '<'; }}
 if ({{# def.$dataNotType:'number' }} {{=$data}}.length {{=$op}} {{=$schemaValue}}) {
   {{ var $errorKeyword = $keyword; }}

diff --git a/lib/dot/_limitLength.jst b/lib/dot/_limitLength.jst
@@ -3,6 +3,8 @@
 {{# def.setupKeyword }}
 {{# def.$data }}
 
+{{# def.numberKeyword }}
+
 {{ var $op = $keyword == 'maxLength' ? '>' : '<'; }}
 if ({{# def.$dataNotType:'number' }} {{# def.strLength }} {{=$op}} {{=$schemaValue}}) {
   {{ var $errorKeyword = $keyword; }}

diff --git a/lib/dot/_limitProperties.jst b/lib/dot/_limitProperties.jst
@@ -3,6 +3,8 @@
 {{# def.setupKeyword }}
 {{# def.$data }}
 
+{{# def.numberKeyword }}
+
 {{ var $op = $keyword == 'maxProperties' ? '>' : '<'; }}
 if ({{# def.$dataNotType:'number' }} Object.keys({{=$data}}).length {{=$op}} {{=$schemaValue}}) {
   {{ var $errorKeyword = $keyword; }}

diff --git a/lib/dot/definitions.def b/lib/dot/definitions.def
@@ -138,6 +138,13 @@
 #}}
 
 
+{{## def.numberKeyword:
+  {{? !($isData || typeof $schema == 'number') }}
+    {{ throw new Error($keyword + ' must be number'); }}
+  {{?}}
+#}}
+
+
 {{## def.beginDefOut:
   {{
     var $$outStack = $$outStack || [];

diff --git a/spec/ajv.spec.js b/spec/ajv.spec.js
@@ -512,5 +512,49 @@ describe('Ajv', function () {
         });
       });
     });
+
+    describe('sub-schema validation outside of definitions during compilation', function() {
+      it('maximum', function() {
+        passValidationThrowCompile({
+          $ref: '#/foo',
+          foo: {maximum: 'bar'}
+        });
+      });
+
+      it('exclusiveMaximum', function() {
+        passValidationThrowCompile({
+          $ref: '#/foo',
+          foo: {exclusiveMaximum: 'bar'}
+        });
+      });
+
+      it('maxItems', function() {
+        passValidationThrowCompile({
+          $ref: '#/foo',
+          foo: {maxItems: 'bar'}
+        });
+      });
+
+      it('maxLength', function() {
+        passValidationThrowCompile({
+          $ref: '#/foo',
+          foo: {maxLength: 'bar'}
+        });
+      });
+
+      it('maxProperties', function() {
+        passValidationThrowCompile({
+          $ref: '#/foo',
+          foo: {maxProperties: 'bar'}
+        });
+      });
+
+      function passValidationThrowCompile(schema) {
+        ajv.validateSchema(schema) .should.equal(true);
+        should.throw(function() {
+          ajv.compile(schema);
+        });
+      }
+    });
   });
 });