Skip to content
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

feat: disable the APIKEY authentication in the cloud-agent #1479

Merged
merged 3 commits into from
Dec 13, 2024
Merged

feat: disable the APIKEY authentication in the cloud-agent #1479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
580fec7
feat: disable the APIKEY authentication in the cloud-agent
yshyn-iohk Dec 12, 2024
f0363f8
Merge branch 'main' into feat/1478-disable-apikey-authentication
yshyn-iohk Dec 13, 2024
ede9730
chore: add docker compose backward compatible in e2e and
yshyn-iohk Dec 13, 2024
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
4 changes: 2 additions & 2 deletions cloud-agent/service/server/src/main/resources/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@ agent {
# enabled is used to enable/disable the api key authentication
# if apikey authentication is disabled, the alternative authentication method is used
# if the alternative authentication method is not configured, apikey authentication is disabled the default user is used
enabled = true
enabled = false
enabled = ${?API_KEY_ENABLED}

# authenticateAsDefaultUser is used to authenticate the api key as the default user
# if authenticateAsDefaultUser is disabled, the api key is authenticated to the entity that owns the api key
authenticateAsDefaultUser = false
authenticateAsDefaultUser = true
authenticateAsDefaultUser = ${?API_KEY_AUTHENTICATE_AS_DEFAULT_USER}

# autoProvisioning is used to enable/disable the auto-provisioning logic
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/shared/docker-compose-combined.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ services:
WEBHOOK_PARALLELISM:
ADMIN_TOKEN:
API_KEY_SALT:
API_KEY_ENABLED:
API_KEY_AUTHENTICATE_AS_DEFAULT_USER:
API_KEY_ENABLED: true
API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
API_KEY_AUTO_PROVISIONING:
depends_on:
issuer-db:
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/shared/docker-compose-demo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ services:
DEFAULT_WALLET_SEED:
DEFAULT_WALLET_WEBHOOK_URL:
DEFAULT_WALLET_AUTH_API_KEY:
API_KEY_ENABLED:
API_KEY_ENABLED: true
API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
API_KEY_AUTO_PROVISIONING:
depends_on:
db:
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/shared/docker-compose-mt-keycloak.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ services:
WEBHOOK_PARALLELISM:
ADMIN_TOKEN:
API_KEY_SALT:
API_KEY_ENABLED:
API_KEY_AUTHENTICATE_AS_DEFAULT_USER:
API_KEY_ENABLED: false
API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
API_KEY_AUTO_PROVISIONING:
KEYCLOAK_ENABLED: true
KEYCLOAK_URL: http://keycloak:8080
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/shared/docker-compose-with-kafka.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ services:
WEBHOOK_PARALLELISM:
ADMIN_TOKEN:
API_KEY_SALT:
API_KEY_ENABLED:
API_KEY_AUTHENTICATE_AS_DEFAULT_USER:
API_KEY_ENABLED: true
API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
API_KEY_AUTO_PROVISIONING:
depends_on:
db:
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/shared/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ services:
WEBHOOK_PARALLELISM:
ADMIN_TOKEN:
API_KEY_SALT:
API_KEY_ENABLED:
API_KEY_AUTHENTICATE_AS_DEFAULT_USER:
API_KEY_ENABLED: true
API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
API_KEY_AUTO_PROVISIONING:
depends_on:
db:
Expand Down
3 changes: 2 additions & 1 deletion tests/integration-tests/src/test/resources/containers/agent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ services:
identus-cloud-agent:
image: ghcr.io/hyperledger/identus-cloud-agent:${AGENT_VERSION}
environment:
API_KEY_ENABLED: true
API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
PRISM_NODE_HOST: host.docker.internal
PRISM_NODE_PORT:
CASTOR_DB_HOST: postgres
Expand All @@ -41,7 +43,6 @@ services:
DIDCOMM_SERVICE_URL:
REST_SERVICE_URL:
POLLUX_STATUS_LIST_REGISTRY_PUBLIC_URL:
API_KEY_ENABLED:
STATUS_LIST_SYNC_TRIGGER_RECURRENCE_DELAY: 5 seconds
DID_STATE_SYNC_TRIGGER_RECURRENCE_DELAY: 5 seconds
# Secret storage configuration
Expand Down
Loading