synapse 2.223.0__py311-none-any.whl → 2.225.0__py311-none-any.whl

synapse/tests/test_lib_storm.py

@@ -21,7 +21,7 @@ import synapse.lib.stormtypes as s_stormtypes
 import synapse.tests.utils as s_t_utils
 from synapse.tests.utils import alist
 
-import synapse.tools.backup as s_tools_backup
+import synapse.tools.service.backup as s_tools_backup
 
 class StormTest(s_t_utils.SynTest):
 
@@ -4627,6 +4627,161 @@ class StormTest(s_t_utils.SynTest):
             self.stormIsInPrint('$lib.bytes.hashset`` has been deprecated and will be removed in version v3.0.0', msgs)
             self.stormIsInPrint('Use the corresponding ``$lib.axon`` function.', msgs)
 
+    async def test_storm_cmd_deprecations(self):
+
+        async with self.getTestCore() as core:
+
+            deprpkg = {
+                'name': 'testdepr',
+                'version': '0.0.1',
+                'synapse_version': '>=2.8.0,<3.0.0',
+                'commands': (
+                    {
+                        'name': 'deprmesg',
+                        'descr': 'deprecated command',
+                        'deprecated': {'eolvers': 'v3.0.0', 'mesg': 'Please use something else.'},
+                        'storm': '[ inet:ipv4=1.2.3.4 ]',
+                    },
+                    {
+                        'name': 'deprnomesg',
+                        'descr': 'deprecated command',
+                        'deprecated': {'eoldate': '2099-01-01'},
+                        'storm': '[ inet:ipv4=1.2.3.4 ]',
+                    },
+                    {
+                        'name': 'deprargs',
+                        'descr': 'deprecated command',
+                        'storm': '[ inet:ipv4=1.2.3.4 ]',
+                        'cmdargs': (
+                            ('--start-time', {
+                                'type': 'time',
+                                'deprecated': {'eolvers': 'v3.0.0', 'mesg': 'Use --period instead.'},
+                            }),
+                            ('--end-time', {
+                                'type': 'time',
+                                'deprecated': {'eolvers': 'v3.0.0'},
+                            }),
+                            ('--period', {
+                                'type': 'time',
+                            }),
+                        ),
+                    },
+                ),
+            }
+
+            self.none(await core.addStormPkg(deprpkg))
+
+            # Deprecation message shows up in command help
+            deprmesg = '"deprmesg" is deprecated: Please use something else.'
+            msgs = await core.stormlist('deprmesg -h')
+            self.stormIsInPrint(f'Deprecated: {deprmesg}', msgs)
+            self.stormHasNoWarnErr(msgs)
+
+            # Deprecation message shows up in command execution as warning
+            msgs = await core.stormlist('deprmesg')
+            self.stormIsInWarn(deprmesg, msgs)
+
+            # Deprecation message shows up in command help (with no message specified)
+            deprmesg = '"deprnomesg" is deprecated and will be removed on 2099-01-01.'
+            msgs = await core.stormlist('deprnomesg -h')
+            self.stormIsInPrint(f'Deprecated: {deprmesg}', msgs)
+            self.stormHasNoWarnErr(msgs)
+
+            # Deprecation message shows up in command execution as warning (with no message specified)
+            msgs = await core.stormlist('deprnomesg')
+            self.stormIsInWarn(deprmesg, msgs)
+
+            # Deprecation message shows up in help for command args
+            msgs = await core.stormlist('deprargs -h')
+            self.stormIsInPrint('  Deprecated: "--start-time" is deprecated: Use --period instead.', msgs)
+            self.stormIsInPrint('  Deprecated: "--end-time" is deprecated and will be removed in v3.0.0.', msgs)
+            self.stormHasNoWarnErr(msgs)
+
+            # Deprecation message doesn't show up in command execution when not using deprecated args
+            msgs = await core.stormlist('deprargs')
+            self.stormHasNoWarnErr(msgs)
+
+            # Deprecation message shows up in command execution as warning
+            msgs = await core.stormlist('deprargs --start-time now')
+            self.stormIsInWarn('"--start-time" is deprecated: Use --period instead.', msgs)
+            self.stormNotInWarn('"--end-time" is deprecated and will be removed in v3.0.0.', msgs)
+
+            msgs = await core.stormlist('deprargs --end-time now')
+            self.stormNotInWarn('"--start-time" is deprecated: Use --period instead.', msgs)
+            self.stormIsInWarn('"--end-time" is deprecated and will be removed in v3.0.0.', msgs)
+
+            msgs = await core.stormlist('deprargs --start-time now --end-time now')
+            self.stormIsInWarn('"--start-time" is deprecated: Use --period instead.', msgs)
+            self.stormIsInWarn('"--end-time" is deprecated and will be removed in v3.0.0.', msgs)
+
+            # Deprecation message only appears once per runtime
+            msgs = await core.stormlist('[ inet:ipv4=10.0.0.0/28 ] | deprmesg')
+            self.stormIsInWarn('"deprmesg" is deprecated: Please use something else.', msgs)
+            self.len(1, [m for m in msgs if m[0] == 'warn'])
+
+            msgs = await core.stormlist('[ inet:ipv4=10.0.0.0/28 ] | deprargs --start-time now --end-time now')
+            self.stormIsInWarn('"--start-time" is deprecated: Use --period instead.', msgs)
+            self.stormIsInWarn('"--end-time" is deprecated and will be removed in v3.0.0.', msgs)
+            self.len(2, [m for m in msgs if m[0] == 'warn'])
+
+    async def test_storm_cmd_cmdconf(self):
+        pkgdef = {
+            'name': 'testpkg',
+            'version': '1.0.0',
+            'commands': [
+                {
+                    'name': 'getcmdconf',
+                    'cmdconf': {
+                        'valu': 0,
+                        'sub': {
+                            'valu': 0,
+                        },
+                    },
+                    'storm': '''
+                        $lib.print(`VALU: {$cmdconf.valu}.`)
+                        $lib.print(`SUBVALU: {$cmdconf.sub.valu}.`)
+                        $cmdconf.valu = ($cmdconf.valu + 1)
+                        $cmdconf.sub.valu = ($cmdconf.sub.valu + 1)
+                    ''',
+                },
+            ],
+        }
+
+        async with self.getTestCore() as core:
+            await core.addStormPkg(pkgdef)
+
+            msgs = await core.stormlist('getcmdconf')
+            self.stormHasNoWarnErr(msgs)
+            self.stormIsInPrint('VALU: 0.', msgs)
+            self.stormIsInPrint('SUBVALU: 0.', msgs)
+
+            msgs = await core.stormlist('getcmdconf | getcmdconf')
+            self.stormHasNoWarnErr(msgs)
+            msgs = [k for k in msgs if k[0] == 'print']
+            self.len(4, msgs)
+            self.sorteq(
+                ['VALU: 0.', 'VALU: 0.', 'SUBVALU: 0.', 'SUBVALU: 0.'],
+                [msg[1].get('mesg') for msg in msgs]
+            )
+
+            msgs = await core.stormlist('for $i in $lib.range(16) {[test:int=$i]} | getcmdconf')
+            self.stormHasNoWarnErr(msgs)
+
+            self.stormIsInPrint('VALU: 0.', msgs)
+            self.stormIsInPrint('VALU: 1.', msgs)
+            self.stormIsInPrint('VALU: 15.', msgs)
+            self.stormNotInPrint('VALU: 16.', msgs)
+
+            self.stormIsInPrint('SUBVALU: 0.', msgs)
+            self.stormIsInPrint('SUBVALU: 1.', msgs)
+            self.stormIsInPrint('SUBVALU: 15.', msgs)
+            self.stormNotInPrint('SUBVALU: 16.', msgs)
+
+            msgs = await core.stormlist('getcmdconf')
+            self.stormHasNoWarnErr(msgs)
+            self.stormIsInPrint('VALU: 0.', msgs)
+            self.stormIsInPrint('SUBVALU: 0.', msgs)
+
     async def test_liftby_edge(self):
         async with self.getTestCore() as core:
 

