Status codes oh my

Author: vEpiphyte

synapse/lib/aha.py

@@ -79,12 +79,9 @@ async def post(self):
             url = await self.cell.addAhaSvcProv(name, provinfo=provinfo)
         except asyncio.CancelledError:  # pragma: no cover
             raise
-        except s_exc.SynErr as e:
-            logger.exception(f'Error provisioning {name}')
-            return self.sendRestErr(e.__class__.__name__, e.get('mesg', str(e)))
-        except Exception as e:  # pragma: no cover
+        except Exception as e:
             logger.exception(f'Error provisioning {name}')
-            return self.sendRestErr(e.__class__.__name__, str(e))
+            return self.sendRestExc(e, status_code=400)
         return self.sendRestRetn({'url': url})
 
 _getAhaSvcSchema = {

synapse/lib/httpapi.py

@@ -1020,12 +1020,12 @@ async def post(self):
 
         name = body.get('name')
         if name is None:
-            self.sendRestErr('MissingField', 'The adduser API requires a "name" argument.')
+            self.sendRestErr('MissingField', 'The adduser API requires a "name" argument.', status_code=400)
             return
 
         authcell = self.getAuthCell()
         if await authcell.getUserDefByName(name) is not None:
-            self.sendRestErr('DupUser', f'A user named {name} already exists.')
+            self.sendRestErr('DupUser', f'A user named {name} already exists.',  status_code=400)
             return
 
         udef = await authcell.addUser(name=name)
@@ -1276,7 +1276,7 @@ async def post(self):
 
         view = self.cell.getView(body.get('view'), user)
         if view is None:
-            return self.sendRestErr('NoSuchView', 'The specified view does not exist.', status_code=400)
+            return self.sendRestErr('NoSuchView', 'The specified view does not exist.', status_code=404)
 
         wlyr = view.layers[0]
         perm = ('feed:data', *name.split('.'))
@@ -1298,7 +1298,7 @@ async def post(self):
             return self.sendRestRetn(None)
 
         except Exception as e:  # pragma: no cover
-            return self.sendRestExc(e)
+            return self.sendRestExc(e, status_code=400)
 
 class CoreInfoV1(Handler):
     '''

synapse/tests/test_cortex.py

@@ -1193,6 +1193,7 @@ async def test_cortex_callstorm(self):
 
                 body = {'query': 'return (asdf)'}
                 async with sess.get(f'https://localhost:{port}/api/v1/storm/call', json=body) as resp:
+                    self.eq(resp.status, 200)
                     retn = await resp.json()
                     self.eq('ok', retn.get('status'))
                     self.eq('asdf', retn['result'])
@@ -7415,8 +7416,7 @@ async def test_cortex_export(self):
             async with self.getHttpSess(port=port, auth=('root', 'secret')) as sess:
 
                 resp = await sess.post(f'https://localhost:{port}/api/v1/storm/export')
-                self.eq(200, resp.status)
-
+                self.eq(400, resp.status)
                 reply = await resp.json()
                 self.eq('err', reply.get('status'))
                 self.eq('SchemaViolation', reply.get('code'))
@@ -7426,6 +7426,7 @@ async def test_cortex_export(self):
                     'opts': {'scrub': {'include': {'tags': ('visi',)}}},
                 }
                 resp = await sess.post(f'https://localhost:{port}/api/v1/storm/export', json=body)
+                self.eq(resp.status, 200)
                 byts = await resp.read()
 
                 podes = [i[1] for i in s_msgpack.Unpk().feed(byts)]
@@ -7443,6 +7444,7 @@ async def test_cortex_export(self):
                 body = {'query': 'inet:ipv4=asdfasdf'}
                 resp = await sess.post(f'https://localhost:{port}/api/v1/storm/export', json=body)
                 retval = await resp.json()
+                self.eq(resp.status, 400)
                 self.eq('err', retval['status'])
                 self.eq('BadTypeValu', retval['code'])
 

synapse/tests/test_lib_aha.py

@@ -304,6 +304,7 @@ async def test_lib_aha_basics(self):
 
             async with self.getHttpSess(auth=('root', 'secret'), port=httpsport) as sess:
                 async with sess.get(svcsurl) as resp:
+                    self.eq(resp.status, 200)
                     info = await resp.json()
                     self.eq(info.get('status'), 'ok')
                     result = info.get('result')
@@ -312,6 +313,7 @@ async def test_lib_aha_basics(self):
                             {svcinfo.get('name') for svcinfo in result})
 
                 async with sess.get(svcsurl, json={'network': 'synapse'}) as resp:
+                    self.eq(resp.status, 200)
                     info = await resp.json()
                     self.eq(info.get('status'), 'ok')
                     result = info.get('result')
@@ -320,25 +322,29 @@ async def test_lib_aha_basics(self):
                             {svcinfo.get('name') for svcinfo in result})
 
                 async with sess.get(svcsurl, json={'network': 'newp'}) as resp:
+                    self.eq(resp.status, 200)
                     info = await resp.json()
                     self.eq(info.get('status'), 'ok')
                     result = info.get('result')
                     self.len(0, result)
 
                 # Sad path
                 async with sess.get(svcsurl, json={'newp': 'hehe'}) as resp:
+                    self.eq(resp.status, 400)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
 
                 async with sess.get(svcsurl, json={'network': 'mynet', 'newp': 'hehe'}) as resp:
+                    self.eq(resp.status, 400)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
 
             # Sad path
             async with self.getHttpSess(auth=('lowuser', 'lowuser'), port=httpsport) as sess:
                 async with sess.get(svcsurl) as resp:
+                    self.eq(resp.status, 403)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'AuthDeny')
@@ -877,6 +883,7 @@ async def test_aha_httpapi(self):
             async with self.getHttpSess(auth=('root', 'secret'), port=httpsport) as sess:
                 # Simple request works
                 async with sess.post(url, json={'name': '00.foosvc'}) as resp:
+                    self.eq(resp.status, 200)
                     info = await resp.json()
                     self.eq(info.get('status'), 'ok')
                     result = info.get('result')
@@ -904,6 +911,7 @@ async def test_aha_httpapi(self):
                         }
                         }
                 async with sess.post(url, json=data) as resp:
+                    self.eq(resp.status, 200)
                     info = await resp.json()
                     self.eq(info.get('status'), 'ok')
                     result = info.get('result')
@@ -919,30 +927,37 @@ async def test_aha_httpapi(self):
 
                 # Sad path
                 async with sess.post(url) as resp:
+                    self.eq(resp.status, 400)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
                 async with sess.post(url, json={}) as resp:
+                    self.eq(resp.status, 400)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
                 async with sess.post(url, json={'name': 1234}) as resp:
+                    self.eq(resp.status, 400)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
                 async with sess.post(url, json={'name': ''}) as resp:
+                    self.eq(resp.status, 400)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
                 async with sess.post(url, json={'name': '00.newp', 'provinfo': 5309}) as resp:
+                    self.eq(resp.status, 400)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
                 async with sess.post(url, json={'name': '00.newp', 'provinfo': {'dmon:port': -1}}) as resp:
+                    self.eq(resp.status, 400)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
                 async with sess.post(url, json={'name': 'doom' * 16}) as resp:
+                    self.eq(resp.status, 400)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'BadArg')
@@ -951,6 +966,7 @@ async def test_aha_httpapi(self):
             await aha.addUser('lowuser', passwd='lowuser')
             async with self.getHttpSess(auth=('lowuser', 'lowuser'), port=httpsport) as sess:
                 async with sess.post(url, json={'name': '00.newp'}) as resp:
+                    self.eq(resp.status, 403)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'AuthDeny')