From df7cd5342959014a80d733b51053b56350dfefd8 Mon Sep 17 00:00:00 2001 From: Brian Thorne Date: Tue, 23 Mar 2021 11:56:35 +1300 Subject: [PATCH] Remove the keyed hash function for transforming block names --- .../d9e07ea2889e_add_run_secret_column.py | 28 ------------------- backend/entityservice/database/insertions.py | 8 +++--- .../entityservice/database/models/models.py | 1 - backend/entityservice/encoding_storage.py | 4 +-- backend/entityservice/models/run.py | 3 +- 5 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 backend/alembic/versions/d9e07ea2889e_add_run_secret_column.py diff --git a/backend/alembic/versions/d9e07ea2889e_add_run_secret_column.py b/backend/alembic/versions/d9e07ea2889e_add_run_secret_column.py deleted file mode 100644 index b42683c5..00000000 --- a/backend/alembic/versions/d9e07ea2889e_add_run_secret_column.py +++ /dev/null @@ -1,28 +0,0 @@ -"""Add run secret column - -Revision ID: d9e07ea2889e -Revises: e321799791b7 -Create Date: 2021-03-23 09:17:21.522314 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'd9e07ea2889e' -down_revision = 'e321799791b7' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('runs', sa.Column('secret', sa.CHAR(length=48), nullable=True)) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('runs', 'secret') - # ### end Alembic commands ### diff --git a/backend/entityservice/database/insertions.py b/backend/entityservice/database/insertions.py index a0960f62..1d2eb781 100644 --- a/backend/entityservice/database/insertions.py +++ b/backend/entityservice/database/insertions.py @@ -22,17 +22,17 @@ def insert_new_project(cur, result_type, schema, access_token, project_id, num_p result_type, uses_blocking]) -def insert_new_run(db, run_id, project_id, threshold, name, type, notes='', secret=''): +def insert_new_run(db, run_id, project_id, threshold, name, type, notes=''): sql_query = """ INSERT INTO runs - (run_id, project, name, notes, threshold, state, type, secret) + (run_id, project, name, notes, threshold, state, type) VALUES - (%s, %s, %s, %s, %s, %s, %s, %s) + (%s, %s, %s, %s, %s, %s, %s) RETURNING run_id; """ with db.cursor() as cur: run_id = execute_returning_id(cur, sql_query, - [run_id, project_id, name, notes, threshold, 'created', type, secret]) + [run_id, project_id, name, notes, threshold, 'created', type]) return run_id diff --git a/backend/entityservice/database/models/models.py b/backend/entityservice/database/models/models.py index a27d395c..a22a3f9d 100644 --- a/backend/entityservice/database/models/models.py +++ b/backend/entityservice/database/models/models.py @@ -77,7 +77,6 @@ class Run(Base): id = Column(Integer, primary_key=True) run_id = Column(CHAR(48), nullable=False, unique=True) - secret = Column(CHAR(48), nullable=True) project = Column(ForeignKey('projects.project_id', ondelete='CASCADE')) name = Column(Text) notes = Column(Text) diff --git a/backend/entityservice/encoding_storage.py b/backend/entityservice/encoding_storage.py index 4ac7c15a..238485af 100644 --- a/backend/entityservice/encoding_storage.py +++ b/backend/entityservice/encoding_storage.py @@ -235,8 +235,8 @@ def encoding_iterator(filter_stream): return encoding_iterator(stream) -def hash_block_name(provided_block_name, key=b'pseudorandom key stored in run table'): - block_hmac_instance = blake2b(key=key, digest_size=32) +def hash_block_name(provided_block_name): + block_hmac_instance = blake2b(digest_size=32) block_hmac_instance.update(str(provided_block_name).encode()) provided_block_name = block_hmac_instance.hexdigest() return provided_block_name diff --git a/backend/entityservice/models/run.py b/backend/entityservice/models/run.py index 30b41dc2..3b684a9b 100644 --- a/backend/entityservice/models/run.py +++ b/backend/entityservice/models/run.py @@ -62,7 +62,6 @@ def __init__(self, project_id, threshold, name, notes): self.notes = notes self.threshold = threshold self.run_id = generate_code() - self.secret = generate_code() logger.info("Created run id", rid=self.run_id) with DBConn() as conn: @@ -86,5 +85,5 @@ def from_json(data, project_id): def save(self, conn): logger.debug("Saving run in database", rid=self.run_id) db.insert_new_run(db=conn, run_id=self.run_id, project_id=self.project_id, threshold=self.threshold, - name=self.name, notes=self.notes, type=self.type, secret=self.secret) + name=self.name, notes=self.notes, type=self.type) logger.debug("New run created in DB", rid=self.run_id)