Throws if path token starts with underscore

architect · Aug 24, 2021 · e64526f · e64526f
1 parent 58d0955
commit e64526f
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 5 deletions.
diff --git a/db/conditionParser.js b/db/conditionParser.js
diff --git a/db/conditionParser.pegjs b/db/conditionParser.pegjs
@@ -343,15 +343,15 @@ PathExpression
       _ '[' _ ix:[0-9]+ _ ']' {
         return +(ix.join(''))
       }
-    / _ '.' _ prop:Identifier {
+    / _ '.' _ prop:PathIdentifier {
         return prop
       }
     )* {
       return (Array.isArray(head) ? head : [head]).concat(tail)
     }
 
 GroupedPathExpression
-  = Identifier
+  = PathIdentifier
   / '(' _ '(' _ path:PathExpression _ ')' _ ')' {
       redundantParensError()
       return path
@@ -366,10 +366,19 @@ Identifier
     }
   / ExpressionAttributeName
 
+PathIdentifier
+  = !ReservedWord head:PathIdentifierStart tail:IdentifierPart* {
+      return head + tail.join('')
+    }
+  / ExpressionAttributeName
+
 IdentifierStart
   = [a-zA-Z]
   / '_'
 
+PathIdentifierStart
+  = [a-zA-Z]
+
 IdentifierPart
   = IdentifierStart
   / [0-9]

diff --git a/test/putItem.js b/test/putItem.js
@@ -551,6 +551,18 @@ describe('putItem', function() {
         helpers.deleteWhenActive(table.TableName)
       })
     })
+
+    it('should return ValidationException if path token starts with underscore', function(done) {
+      async.forEach([
+        { ConditionExpression: 'attribute_not_exists(_c)' },
+        { ConditionExpression: 'attribute_not_exists(c._d)'},
+      ], function(putData, cb) {
+        putData.TableName = helpers.testRangeTable
+        putData.Item = {a: {S: 'a'}, b: {S: 'b'}}
+        assertValidation(putData, /^Invalid ConditionExpression: Syntax error;/, cb)
+      }, done)
+    })
+
   })
 
   // A number can have up to 38 digits precision and can be between 10^-128 to 10^+126