Add upper typeopt to string type (SYN-10051) (#4632)

Author: Cisphyx

synapse/lib/types.py

@@ -2258,6 +2258,7 @@ class Str(Type):
         ('regex', None),
         ('lower', False),
         ('strip', True),
+        ('upper', False),
         ('replace', ()),
         ('onespace', False),
         ('globsuffix', False),
@@ -2282,6 +2283,10 @@ def postTypeInit(self):
 
         self.strtype = self.modl.type('str')
 
+        if self.opts.get('lower') and self.opts.get('upper'):
+            mesg = f'Str type ({self.name}) has both lower and upper set.'
+            raise s_exc.BadTypeDef(mesg=mesg)
+
         self.regex = None
         restr = self.opts.get('regex')
         if restr is not None:
@@ -2313,6 +2318,8 @@ async def _normForLift(self, valu):
         # doesnt have to be normable...
         if self.opts.get('lower'):
             valu = valu.lower()
+        elif self.opts.get('upper'):
+            valu = valu.upper()
 
         for look, repl in self.opts.get('replace', ()):
             valu = valu.replace(look, repl)
@@ -2353,6 +2360,8 @@ async def _normPyStr(self, valu, view=None):
 
         if self.opts['lower']:
             norm = norm.lower()
+        elif self.opts['upper']:
+            norm = norm.upper()
 
         for look, repl in self.opts.get('replace', ()):
             norm = norm.replace(look, repl)

synapse/tests/test_lib_types.py

@@ -1699,6 +1699,12 @@ async def test_str(self):
         lowr = model.type('str').clone({'lower': True})
         self.eq('foo', (await lowr.norm('FOO'))[0])
 
+        uppr = model.type('str').clone({'upper': True})
+        self.eq('FOO', (await uppr.norm('foo'))[0])
+
+        with self.raises(s_exc.BadTypeDef):
+            model.type('str').clone({'upper': True, 'lower': True})
+
         self.eq(True, await lowr.cmpr('xxherexx', '~=', 'here'))
         self.eq(False, await lowr.cmpr('xxherexx', '~=', '^here'))
 

synapse/tests/test_model_infotech.py

@@ -396,6 +396,14 @@ async def test_it_forms_simple(self):
             # self.eq(node.get('cisa:kev:added'), 1641081600000000)
             # self.eq(node.get('cisa:kev:duedate'), 1641081600000000)
 
+            nodes = await core.nodes('[ it:sec:cve=cve-2010-9998 ]')
+            self.len(1, nodes)
+            self.eq(nodes[0].ndef, ('it:sec:cve', 'CVE-2010-9998'))
+
+            nodes = await core.nodes('it:sec:cve^=cve-2010')
+            self.len(1, nodes)
+            self.eq(nodes[0].ndef, ('it:sec:cve', 'CVE-2010-9998'))
+
             nodes = await core.nodes('[it:sec:cve=$valu]', opts={'vars': {'valu': 'CVE\u20122013\u20131138'}})
             self.len(1, nodes)
             node = nodes[0]