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: activate JTI Validation #366

Merged
merged 1 commit into from
Oct 24, 2024
Merged

feat: activate JTI Validation #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions deployment/modules/identity-hub/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ resource "kubernetes_config_map" "identityhub-config" {
EDC_SQL_SCHEMA_AUTOCREATE = true
EDC_STS_ACCOUNT_API_URL = var.sts-accounts-api-url
EDC_STS_ACCOUNTS_API_AUTH_HEADER_VALUE = "password"
EDC_IAM_ACCESSTOKEN_JTI_VALIDATION = true
}
}

Expand Down
33 changes: 9 additions & 24 deletions deployment/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ module "provider-identityhub" {
namespace = kubernetes_namespace.ns.metadata.0.name

database = {
user = "identityhub"
password = "identityhub"
url = "jdbc:postgresql://${module.provider-postgres.database-url}/identityhub"
user = "identity"
password = "identity"
url = "jdbc:postgresql://${module.provider-postgres.database-url}/identity"
}
sts-accounts-api-url = module.provider-sts.sts-accounts-url
}
Expand All @@ -70,9 +70,9 @@ module "provider-sts" {
humanReadableName = "provider-sts"
namespace = kubernetes_namespace.ns.metadata.0.name
database = {
user = "sts"
password = "sts"
url = "jdbc:postgresql://${module.provider-postgres.database-url}/sts"
user = "identity"
password = "identity"
url = "jdbc:postgresql://${module.provider-postgres.database-url}/identity"
}
vault-url = "http://provider-vault:8200"
}
Expand Down Expand Up @@ -109,7 +109,6 @@ module "provider-postgres" {
kubernetes_config_map.postgres-initdb-config-pqna.metadata[0].name,
kubernetes_config_map.postgres-initdb-config-pm.metadata[0].name,
kubernetes_config_map.postgres-initdb-config-ih.metadata[0].name,
kubernetes_config_map.postgres-initdb-config-sts.metadata[0].name
]
namespace = kubernetes_namespace.ns.metadata.0.name
}
Expand Down Expand Up @@ -166,23 +165,9 @@ resource "kubernetes_config_map" "postgres-initdb-config-ih" {
}
data = {
"ih-initdb-config.sql" = <<-EOT
CREATE USER identityhub WITH ENCRYPTED PASSWORD 'identityhub' SUPERUSER;
CREATE DATABASE identityhub;
\c identityhub
EOT
}
}