synapse/tests/test_lib_stormhttp.py

@@ -47,6 +47,11 @@ class HttpBadJson(s_httpapi.Handler):
     async def get(self):
         self.write(b'{"foo": "bar\x80"}')
 
+class HttpGiantHeader(s_httpapi.Handler):
+    async def get(self):
+        self.set_header('Giant', 'x' * 64_000)
+        self.write('test')
+
 class StormHttpTest(s_test.SynTest):
 
     async def test_storm_http_get(self):
@@ -60,6 +65,7 @@ class StormHttpTest(s_test.SynTest):
             core.addHttpApi('/api/v0/test', s_test.HttpReflector, {'cell': core})
             core.addHttpApi('/api/v0/notjson', HttpNotJson, {'cell': core})
             core.addHttpApi('/api/v0/badjson', HttpBadJson, {'cell': core})
+            core.addHttpApi('/api/v0/giantheader', HttpGiantHeader, {'cell': core})
             url = f'https://root:root@127.0.0.1:{port}/api/v0/test'
             status_url = f'https://127.0.0.1:{port}/api/v1/status'
             opts = {'vars': {'url': url, 'port': port, 'status_url': status_url}}
@@ -273,6 +279,16 @@ class StormHttpTest(s_test.SynTest):
             self.isinstance(resp, tuple)
             self.len(0, resp)
 
