Skip to content

Upgrade Encryption: Argon2id KDF & Per-Record Salts #1373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Nov 5, 2025
Merged

Upgrade Encryption: Argon2id KDF & Per-Record Salts #1373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cac9f63
Removes redundant base64
madhav165 Oct 30, 2025
f53fcc5
Replace PBKDF2HMAC with Argon2Id encryption
madhav165 Oct 30, 2025
90e4a15
Use Argon2id for key generation in fernet encryption
madhav165 Oct 30, 2025
13e01d3
Add docstring
madhav165 Oct 30, 2025
7c3cccc
Make sso_service use fernet_encryption utl
madhav165 Oct 30, 2025
e0829ca
wip migration script
madhav165 Oct 30, 2025
5bcbd4e
Fix import in alembic script
madhav165 Oct 30, 2025
afc5c6d
Linting fixes
madhav165 Oct 30, 2025
91d9d39
Move encryption from util to service
madhav165 Oct 30, 2025
ed9d321
Add missing docstrings
madhav165 Oct 30, 2025
a2f0ca4
flake8 fixes
madhav165 Oct 30, 2025
17c8ca6
Handle str inputs for encryption_secret
madhav165 Oct 30, 2025
277ceb1
Update alembic down revision number
madhav165 Oct 31, 2025
8fccacf
Fix bandit
crivetimihai Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Containerfile.lite
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ SHELL ["/bin/bash", "-euo", "pipefail", "-c"]

ARG PYTHON_VERSION
ARG ROOTFS_PATH
ARG TARGETPLATFORM
ARG TARGETPLATFORM=linux/amd64
ARG GRPC_PYTHON_BUILD_SYSTEM_OPENSSL='False'

# ----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2658,7 +2658,7 @@ docker-dev:
@$(MAKE) container-build CONTAINER_RUNTIME=docker CONTAINER_FILE=Containerfile

docker:
@$(MAKE) container-build CONTAINER_RUNTIME=docker CONTAINER_FILE=Containerfile
@$(MAKE) container-build CONTAINER_RUNTIME=docker CONTAINER_FILE=Containerfile.lite