resource "kubernetes_config_map" "postgres-initdb-config-sts" {
metadata {
name = "sts-initdb-config"
namespace = kubernetes_namespace.ns.metadata.0.name
}
data = {
"sts-initdb-config.sql" = <<-EOT
CREATE USER sts WITH ENCRYPTED PASSWORD 'sts' SUPERUSER;
CREATE DATABASE sts;
\c sts
CREATE USER identity WITH ENCRYPTED PASSWORD 'identity' SUPERUSER;
CREATE DATABASE identity;
\c identity
EOT
}
}
8 changes: 5 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ edc-did-core = { module = "org.eclipse.edc:identity-did-core", version.ref = "ed
edc-did-web = { module = "org.eclipse.edc:identity-did-web", version.ref = "edc" }
edc-core-connector = { module = "org.eclipse.edc:connector-core", version.ref = "edc" }
edc-core-crypto = { module = "org.eclipse.edc:crypto-core", version.ref = "edc" }
edc-core-token = { module = "org.eclipse.edc:token-core", version.ref = "edc" }
edc-core-edrstore = { module = "org.eclipse.edc:edr-store-core", version.ref = "edc" }
edc-ext-http = { module = "org.eclipse.edc:http", version.ref = "edc" }
edc-ext-jsonld = { module = "org.eclipse.edc:json-ld", version.ref = "edc" }
Expand Down Expand Up @@ -109,6 +110,7 @@ edc-sql-transactionlocal = { module = "org.eclipse.edc:transaction-local", versi
edc-sql-accesstokendata = { module = "org.eclipse.edc:accesstokendata-store-sql", version.ref = "edc" }
edc-sql-dataplane = { module = "org.eclipse.edc:data-plane-store-sql", version.ref = "edc" }
edc-sql-dataplane-instancestore = { module = "org.eclipse.edc:data-plane-instance-store-sql", version.ref = "edc" }
edc-sql-jtivdalidation = { module = "org.eclipse.edc:jti-validation-store-sql", version.ref = "edc" }


# identity hub SQL implementations
Expand Down Expand Up @@ -176,7 +178,7 @@ parsson = { module = "org.eclipse.parsson:parsson", version.ref = "parsson" }
[bundles]
dpf = ["edc-dpf-selector-core", "edc-spi-dataplane-selector", "edc-dpf-selector-control-api", "edc-dpf-signaling-client", "edc-dpf-transfer-signaling"]

connector = ["edc-boot", "edc-core-connector", "edc-ext-http", "edc-api-observability", "edc-ext-jsonld"]
connector = ["edc-boot", "edc-core-connector", "edc-ext-http", "edc-api-observability", "edc-ext-jsonld", "edc-core-token"]

controlplane = ["edc-controlplane-core", "edc-config-filesystem", "edc-auth-tokenbased", "edc-auth-configuration", "edc-api-management",
"edc-api-management-config", "edc-api-management-edr", "edc-api-management-dataplaneselector",
Expand All @@ -196,9 +198,9 @@ dcp = ["edc-dcp", "edc-did-core", "edc-did-web", "edc-oauth2-client", "edc-dcp-c
sql-edc = ["edc-sql-assetindex", "edc-sql-contractdef", "edc-sql-contractneg", "edc-sql-policydef", "edc-sql-edrcache", "edc-sql-transferprocess", "edc-sql-dataplane-instancestore", "edc-sql-core", "edc-sql-lease", "edc-sql-pool", "edc-sql-transactionlocal", "postgres"]
sql-edc-dataplane = ["edc-sql-accesstokendata", "edc-sql-dataplane", "edc-sql-core", "edc-sql-lease", "edc-sql-pool", "edc-sql-transactionlocal", "edc-sql-dataplane-instancestore", "postgres"]

sql-ih = ["edc-sql-ih-credstore-sql", "edc-sql-ih-didstore-sql", "edc-sql-ih-keypairstore-sql", "edc-sql-ih-pcstore-sql", "edc-sql-ih-stsstore-sql", "edc-sql-core", "edc-sql-pool", "edc-sql-transactionlocal", "postgres"]
sql-ih = ["edc-sql-ih-credstore-sql","edc-sql-jtivdalidation", "edc-sql-ih-didstore-sql", "edc-sql-ih-keypairstore-sql", "edc-sql-ih-pcstore-sql", "edc-sql-ih-stsstore-sql", "edc-sql-core", "edc-sql-pool", "edc-sql-transactionlocal", "postgres"]

sql-sts = [ "edc-sql-ih-stsstore-sql", "edc-sql-core", "edc-sql-pool", "edc-sql-transactionlocal", "postgres"]
sql-sts = ["edc-sql-ih-stsstore-sql", "edc-sql-jtivdalidation", "edc-sql-core", "edc-sql-pool", "edc-sql-transactionlocal", "postgres"]

sts = ["edc-sts-core", "edc-sts-api", "edc-sts-spi", "edc-sts"]

Expand Down
1 change: 1 addition & 0 deletions launchers/controlplane/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dependencies {
implementation(libs.bundles.controlplane)
implementation(libs.bundles.dcp)
implementation(libs.edc.core.connector)
implementation(libs.edc.core.token)

if (project.properties.getOrDefault("persistence", "false") == "true") {
runtimeOnly(libs.edc.vault.hashicorp)
Expand Down
Loading