+            gianturl = f'https://root:root@127.0.0.1:{port}/api/v0/giantheader'
+            giantopts = {'vars': {'url': gianturl}}
+            q = '''
+            $resp = $lib.inet.http.get($url, ssl_verify=$lib.false)
+            return ( $resp )
+            '''
+            resp = await core.callStorm(q, opts=giantopts)
+            self.eq(resp['body'], b'test')
+            self.len(64_000, resp['headers'].get('Giant'))
+
     async def test_storm_http_inject_ca(self):
 
         with self.getTestDir() as dirn:

synapse/tests/test_lib_stormlib_imap.py

@@ -445,6 +445,8 @@ class ImapTest(s_test.SynTest):
 
         while not link.isfini:
             mesg = await link.rx()
+            if mesg is None:
+                break
 
             # Receive commands from client
             command = mesg.get('command')
@@ -854,6 +856,8 @@ class ImapTest(s_test.SynTest):
                 self.stormIsInErr('Cannot process EXPUNGE command.', mesgs)
 
             imap = await s_link.connect('127.0.0.1', port, linkcls=s_imap.IMAPClient)
+            core.onfini(imap)
+
             await imap.login('user01@vertex.link', 'spaces lol')
             await imap.select('INBOX')
             self.eq(
@@ -868,6 +872,8 @@ class ImapTest(s_test.SynTest):
 
             # Normal response
             imap = await s_link.connect('127.0.0.1', port, linkcls=s_imap.IMAPClient)
+            core.onfini(imap)
+
             await imap.login(user, 'pass00')
             await imap.select('INBOX')
             ret = await imap.uid_fetch('1', '(RFC822 BODY[HEADER])')
@@ -884,6 +890,8 @@ class ImapTest(s_test.SynTest):
 
             # Normal response
             imap = await s_link.connect('127.0.0.1', port, linkcls=s_imap.IMAPClient)
+            core.onfini(imap)
+
             await imap.login(user, 'pass00')
             self.eq(
                 await imap.logout(),
@@ -897,6 +905,8 @@ class ImapTest(s_test.SynTest):
 
             with mock.patch.object(IMAPServer, 'logout', logout_no):
                 imap = await s_link.connect('127.0.0.1', port, linkcls=s_imap.IMAPClient)
+                core.onfini(imap)
+
                 await imap.login(user, 'pass00')
                 self.eq(
                     await imap.logout(),
@@ -910,6 +920,8 @@ class ImapTest(s_test.SynTest):
 
             with mock.patch.object(IMAPServer, 'logout', logout_nobye):
                 imap = await s_link.connect('127.0.0.1', port, linkcls=s_imap.IMAPClient)
+                core.onfini(imap)
+
                 await imap.login(user, 'pass00')
                 self.eq(
                     await imap.logout(),
@@ -932,6 +944,8 @@ class ImapTest(s_test.SynTest):
 
             # Check command validation
             imap = await s_link.connect('127.0.0.1', port, linkcls=s_imap.IMAPClient)
+            core.onfini(imap)
+
             with self.raises(s_exc.ImapError) as exc:
                 tag = imap._genTag()
                 await imap._command(tag, 'NEWP')

synapse/tests/test_lib_stormlib_oauth.py

@@ -11,7 +11,7 @@ import synapse.lib.coro as s_coro
 import synapse.lib.oauth as s_oauth
 import synapse.lib.httpapi as s_httpapi
 import synapse.tests.utils as s_test
-import synapse.tools.backup as s_backup
+import synapse.tools.service.backup as s_backup
 
 logger = logging.getLogger(__name__)
 

synapse/tests/test_lib_stormsvc.py

@@ -9,7 +9,7 @@ import synapse.lib.cell as s_cell
 import synapse.lib.share as s_share
 import synapse.lib.stormsvc as s_stormsvc
 
-import synapse.tools.backup as s_tools_backup
+import synapse.tools.service.backup as s_tools_backup
 
 old_pkg = {
     'name': 'old',

synapse/tests/test_lib_stormtypes.py

@@ -3297,6 +3297,18 @@ class StormTypesTest(s_test.SynTest):
             self.false(mesgs[0])
             self.isin('Ambiguous time', mesgs[1]['errinfo']['mesg'])
 
+            valu = await core.callStorm('return($lib.time.format($lib.cast(time, 20251002), $lib.time.formats.iso8601))')
+            self.eq(valu, '2025-10-02T00:00:00Z')
+
+            valu = await core.callStorm('return($lib.time.format($lib.cast(time, 20251002), $lib.time.formats.iso8601us))')
+            self.eq(valu, '2025-10-02T00:00:00.000000Z')
+
+            valu = await core.callStorm('return($lib.time.format($lib.cast(time, 20251002), $lib.time.formats.rfc2822))')
+            self.eq(valu, '02 Oct 2025 00:00:00 UT')
+
+            valu = await core.callStorm('return($lib.time.format($lib.cast(time, 20251002), $lib.time.formats.synapse))')
+            self.eq(valu, '2025/10/02 00:00:00.000000')
+
     async def test_storm_lib_time_ticker(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_lib_trigger.py

@@ -4,7 +4,7 @@ import synapse.common as s_common
 
 import synapse.telepath as s_telepath
 import synapse.tests.utils as s_t_utils
-import synapse.tools.backup as s_tools_backup
+import synapse.tools.service.backup as s_tools_backup
 
 class TrigTest(s_t_utils.SynTest):
 

synapse/tests/test_model_inet.py

@@ -2991,10 +2991,17 @@ class InetModelTest(s_t_utils.SynTest):
 
             q = '''
             [ inet:service:platform=(slack,)
+                :id=foo
                 :url="https://slack.com"
                 :urls=(https://slacker.com,)
+                :zones=(slack.com, slacker.com)
                 :name=Slack
                 :names=("slack chat",)
+                :parent={[ inet:service:platform=({"name": "salesforce"}) ]}
+                :status=available
+                :period=(2022, 2023)
+                :creator={[ inet:service:account=({"id": "bar"}) ]}
+                :remover={[ inet:service:account=({"id": "baz"}) ]}
                 :provider={ ou:org:name=$provname }
                 :provider:name=$provname
             ]
@@ -3002,20 +3009,36 @@ class InetModelTest(s_t_utils.SynTest):
             nodes = await core.nodes(q, opts=opts)
             self.len(1, nodes)
             self.eq(nodes[0].ndef, ('inet:service:platform', s_common.guid(('slack',))))
+            self.eq('foo', nodes[0].get('id'))
             self.eq(nodes[0].get('url'), 'https://slack.com')
             self.eq(nodes[0].get('urls'), ('https://slacker.com',))
+            self.eq(nodes[0].get('zones'), ('slack.com', 'slacker.com'))
             self.eq(nodes[0].get('name'), 'slack')
             self.eq(nodes[0].get('names'), ('slack chat',))
+            self.eq(nodes[0].repr('status'), 'available')
+            self.eq(nodes[0].repr('period'), ('2022/01/01 00:00:00.000', '2023/01/01 00:00:00.000'))
             self.eq(nodes[0].get('provider'), provider.ndef[1])
             self.eq(nodes[0].get('provider:name'), provname.lower())
             platform = nodes[0]
 
+            nodes = await core.nodes('inet:service:platform=(slack,) :parent -> *')
+            self.eq(['salesforce'], [n.get('name') for n in nodes])
+
+            nodes = await core.nodes('inet:service:platform=(slack,) :creator -> *')
+            self.eq(['bar'], [n.get('id') for n in nodes])
+
+            nodes = await core.nodes('inet:service:platform=(slack,) :remover -> *')
+            self.eq(['baz'], [n.get('id') for n in nodes])
+
             nodes = await core.nodes('[ inet:service:platform=({"name": "slack chat"}) ]')
             self.eq(nodes[0].ndef, platform.ndef)
 
             nodes = await core.nodes('[ inet:service:platform=({"url": "https://slacker.com"}) ]')
             self.eq(nodes[0].ndef, platform.ndef)
 
+            nodes = await core.nodes('[ inet:service:platform=({"zone": "slacker.com"}) ]')
+            self.eq(nodes[0].ndef, platform.ndef)
+
             q = '''
             [ inet:service:instance=(vertex, slack)
                 :id='T2XK1223Y'
@@ -3045,6 +3068,7 @@ class InetModelTest(s_t_utils.SynTest):
                 (inet:service:account=(blackout, account, vertex, slack)
                     :id=U7RN51U1J
                     :user=blackout
+                    :users=(zeblackout, blackoutalt, zeblackout)
                     :url=https://vertex.link/users/blackout
                     :email=blackout@vertex.link
                     :profile={ gen.ps.contact.email vertex.employee blackout@vertex.link }
@@ -3076,6 +3100,7 @@ class InetModelTest(s_t_utils.SynTest):
             self.eq(accounts[0].ndef, ('inet:service:account', s_common.guid(('blackout', 'account', 'vertex', 'slack'))))
             self.eq(accounts[0].get('id'), 'U7RN51U1J')
             self.eq(accounts[0].get('user'), 'blackout')
+            self.eq(accounts[0].get('users'), ('blackoutalt', 'zeblackout'))
             self.eq(accounts[0].get('url'), 'https://vertex.link/users/blackout')
             self.eq(accounts[0].get('email'), 'blackout@vertex.link')
             self.eq(accounts[0].get('profile'), blckprof.ndef[1])
@@ -3089,6 +3114,10 @@ class InetModelTest(s_t_utils.SynTest):
 
             self.len(1, await core.nodes('inet:service:account:email=visi@vertex.link :parent -> inet:service:account'))
 
+            nodes = await core.nodes('[ inet:service:account=({"user": "blackoutalt"}) ]')
+            self.len(1, nodes)
+            self.eq(accounts[0].ndef, nodes[0].ndef)
+
             q = '''
             [ inet:service:group=(developers, group, vertex, slack)
                 :id=X1234

synapse/tests/test_model_media.py

@@ -22,6 +22,7 @@ class MediaModelTest(s_t_utils.SynTest):
                 'file': file0,
                 'title': 'Synapse is awesome! ',
                 'summary': 'I forget ',
+                'body': 'It is Awesome ',
                 'published': 0,
                 'updated': 0,
                 'org': 'verteX',
@@ -34,7 +35,7 @@ class MediaModelTest(s_t_utils.SynTest):
 
             q = '''[(media:news=$valu
                     :url=$p.url :file=$p.file :title=$p.title
-                    :summary=$p.summary :published=$p.published :updated=$p.updated
+                    :summary=$p.summary :body=$p.body :published=$p.published :updated=$p.updated
                     :org=$p.org :authors=$p.authors
                     :publisher=$p.publisher :publisher:name=$p."publisher:name"
                     :rss:feed=$p."rss:feed" :topics=$p.topics
@@ -49,6 +50,8 @@ class MediaModelTest(s_t_utils.SynTest):
             self.eq(node.get('url:fqdn'), 'vertex.link')
             self.eq(node.get('file'), 'sha256:' + file0)
             self.eq(node.get('title'), 'synapse is awesome! ')
+            self.eq(node.get('summary'), 'I forget ')
+            self.eq(node.get('body'), 'It is Awesome ')
             self.eq(node.get('published'), 0)
             self.eq(node.get('updated'), 0)
             self.eq(node.get('publisher'), publisher)

synapse/tests/test_model_proj.py

@@ -1,4 +1,5 @@
 import synapse.exc as s_exc
+import synapse.common as s_common
 import synapse.tests.utils as s_test
 
 class ProjModelTest(s_test.SynTest):
@@ -256,13 +257,14 @@ class ProjModelTest(s_test.SynTest):
             self.eq('highest', nodes[0].repr('priority'))
             self.eq(proj, nodes[0].get('project'))
 
-            nodes = await core.nodes('proj:comment')
+            nodes = await core.nodes('proj:comment [ :ext:creator={[ps:contact=(visi,) :name=visi ]} ]')
             self.len(1, nodes)
             self.nn(nodes[0].get('created'))
             self.nn(nodes[0].get('updated'))
             self.eq(tick, nodes[0].get('ticket'))
             self.eq('hithere', nodes[0].get('text'))
             self.eq(visi.iden, nodes[0].get('creator'))
+            self.eq(s_common.guid(('visi',)), nodes[0].get('ext:creator'))
 
             self.eq('foo', await core.callStorm('return($lib.projects.get($proj).name)', opts=opts))
             self.eq('bar', await core.callStorm('return($lib.projects.get($proj).epics.get($epic).name)', opts=opts))

synapse/tests/test_model_risk.py

@@ -3,6 +3,7 @@ import logging
 import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.lib.chop as s_chop
+import synapse.lib.time as s_time
 import synapse.tests.utils as s_t_utils
 
 logger = logging.getLogger(__name__)
@@ -325,6 +326,15 @@ class RiskModelTest(s_t_utils.SynTest):
             self.len(1, await core.nodes('risk:alert :service:platform -> inet:service:platform'))
             self.len(1, await core.nodes('risk:alert :service:instance -> inet:service:instance'))
 
+            opts = {'vars': {'ndef': nodes[0].ndef[1]}}
+            nodes = await core.nodes('risk:alert=$ndef [ :updated=20251003 ]', opts=opts)
+            self.len(1, nodes)
+            self.eq(s_time.parse('20251003'), nodes[0].get('updated'))
+
+            self.len(1, await core.nodes('[ risk:alert=({"name": "bazfaz"}) +(about)> {[ file:bytes=* :name=alert.txt]} ]'))
+            self.len(1, fnode := await core.nodes('risk:alert=({"name": "bazfaz"}) -(about)> file:bytes'))
+            self.eq(fnode[0].get('name'), 'alert.txt')
+
             nodes = await core.nodes('''[
                     risk:compromise=*
                     :vector=*
@@ -591,6 +601,7 @@ class RiskModelTest(s_t_utils.SynTest):
                 risk:mitigation=*
                     :vuln=*
                     :name="  FooBar  "
+                    :id="  IDa123  "
                     :type=foo.bar
                     :desc=BazFaz
                     :hardware=*
@@ -603,6 +614,7 @@ class RiskModelTest(s_t_utils.SynTest):
             self.eq('BazFaz', nodes[0].props['desc'])
             self.eq('vertex', nodes[0].get('reporter:name'))
             self.eq('foo.bar.', nodes[0].get('type'))
+            self.eq('IDa123', nodes[0].get('id'))
             self.nn(nodes[0].get('reporter'))
             self.len(1, await core.nodes('risk:mitigation -> risk:vuln'))
             self.len(1, await core.nodes('risk:mitigation -> it:prod:softver'))

synapse/tests/test_model_syn.py

@@ -1,8 +1,9 @@
 import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.cortex as s_cortex
-import synapse.datamodel as s_datamodel
 
+import synapse.lib.time as s_time
+import synapse.lib.version as s_version
 import synapse.lib.stormsvc as s_stormsvc
 
 import synapse.tests.utils as s_t_utils
@@ -42,6 +43,21 @@ class TestService(s_stormsvc.StormSvc):
                     },
                     'storm': '',
                 },
+                {
+                    'name': 'deprvers',
+                    'storm': '',
+                    'deprecated': {'eolvers': 'v3.0.0'},
+                },
+                {
+                    'name': 'deprdate',
+                    'storm': '',
+                    'deprecated': {'eoldate': '2099-01-01'},
+                },
+                {
+                    'name': 'deprmesg',
+                    'storm': '',
+                    'deprecated': {'eoldate': '2099-01-01', 'mesg': 'Please use ``ohhai``.'},
+                },
             )
         },
     )
@@ -683,7 +699,7 @@ class SynModelTest(s_t_utils.SynTest):
 
                 # check that runt nodes for new commands are created
                 nodes = await core.nodes('syn:cmd +:package')
-                self.len(2, nodes)
+                self.len(5, nodes)
 
                 self.eq(nodes[0].ndef, ('syn:cmd', 'foobar'))
                 self.eq(nodes[0].get('doc'), 'foobar is a great service')
@@ -692,6 +708,7 @@ class SynModelTest(s_t_utils.SynTest):
                 self.eq(nodes[0].get('nodedata'), (('foo', 'inet:ipv4'), ('bar', 'inet:fqdn')))
                 self.eq(nodes[0].get('package'), 'foo')
                 self.eq(nodes[0].get('svciden'), iden)
+                self.none(nodes[0].get('deprecated'))
 
                 self.eq(nodes[1].ndef, ('syn:cmd', 'ohhai'))
                 self.eq(nodes[1].get('doc'), 'No description')
@@ -700,6 +717,41 @@ class SynModelTest(s_t_utils.SynTest):
                 self.none(nodes[1].get('nodedata'))
                 self.eq(nodes[1].get('package'), 'foo')
                 self.eq(nodes[1].get('svciden'), iden)
+                self.none(nodes[1].get('deprecated'))
+
+                self.eq(nodes[2].ndef, ('syn:cmd', 'deprvers'))
+                self.true(nodes[2].get('deprecated'))
+                self.eq(nodes[2].get('deprecated:version'), s_version.packVersion(3, 0, 0))
+                self.none(nodes[2].get('deprecated:date'))
+                self.none(nodes[2].get('deprecated:mesg'))
+
+                self.eq(nodes[3].ndef, ('syn:cmd', 'deprdate'))
+                self.true(nodes[3].get('deprecated'))
+                self.none(nodes[3].get('deprecated:version'))
+                self.eq(nodes[3].get('deprecated:date'), s_time.parse('2099-01-01'))
+                self.none(nodes[3].get('deprecated:mesg'))
+
+                self.eq(nodes[4].ndef, ('syn:cmd', 'deprmesg'))
+                self.true(nodes[4].get('deprecated'))
+                self.none(nodes[4].get('deprecated:version'))
+                self.eq(nodes[4].get('deprecated:date'), s_time.parse('2099-01-01'))
+                self.eq(nodes[4].get('deprecated:mesg'), 'Please use ``ohhai``.')
+
+                nodes = await core.nodes('syn:cmd:deprecated')
+                self.len(5, nodes)
+                self.sorteq(['deprvers', 'deprdate', 'deprmesg', 'ps.list', 'ps.kill'], [k.ndef[1] for k in nodes])
+
+                nodes = await core.nodes('syn:cmd:deprecated:version')
+                self.len(3, nodes)
+                self.sorteq(['deprvers', 'ps.list', 'ps.kill'], [k.ndef[1] for k in nodes])
+
+                nodes = await core.nodes('syn:cmd:deprecated:date')
+                self.len(2, nodes)
+                self.sorteq(['deprdate', 'deprmesg'], [k.ndef[1] for k in nodes])
+
+                nodes = await core.nodes('syn:cmd:deprecated:mesg')
+                self.len(3, nodes)
+                self.sorteq(['deprmesg', 'ps.list', 'ps.kill'], [k.ndef[1] for k in nodes])
 
                 # Pivot from cmds to their forms
                 nodes = await core.nodes('syn:cmd=foobar -> *')

synapse/tests/{test_tools_axon2axon.py → test_tools_axon_copy.py}

@@ -1,5 +1,5 @@
 import synapse.tests.utils as s_test
-import synapse.tools.axon2axon as s_axon2axon
+import synapse.tools.axon.copy as s_copy
 
 class Axon2AxonTest(s_test.SynTest):
 
@@ -15,7 +15,7 @@ class Axon2AxonTest(s_test.SynTest):
                 (size, sha256) = await srcaxon.put(b'visi')
 
                 outp = self.getTestOutp()
-                await s_axon2axon.main([srcurl, dsturl], outp=outp)
+                await s_copy.main([srcurl, dsturl], outp=outp)
                 self.true(await dstaxon.has(sha256))
                 outp.expect('Starting transfer at offset: 0')
                 outp.expect('[         0] - e45bbb7e03acacf4d1cca4c16af1ec0c51d777d10e53ed3155bd3d8deb398f3f (4)')
@@ -23,11 +23,11 @@ class Axon2AxonTest(s_test.SynTest):
                 (size, sha256) = await srcaxon.put(b'vertex')
 
                 outp = self.getTestOutp()
-                await s_axon2axon.main([srcurl, dsturl, '--offset', '1'], outp=outp)
+                await s_copy.main([srcurl, dsturl, '--offset', '1'], outp=outp)
                 self.true(await dstaxon.has(sha256))
                 outp.expect('Starting transfer at offset: 1')
                 outp.expect('[         1] - e1b683e26a3aad218df6aa63afe9cf57fdb5dfaf5eb20cddac14305d67f48a02 (6)')
 
                 outp = self.getTestOutp()
-                self.eq(1, await s_axon2axon.main([], outp=outp))
+                self.eq(1, await s_copy.main([], outp=outp))
                 outp.expect('arguments are required:')

synapse/tests/{test_tools_pullfile.py → test_tools_axon_get.py}

@@ -5,7 +5,7 @@ import pathlib
 from unittest import mock
 
 import synapse.tests.utils as s_t_utils
-import synapse.tools.pullfile as s_pullfile
+import synapse.tools.axon.get as s_get
 
 class TestPullFile(s_t_utils.SynTest):
 
@@ -30,13 +30,13 @@ class TestPullFile(s_t_utils.SynTest):
             with self.getTestDir() as wdir:
 
                 outp = self.getTestOutp()
-                self.eq(0, await s_pullfile.main(['-a', axonurl,
+                self.eq(0, await s_get.main(['-a', axonurl,
                                             '-o', wdir,
                                             '-l', testhash,
                                             '-l', nonehash], outp))
                 oldcwd = os.getcwd()
                 os.chdir(wdir)
-                self.eq(0, await s_pullfile.main(['-a', axonurl,
+                self.eq(0, await s_get.main(['-a', axonurl,
                                             '-l', visihash], outp))
 
                 os.chdir(oldcwd)
@@ -52,6 +52,6 @@ class TestPullFile(s_t_utils.SynTest):
                 self.true(outp.expect(f'Fetching {visihash} to file'))
 
                 with mock.patch('synapse.axon.Axon.get', self._getFail):
-                    self.eq(0, await s_pullfile.main(['-a', axonurl,
+                    self.eq(0, await s_get.main(['-a', axonurl,
                                                 '-l', visihash], outp))
                     self.isin('Error: Hit Exception', str(outp))