fix: merge main, address code review feedback for security fix PR #816
- Merge origin/main into branch (resolve conflict in integrations_dashboard.html) - Add defensive JSON parsing with try/except for integration.config - Wrap tester() call in try/except to prevent 500 errors from bad config - Add i18n key integrations.connection_test_failed_fallback in en.json - Reference i18n key in template JS fallback message - Update SECURITY_AUDIT.md: add fix date (2026-03-23), update doc date - Remove accidental revert.sh file - Fix missing MagicMock/patch imports in test file - Add tests for invalid JSON config and tester exception error paths Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com> Agent-Logs-Url: https://github.com/christianlouis/DocuElevate/sessions/daebb70e-059a-4601-8864-88eef49f99cf
This commit is contained in:
copilot-swe-agent[bot]
@@ -24,7 +24,10 @@ from app.models import ( # noqa: F401
|
||||
ApplicationSettings,
|
||||
AuditLog,
|
||||
BackupRecord,
|
||||
ClassificationRuleModel,
|
||||
ComplianceTemplate,
|
||||
DocumentAnnotation,
|
||||
DocumentComment,
|
||||
DocumentMetadata,
|
||||
FileProcessingStep,
|
||||
FileRecord,
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
"""${message}
|
||||
|
||||
Revision ID: ${up_revision}
|
||||
Revises: ${down_revision | comma,n}
|
||||
Create Date: ${create_date}
|
||||
|
||||
"""
|
||||
|
||||
from typing import Union
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = ${repr(up_revision)}
|
||||
down_revision: Union[str, None] = ${repr(down_revision)}
|
||||
depends_on: Union[str, None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""${message}."""
|
||||
# Use ``op.batch_alter_table()`` for SQLite compatibility.
|
||||
# Always check whether the table/column already exists before altering
|
||||
# to keep migrations idempotent (safe to re-run).
|
||||
#
|
||||
# Example – add a column only if it is missing:
|
||||
#
|
||||
# conn = op.get_bind()
|
||||
# inspector = sa.inspect(conn)
|
||||
# if "my_table" in inspector.get_table_names():
|
||||
# existing = {c["name"] for c in inspector.get_columns("my_table")}
|
||||
# if "new_col" not in existing:
|
||||
# with op.batch_alter_table("my_table") as batch_op:
|
||||
# batch_op.add_column(sa.Column("new_col", sa.String(128), nullable=True))
|
||||
${upgrades if upgrades else "pass"}
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""Reverse ${message}."""
|
||||
${downgrades if downgrades else "pass"}
|
||||
@@ -0,0 +1,70 @@
|
||||
"""Add document translation fields to files and user_profiles tables.
|
||||
|
||||
Adds detected_language, default_language_text, and default_language_code to
|
||||
the files table so that a translated version of the document text can be
|
||||
stored alongside the original.
|
||||
|
||||
Adds default_document_language to user_profiles so each user can override
|
||||
the system-wide default translation target language.
|
||||
|
||||
Revision ID: 036_add_document_translation_fields
|
||||
Revises: 035_add_routing_rules
|
||||
Create Date: 2026-03-16
|
||||
"""
|
||||
|
||||
from typing import Union
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
|
||||
revision: str = "036_add_document_translation_fields"
|
||||
down_revision: Union[str, None] = "035_add_routing_rules"
|
||||
depends_on: Union[str, None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""Add translation columns to files and user_profiles."""
|
||||
conn = op.get_bind()
|
||||
inspector = sa.inspect(conn)
|
||||
|
||||
if "files" in inspector.get_table_names():
|
||||
existing_file_cols = {col["name"] for col in inspector.get_columns("files")}
|
||||
cols_to_add = {"detected_language", "default_language_text", "default_language_code"} - existing_file_cols
|
||||
if cols_to_add:
|
||||
with op.batch_alter_table("files") as batch_op:
|
||||
if "detected_language" in cols_to_add:
|
||||
batch_op.add_column(sa.Column("detected_language", sa.String(10), nullable=True))
|
||||
if "default_language_text" in cols_to_add:
|
||||
batch_op.add_column(sa.Column("default_language_text", sa.Text(), nullable=True))
|
||||
if "default_language_code" in cols_to_add:
|
||||
batch_op.add_column(sa.Column("default_language_code", sa.String(10), nullable=True))
|
||||
|
||||
if "user_profiles" in inspector.get_table_names():
|
||||
existing_profile_cols = {col["name"] for col in inspector.get_columns("user_profiles")}
|
||||
if "default_document_language" not in existing_profile_cols:
|
||||
with op.batch_alter_table("user_profiles") as batch_op:
|
||||
batch_op.add_column(sa.Column("default_document_language", sa.String(10), nullable=True))
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""Remove translation columns."""
|
||||
conn = op.get_bind()
|
||||
inspector = sa.inspect(conn)
|
||||
|
||||
if "user_profiles" in inspector.get_table_names():
|
||||
existing_profile_cols = {col["name"] for col in inspector.get_columns("user_profiles")}
|
||||
if "default_document_language" in existing_profile_cols:
|
||||
with op.batch_alter_table("user_profiles") as batch_op:
|
||||
batch_op.drop_column("default_document_language")
|
||||
|
||||
if "files" in inspector.get_table_names():
|
||||
existing_file_cols = {col["name"] for col in inspector.get_columns("files")}
|
||||
cols_to_drop = {"detected_language", "default_language_text", "default_language_code"} & existing_file_cols
|
||||
if cols_to_drop:
|
||||
with op.batch_alter_table("files") as batch_op:
|
||||
if "default_language_code" in cols_to_drop:
|
||||
batch_op.drop_column("default_language_code")
|
||||
if "default_language_text" in cols_to_drop:
|
||||
batch_op.drop_column("default_language_text")
|
||||
if "detected_language" in cols_to_drop:
|
||||
batch_op.drop_column("detected_language")
|
||||
@@ -0,0 +1,72 @@
|
||||
"""Add user_sessions and qr_login_challenges tables.
|
||||
|
||||
Adds server-side session tracking (user_sessions) for the "log off
|
||||
everywhere" feature and per-session revocation, and QR login challenges
|
||||
(qr_login_challenges) for secure mobile app authentication via QR code.
|
||||
|
||||
Revision ID: 037_add_user_sessions_and_qr_challenges
|
||||
Revises: 036_add_document_translation_fields
|
||||
Create Date: 2026-03-16
|
||||
"""
|
||||
|
||||
from typing import Union
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
|
||||
revision: str = "037_add_user_sessions_and_qr_challenges"
|
||||
down_revision: Union[str, None] = "036_add_document_translation_fields"
|
||||
depends_on: Union[str, None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""Create user_sessions and qr_login_challenges tables."""
|
||||
conn = op.get_bind()
|
||||
inspector = sa.inspect(conn)
|
||||
existing_tables = set(inspector.get_table_names())
|
||||
|
||||
if "user_sessions" not in existing_tables:
|
||||
op.create_table(
|
||||
"user_sessions",
|
||||
sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
|
||||
sa.Column("session_token", sa.String(128), nullable=False, unique=True, index=True),
|
||||
sa.Column("user_id", sa.String(), nullable=False, index=True),
|
||||
sa.Column("ip_address", sa.String(45), nullable=True),
|
||||
sa.Column("user_agent", sa.String(512), nullable=True),
|
||||
sa.Column("device_info", sa.String(255), nullable=True),
|
||||
sa.Column("is_revoked", sa.Boolean(), nullable=False, server_default="0"),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
||||
sa.Column("last_active_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
||||
sa.Column("expires_at", sa.DateTime(timezone=True), nullable=False),
|
||||
sa.Column("revoked_at", sa.DateTime(timezone=True), nullable=True),
|
||||
)
|
||||
|
||||
if "qr_login_challenges" not in existing_tables:
|
||||
op.create_table(
|
||||
"qr_login_challenges",
|
||||
sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
|
||||
sa.Column("challenge_token", sa.String(128), nullable=False, unique=True, index=True),
|
||||
sa.Column("user_id", sa.String(), nullable=False, index=True),
|
||||
sa.Column("is_claimed", sa.Boolean(), nullable=False, server_default="0"),
|
||||
sa.Column("is_cancelled", sa.Boolean(), nullable=False, server_default="0"),
|
||||
sa.Column("created_by_ip", sa.String(45), nullable=True),
|
||||
sa.Column("claimed_by_ip", sa.String(45), nullable=True),
|
||||
sa.Column("device_name", sa.String(255), nullable=True),
|
||||
sa.Column("issued_token_id", sa.Integer(), nullable=True),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
||||
sa.Column("expires_at", sa.DateTime(timezone=True), nullable=False),
|
||||
sa.Column("claimed_at", sa.DateTime(timezone=True), nullable=True),
|
||||
)
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""Drop user_sessions and qr_login_challenges tables."""
|
||||
conn = op.get_bind()
|
||||
inspector = sa.inspect(conn)
|
||||
existing_tables = set(inspector.get_table_names())
|
||||
|
||||
if "qr_login_challenges" in existing_tables:
|
||||
op.drop_table("qr_login_challenges")
|
||||
|
||||
if "user_sessions" in existing_tables:
|
||||
op.drop_table("user_sessions")
|
||||
@@ -0,0 +1,43 @@
|
||||
"""Add expires_at column to api_tokens table.
|
||||
|
||||
Allows API tokens to be issued with an optional lifetime. If ``expires_at``
|
||||
is set, the token is automatically rejected after that timestamp.
|
||||
|
||||
Revision ID: 038_add_api_token_expires_at
|
||||
Revises: 037_add_user_sessions_and_qr_challenges
|
||||
Create Date: 2026-03-18
|
||||
"""
|
||||
|
||||
from typing import Union
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
|
||||
revision: str = "038_add_api_token_expires_at"
|
||||
down_revision: Union[str, None] = "037_add_user_sessions_and_qr_challenges"
|
||||
depends_on: Union[str, None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""Add expires_at column to api_tokens (idempotent)."""
|
||||
conn = op.get_bind()
|
||||
inspector = sa.inspect(conn)
|
||||
if "api_tokens" not in inspector.get_table_names():
|
||||
return
|
||||
existing_columns = {col["name"] for col in inspector.get_columns("api_tokens")}
|
||||
if "expires_at" not in existing_columns:
|
||||
op.add_column(
|
||||
"api_tokens",
|
||||
sa.Column("expires_at", sa.DateTime(timezone=True), nullable=True),
|
||||
)
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""Remove expires_at column from api_tokens."""
|
||||
conn = op.get_bind()
|
||||
inspector = sa.inspect(conn)
|
||||
if "api_tokens" not in inspector.get_table_names():
|
||||
return
|
||||
existing_columns = {col["name"] for col in inspector.get_columns("api_tokens")}
|
||||
if "expires_at" in existing_columns:
|
||||
op.drop_column("api_tokens", "expires_at")
|
||||
@@ -0,0 +1,46 @@
|
||||
"""Add classification_rules table for custom document classification rules.
|
||||
|
||||
Revision ID: 039_add_classification_rules
|
||||
Revises: 038_add_api_token_expires_at
|
||||
Create Date: 2026-03-17
|
||||
"""
|
||||
|
||||
from typing import Union
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
|
||||
revision: str = "039_add_classification_rules"
|
||||
down_revision: Union[str, None] = "038_add_api_token_expires_at"
|
||||
depends_on: Union[str, None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""Create classification_rules table."""
|
||||
op.create_table(
|
||||
"classification_rules",
|
||||
sa.Column("id", sa.Integer(), nullable=False),
|
||||
sa.Column("owner_id", sa.String(), nullable=True),
|
||||
sa.Column("name", sa.String(255), nullable=False),
|
||||
sa.Column("category", sa.String(100), nullable=False),
|
||||
sa.Column("rule_type", sa.String(50), nullable=False),
|
||||
sa.Column("pattern", sa.String(1000), nullable=False),
|
||||
sa.Column("priority", sa.Integer(), nullable=False, server_default="0"),
|
||||
sa.Column("case_sensitive", sa.Boolean(), nullable=False, server_default="0"),
|
||||
sa.Column("enabled", sa.Boolean(), nullable=False, server_default="1"),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
||||
sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
||||
sa.PrimaryKeyConstraint("id"),
|
||||
sa.UniqueConstraint("owner_id", "name", name="uq_classification_rules_owner_name"),
|
||||
)
|
||||
op.create_index("ix_classification_rules_id", "classification_rules", ["id"])
|
||||
op.create_index("ix_classification_rules_owner_id", "classification_rules", ["owner_id"])
|
||||
op.create_index("ix_classification_rules_category", "classification_rules", ["category"])
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""Drop classification_rules table."""
|
||||
op.drop_index("ix_classification_rules_category", "classification_rules")
|
||||
op.drop_index("ix_classification_rules_owner_id", "classification_rules")
|
||||
op.drop_index("ix_classification_rules_id", "classification_rules")
|
||||
op.drop_table("classification_rules")
|
||||
@@ -0,0 +1,39 @@
|
||||
"""Add automation_hooks table for Zapier / Make.com webhook subscriptions.
|
||||
|
||||
Revision ID: 040_add_automation_hooks
|
||||
Revises: 039_add_classification_rules
|
||||
Create Date: 2026-03-09
|
||||
"""
|
||||
|
||||
from typing import Union
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
|
||||
revision: str = "040_add_automation_hooks"
|
||||
down_revision: Union[str, None] = "039_add_classification_rules"
|
||||
depends_on: Union[str, None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""Create automation_hooks table."""
|
||||
op.create_table(
|
||||
"automation_hooks",
|
||||
sa.Column("id", sa.Integer(), nullable=False),
|
||||
sa.Column("target_url", sa.String(), nullable=False),
|
||||
sa.Column("secret", sa.String(), nullable=True),
|
||||
sa.Column("events", sa.Text(), nullable=False),
|
||||
sa.Column("is_active", sa.Boolean(), nullable=False, server_default="1"),
|
||||
sa.Column("hook_type", sa.String(50), nullable=False, server_default="generic"),
|
||||
sa.Column("description", sa.String(), nullable=True),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
||||
sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
||||
sa.PrimaryKeyConstraint("id"),
|
||||
)
|
||||
op.create_index("ix_automation_hooks_id", "automation_hooks", ["id"])
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""Drop automation_hooks table."""
|
||||
op.drop_index("ix_automation_hooks_id", "automation_hooks")
|
||||
op.drop_table("automation_hooks")
|
||||
@@ -0,0 +1,88 @@
|
||||
"""Add document_comments and document_annotations tables.
|
||||
|
||||
Revision ID: 041_add_document_comments_and_annotations
|
||||
Revises: 040_add_automation_hooks
|
||||
Create Date: 2026-03-21
|
||||
|
||||
"""
|
||||
|
||||
from typing import Union
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = "041_add_document_comments_and_annotations"
|
||||
down_revision: Union[str, None] = "040_add_automation_hooks"
|
||||
depends_on: Union[str, None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""Add document_comments and document_annotations tables."""
|
||||
conn = op.get_bind()
|
||||
inspector = sa.inspect(conn)
|
||||
existing_tables = set(inspector.get_table_names())
|
||||
|
||||
if "document_comments" not in existing_tables:
|
||||
op.create_table(
|
||||
"document_comments",
|
||||
sa.Column("id", sa.Integer(), nullable=False),
|
||||
sa.Column("file_id", sa.Integer(), nullable=False),
|
||||
sa.Column("user_id", sa.String(), nullable=False),
|
||||
sa.Column("parent_id", sa.Integer(), nullable=True),
|
||||
sa.Column("body", sa.Text(), nullable=False),
|
||||
sa.Column("mentions", sa.Text(), nullable=True),
|
||||
sa.Column("is_resolved", sa.Boolean(), nullable=False, server_default="0"),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
||||
sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.func.now(), onupdate=sa.func.now()),
|
||||
sa.ForeignKeyConstraint(["file_id"], ["files.id"]),
|
||||
sa.ForeignKeyConstraint(["parent_id"], ["document_comments.id"]),
|
||||
sa.PrimaryKeyConstraint("id"),
|
||||
)
|
||||
op.create_index("ix_document_comments_id", "document_comments", ["id"])
|
||||
op.create_index("ix_document_comments_file_id", "document_comments", ["file_id"])
|
||||
op.create_index("ix_document_comments_user_id", "document_comments", ["user_id"])
|
||||
op.create_index("ix_document_comments_parent_id", "document_comments", ["parent_id"])
|
||||
|
||||
if "document_annotations" not in existing_tables:
|
||||
op.create_table(
|
||||
"document_annotations",
|
||||
sa.Column("id", sa.Integer(), nullable=False),
|
||||
sa.Column("file_id", sa.Integer(), nullable=False),
|
||||
sa.Column("user_id", sa.String(), nullable=False),
|
||||
sa.Column("page", sa.Integer(), nullable=False),
|
||||
sa.Column("x", sa.Float(), nullable=False),
|
||||
sa.Column("y", sa.Float(), nullable=False),
|
||||
sa.Column("width", sa.Float(), nullable=False),
|
||||
sa.Column("height", sa.Float(), nullable=False),
|
||||
sa.Column("content", sa.Text(), nullable=False),
|
||||
sa.Column("annotation_type", sa.String(50), nullable=False, server_default="note"),
|
||||
sa.Column("color", sa.String(20), nullable=True),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
||||
sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.func.now(), onupdate=sa.func.now()),
|
||||
sa.ForeignKeyConstraint(["file_id"], ["files.id"]),
|
||||
sa.PrimaryKeyConstraint("id"),
|
||||
)
|
||||
op.create_index("ix_document_annotations_id", "document_annotations", ["id"])
|
||||
op.create_index("ix_document_annotations_file_id", "document_annotations", ["file_id"])
|
||||
op.create_index("ix_document_annotations_user_id", "document_annotations", ["user_id"])
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""Drop document_comments and document_annotations tables."""
|
||||
conn = op.get_bind()
|
||||
inspector = sa.inspect(conn)
|
||||
existing_tables = set(inspector.get_table_names())
|
||||
|
||||
if "document_annotations" in existing_tables:
|
||||
op.drop_index("ix_document_annotations_user_id", "document_annotations")
|
||||
op.drop_index("ix_document_annotations_file_id", "document_annotations")
|
||||
op.drop_index("ix_document_annotations_id", "document_annotations")
|
||||
op.drop_table("document_annotations")
|
||||
|
||||
if "document_comments" in existing_tables:
|
||||
op.drop_index("ix_document_comments_parent_id", "document_comments")
|
||||
op.drop_index("ix_document_comments_user_id", "document_comments")
|
||||
op.drop_index("ix_document_comments_file_id", "document_comments")
|
||||
op.drop_index("ix_document_comments_id", "document_comments")
|
||||
op.drop_table("document_comments")
|
||||
@@ -0,0 +1,58 @@
|
||||
"""Add file_shares table for per-user document sharing and role-based access.
|
||||
|
||||
Revision ID: 042_add_file_shares
|
||||
Revises: 041_add_document_comments_and_annotations
|
||||
Create Date: 2026-03-22
|
||||
|
||||
"""
|
||||
|
||||
from typing import Union
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = "042_add_file_shares"
|
||||
down_revision: Union[str, None] = "041_add_document_comments_and_annotations"
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""Create file_shares table."""
|
||||
conn = op.get_bind()
|
||||
inspector = sa.inspect(conn)
|
||||
existing_tables = set(inspector.get_table_names())
|
||||
|
||||
if "file_shares" not in existing_tables:
|
||||
op.create_table(
|
||||
"file_shares",
|
||||
sa.Column("id", sa.Integer(), nullable=False),
|
||||
sa.Column("file_id", sa.Integer(), nullable=False),
|
||||
sa.Column("owner_id", sa.String(), nullable=False),
|
||||
sa.Column("shared_with_user_id", sa.String(), nullable=False),
|
||||
sa.Column("role", sa.String(20), nullable=False, server_default="viewer"),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
||||
sa.Column(
|
||||
"updated_at",
|
||||
sa.DateTime(timezone=True),
|
||||
server_default=sa.func.now(),
|
||||
onupdate=sa.func.now(),
|
||||
),
|
||||
sa.ForeignKeyConstraint(["file_id"], ["files.id"]),
|
||||
sa.PrimaryKeyConstraint("id"),
|
||||
sa.UniqueConstraint("file_id", "shared_with_user_id", name="uq_file_share_file_user"),
|
||||
)
|
||||
op.create_index("ix_file_shares_id", "file_shares", ["id"])
|
||||
op.create_index("ix_file_shares_file_id", "file_shares", ["file_id"])
|
||||
op.create_index("ix_file_shares_owner_id", "file_shares", ["owner_id"])
|
||||
op.create_index("ix_file_shares_shared_with_user_id", "file_shares", ["shared_with_user_id"])
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""Drop file_shares table."""
|
||||
op.drop_index("ix_file_shares_shared_with_user_id", table_name="file_shares")
|
||||
op.drop_index("ix_file_shares_owner_id", table_name="file_shares")
|
||||
op.drop_index("ix_file_shares_file_id", table_name="file_shares")
|
||||
op.drop_index("ix_file_shares_id", table_name="file_shares")
|
||||
op.drop_table("file_shares")
|
||||
Reference in New Issue
Block a user