Merge pull request #842 from THS-on/fix-verifier-finish

verifier: do not call finish() twice
keylime · Jan 20, 2022 · a82aad4 · a82aad4
2 parents f3fb006 + d68340a
commit a82aad4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/keylime/cloud_verifier_tornado.py b/keylime/cloud_verifier_tornado.py
@@ -432,6 +432,7 @@ def post(self):
                             VerfierMain).filter_by(agent_id=agent_id).count()
                     except SQLAlchemyError as e:
                         logger.error('SQLAlchemy Error: %s', e)
+                        raise e
 
                     # don't allow overwriting
 
@@ -446,6 +447,7 @@ def post(self):
                             session.commit()
                         except SQLAlchemyError as e:
                             logger.error('SQLAlchemy Error: %s', e)
+                            raise e
 
                         for key in list(exclude_db.keys()):
                             agent_data[key] = exclude_db[key]
@@ -461,8 +463,6 @@ def post(self):
             logger.warning("POST returning 400 response. Exception error: %s", e)
             logger.exception(e)
 
-        self.finish()
-
     def put(self):
         """This method handles the PUT requests to add agents to the Cloud Verifier.
 
@@ -497,6 +497,7 @@ def put(self):
                     agent_id=agent_id, verifier_id=verifier_id).one()
             except SQLAlchemyError as e:
                 logger.error('SQLAlchemy Error: %s', e)
+                raise e
 
             if agent is None:
                 web_util.echo_json_response(self, 404, "agent id not found")
@@ -529,7 +530,6 @@ def put(self):
             web_util.echo_json_response(self, 400, "Exception error: %s" % e)
             logger.warning("PUT returning 400 response. Exception error: %s", e)
             logger.exception(e)
-        self.finish()
 
     def data_received(self, chunk):
         raise NotImplementedError()