docker-prod:
@DOCKER_CONTENT_TRUST=1 $(MAKE) container-build CONTAINER_RUNTIME=docker CONTAINER_FILE=Containerfile.lite
Expand Down
18 changes: 9 additions & 9 deletions mcpgateway/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
)
from mcpgateway.services.a2a_service import A2AAgentError, A2AAgentNameConflictError, A2AAgentNotFoundError, A2AAgentService
from mcpgateway.services.catalog_service import catalog_service
from mcpgateway.services.encryption_service import get_encryption_service
from mcpgateway.services.export_service import ExportError, ExportService
from mcpgateway.services.gateway_service import GatewayConnectionError, GatewayNameConflictError, GatewayNotFoundError, GatewayService, GatewayUrlConflictError
from mcpgateway.services.import_service import ConflictStrategy
Expand All @@ -113,7 +114,6 @@
from mcpgateway.utils.create_jwt_token import create_jwt_token, get_jwt_token
from mcpgateway.utils.error_formatter import ErrorFormatter
from mcpgateway.utils.metadata_capture import MetadataCapture
from mcpgateway.utils.oauth_encryption import get_oauth_encryption
from mcpgateway.utils.pagination import generate_pagination_links
from mcpgateway.utils.passthrough_headers import PassthroughHeadersError
from mcpgateway.utils.retry_manager import ResilientHttpClient
Expand Down Expand Up @@ -6194,7 +6194,7 @@ async def admin_add_gateway(request: Request, db: Session = Depends(get_db), use
oauth_config = json.loads(oauth_config_json)
# Encrypt the client secret if present
if oauth_config and "client_secret" in oauth_config:
encryption = get_oauth_encryption(settings.auth_encryption_secret)
encryption = get_encryption_service(settings.auth_encryption_secret)
oauth_config["client_secret"] = encryption.encrypt_secret(oauth_config["client_secret"])
except (json.JSONDecodeError, ValueError) as e:
LOGGER.error(f"Failed to parse OAuth config: {e}")
Expand Down Expand Up @@ -6231,7 +6231,7 @@ async def admin_add_gateway(request: Request, db: Session = Depends(get_db), use
oauth_config["client_id"] = oauth_client_id
if oauth_client_secret:
# Encrypt the client secret
encryption = get_oauth_encryption(settings.auth_encryption_secret)
encryption = get_encryption_service(settings.auth_encryption_secret)
oauth_config["client_secret"] = encryption.encrypt_secret(oauth_client_secret)

# Add username and password for password grant type
Expand Down Expand Up @@ -6503,7 +6503,7 @@ async def admin_edit_gateway(
oauth_config = json.loads(oauth_config_json)
# Encrypt the client secret if present and not empty
if oauth_config and "client_secret" in oauth_config and oauth_config["client_secret"]:
encryption = get_oauth_encryption(settings.auth_encryption_secret)
encryption = get_encryption_service(settings.auth_encryption_secret)
oauth_config["client_secret"] = encryption.encrypt_secret(oauth_config["client_secret"])
except (json.JSONDecodeError, ValueError) as e:
LOGGER.error(f"Failed to parse OAuth config: {e}")
Expand Down Expand Up @@ -6540,7 +6540,7 @@ async def admin_edit_gateway(
oauth_config["client_id"] = oauth_client_id
if oauth_client_secret:
# Encrypt the client secret
encryption = get_oauth_encryption(settings.auth_encryption_secret)
encryption = get_encryption_service(settings.auth_encryption_secret)
oauth_config["client_secret"] = encryption.encrypt_secret(oauth_client_secret)

# Add username and password for password grant type
Expand Down Expand Up @@ -9571,7 +9571,7 @@ async def admin_add_a2a_agent(
oauth_config = json.loads(oauth_config_json)
# Encrypt the client secret if present
if oauth_config and "client_secret" in oauth_config:
encryption = get_oauth_encryption(settings.auth_encryption_secret)
encryption = get_encryption_service(settings.auth_encryption_secret)
oauth_config["client_secret"] = encryption.encrypt_secret(oauth_config["client_secret"])
except (json.JSONDecodeError, ValueError) as e:
LOGGER.error(f"Failed to parse OAuth config: {e}")
Expand Down Expand Up @@ -9608,7 +9608,7 @@ async def admin_add_a2a_agent(
oauth_config["client_id"] = oauth_client_id
if oauth_client_secret:
# Encrypt the client secret
encryption = get_oauth_encryption(settings.auth_encryption_secret)
encryption = get_encryption_service(settings.auth_encryption_secret)
oauth_config["client_secret"] = encryption.encrypt_secret(oauth_client_secret)

# Add username and password for password grant type
Expand Down Expand Up @@ -9890,7 +9890,7 @@ async def admin_edit_a2a_agent(
oauth_config = json.loads(oauth_config_json)
# Encrypt the client secret if present and not empty
if oauth_config and "client_secret" in oauth_config and oauth_config["client_secret"]:
encryption = get_oauth_encryption(settings.auth_encryption_secret)
encryption = get_encryption_service(settings.auth_encryption_secret)
oauth_config["client_secret"] = encryption.encrypt_secret(oauth_config["client_secret"])
except (json.JSONDecodeError, ValueError) as e:
LOGGER.error(f"Failed to parse OAuth config: {e}")
Expand Down Expand Up @@ -9927,7 +9927,7 @@ async def admin_edit_a2a_agent(
oauth_config["client_id"] = oauth_client_id
if oauth_client_secret:
# Encrypt the client secret
encryption = get_oauth_encryption(settings.auth_encryption_secret)
encryption = get_encryption_service(settings.auth_encryption_secret)
oauth_config["client_secret"] = encryption.encrypt_secret(oauth_client_secret)

# Add username and password for password grant type
Expand Down
Loading
Loading