From e6bf0cba1f16e9f1d74e24722ba61d81e37090ea Mon Sep 17 00:00:00 2001 From: yh-noh Date: Tue, 10 Nov 2026 14:05:36 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix(iam):=20=EC=84=A4=EC=B9=98=20=EC=8B=9C?= =?UTF-8?q?=20CSP=20=EC=9E=84=EC=8B=9C=EC=9E=90=EA=B2=A9=EC=A6=9D=EB=AA=85?= =?UTF-8?q?=EC=9A=A9=20OIDC=20=ED=81=B4=EB=9D=BC=EC=9D=B4=EC=96=B8?= =?UTF-8?q?=ED=8A=B8=20=EC=9E=90=EB=8F=99=20=EC=83=9D=EC=84=B1=20(1=5Fsetu?= =?UTF-8?q?p=5Fauto.sh)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 클린 설치 후 Keycloak 에 mciam-oidc-Client 가 없어 CSP 임시자격증명 발급이 401 invalid_client 로 실패하던 문제 보정 (IAM-BUG-040, BAR-1941). admin-cli 사본이 배포 정본이라 mc-iam-manager 원본과 같은 수정을 반영. - Step 6-1 ensure_oidc_client 추가 (non-fatal, 멱등) - 없으면 생성: confidential, Service accounts ON, Direct access grants ON, Standard flow OFF, secret=MC_IAM_MANAGER_KEYCLOAK_OIDC_CLIENT_SECRET, audience mapper(access token aud 에 클라이언트 자신) 포함 - 있으면 설정은 유지하고 audience mapper 만 없을 때 추가, secret 불일치는 경고 --- .../conf/mc-iam-manager/1_setup_auto.sh | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/conf/docker/conf/mc-iam-manager/1_setup_auto.sh b/conf/docker/conf/mc-iam-manager/1_setup_auto.sh index 0bf73fd..80943ff 100755 --- a/conf/docker/conf/mc-iam-manager/1_setup_auto.sh +++ b/conf/docker/conf/mc-iam-manager/1_setup_auto.sh @@ -79,6 +79,15 @@ auto_setup() { fi echo "✓ Projects synced successfully" + # 6-1. Ensure the OIDC client for CSP temporary credentials (create if missing + audience mapper) + echo "Step 6-1: Ensuring Keycloak OIDC client..." + ensure_oidc_client + if [ $? -ne 0 ]; then + echo "WARNING: Keycloak OIDC client ensure failed (non-fatal) — CSP temporary credentials will fail with invalid_client" + else + echo "✓ Keycloak OIDC client ensured" + fi + # 7. Keycloak client redirect URI configuration echo "Step 7: Configuring Keycloak client redirect URIs..." configure_keycloak_client_uris @@ -974,6 +983,92 @@ sync_projects() { return 0 } +# Ensure the OIDC client used for CSP temporary credential issuance (MC_IAM_MANAGER_KEYCLOAK_OIDC_CLIENT_NAME). +# mc-iam-manager creates it in /api/initial-admin; this is also checked here for older images and existing installs. +# - Create if missing: confidential, Service accounts ON, Direct access grants ON, Standard flow OFF, +# secret=MC_IAM_MANAGER_KEYCLOAK_OIDC_CLIENT_SECRET +# - Add an audience mapper (client itself in access token aud) if missing, to match the AWS OIDC Provider audience +# - Other settings of an existing client are left untouched. Idempotent. +ensure_oidc_client() { + echo "=== Ensuring Keycloak OIDC Client ===" + + OIDC_CLIENT="$MC_IAM_MANAGER_KEYCLOAK_OIDC_CLIENT_NAME" + if [ -z "$OIDC_CLIENT" ] || [ -z "$MC_IAM_MANAGER_KEYCLOAK_OIDC_CLIENT_SECRET" ]; then + echo "ERROR: MC_IAM_MANAGER_KEYCLOAK_OIDC_CLIENT_NAME / MC_IAM_MANAGER_KEYCLOAK_OIDC_CLIENT_SECRET is not set" + return 1 + fi + + KC_ADMIN_TOKEN=$(curl -s -X POST \ + "${MC_IAM_MANAGER_KEYCLOAK_HOST}/realms/master/protocol/openid-connect/token" \ + -H "Content-Type: application/x-www-form-urlencoded" \ + -d "grant_type=password" \ + -d "client_id=admin-cli" \ + --data-urlencode "username=${MC_IAM_MANAGER_KEYCLOAK_ADMIN}" \ + --data-urlencode "password=${MC_IAM_MANAGER_KEYCLOAK_ADMIN_PASSWORD}" \ + | jq -r '.access_token' 2>/dev/null) + + if [ -z "$KC_ADMIN_TOKEN" ] || [ "$KC_ADMIN_TOKEN" = "null" ]; then + echo "ERROR: Failed to obtain Keycloak admin token" + return 1 + fi + + KC_ADMIN_URL="${MC_IAM_MANAGER_KEYCLOAK_HOST}/admin/realms/${MC_IAM_MANAGER_KEYCLOAK_REALM}" + + AUD_MAPPER=$(jq -n --arg c "$OIDC_CLIENT" '{ + name: "aud-mciam-oidc-Client", + protocol: "openid-connect", + protocolMapper: "oidc-audience-mapper", + config: {"included.client.audience": $c, "id.token.claim": "false", "access.token.claim": "true"} + }') + + CLIENT_JSON=$(curl -s "${KC_ADMIN_URL}/clients?clientId=${OIDC_CLIENT}" \ + -H "Authorization: Bearer ${KC_ADMIN_TOKEN}") + CLIENT_ID=$(echo "$CLIENT_JSON" | jq -r '.[0].id // empty' 2>/dev/null) + + if [ -z "$CLIENT_ID" ]; then + BODY=$(jq -n --arg c "$OIDC_CLIENT" --arg s "$MC_IAM_MANAGER_KEYCLOAK_OIDC_CLIENT_SECRET" --argjson m "$AUD_MAPPER" '{ + clientId: $c, name: $c, protocol: "openid-connect", enabled: true, + publicClient: false, clientAuthenticatorType: "client-secret", secret: $s, + serviceAccountsEnabled: true, directAccessGrantsEnabled: true, + standardFlowEnabled: false, implicitFlowEnabled: false, + protocolMappers: [$m] + }') + HTTP=$(curl -s -o /dev/null -w "%{http_code}" -X POST "${KC_ADMIN_URL}/clients" \ + -H "Authorization: Bearer ${KC_ADMIN_TOKEN}" \ + -H "Content-Type: application/json" \ + -d "$BODY") + if [ "$HTTP" = "201" ]; then + echo " ✓ Created: $OIDC_CLIENT (confidential, service accounts, direct access grants, audience mapper)" + return 0 + fi + echo " ✗ Failed to create $OIDC_CLIENT (HTTP $HTTP)" + return 1 + fi + + echo " ✓ Exists: $OIDC_CLIENT" + HAS_MAPPER=$(echo "$CLIENT_JSON" | jq --arg c "$OIDC_CLIENT" '[.[0].protocolMappers[]? | select(.protocolMapper == "oidc-audience-mapper" and .config["included.client.audience"] == $c and .config["access.token.claim"] == "true")] | length') + if [ "$HAS_MAPPER" = "0" ]; then + HTTP=$(curl -s -o /dev/null -w "%{http_code}" -X POST \ + "${KC_ADMIN_URL}/clients/${CLIENT_ID}/protocol-mappers/models" \ + -H "Authorization: Bearer ${KC_ADMIN_TOKEN}" \ + -H "Content-Type: application/json" \ + -d "$AUD_MAPPER") + if [ "$HTTP" = "201" ]; then + echo " ✓ Added audience mapper to $OIDC_CLIENT" + else + echo " ✗ Failed to add audience mapper to $OIDC_CLIENT (HTTP $HTTP)" + return 1 + fi + fi + + CURRENT_SECRET=$(curl -s "${KC_ADMIN_URL}/clients/${CLIENT_ID}/client-secret" \ + -H "Authorization: Bearer ${KC_ADMIN_TOKEN}" | jq -r '.value // empty') + if [ "$CURRENT_SECRET" != "$MC_IAM_MANAGER_KEYCLOAK_OIDC_CLIENT_SECRET" ]; then + echo " ⚠️ $OIDC_CLIENT secret differs from MC_IAM_MANAGER_KEYCLOAK_OIDC_CLIENT_SECRET (not changed)" + fi + return 0 +} + configure_keycloak_client_uris() { echo "=== Configuring Keycloak Client Redirect URIs ===" From 15f47b5663918e28c0bda4c967fa816b2989bb5d Mon Sep 17 00:00:00 2001 From: yh-noh Date: Mon, 16 Nov 2026 07:21:53 +0000 Subject: [PATCH 2/3] =?UTF-8?q?fix(iam):=20AWS=20CSP=20=EB=B6=80=ED=8A=B8?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EB=9E=A9=EC=9D=B4=20CspRole=20=EC=97=90=20?= =?UTF-8?q?=EC=86=8C=EC=86=8D=20IdP=20Config=20=EB=A5=BC=20=EB=84=98?= =?UTF-8?q?=EA=B8=B0=EA=B3=A0=20.env=20=EA=B0=92=20=EA=B2=80=EC=A6=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Step 3 POST /api/roles/csp 에 Step 2 IdP Config id(cspIdpConfigId)를 넘긴다. IAM 이 CspRole 에 소속 Config·계정과 idp_identifier(Config 의 Provider ARN)를 채운다. - MC_IAM_MANAGER_AWS_ACCOUNT_ID 가 12자리가 아니거나 MC_IAM_MANAGER_PUBLIC_DOMAIN 이 비었거나 내부 이름이면 잘못된 계정·Config 를 만들지 않고 skip 로그를 남긴다. - 계정·Config 조회는 이름이 정확히 같은 항목만 고른다(list 의 name 필터는 부분 일치). - 이미 있으면 갱신하지 않고, .env 값과 다르면 경고만 남긴다(.env 는 최초 설정용). - IdP Config 생성 시 audience(MC_IAM_MANAGER_KEYCLOAK_OIDC_CLIENT_NAME)를 함께 넣는다. Refs: IAM-BUG-040, IAM-BUG-042 --- .../conf/mc-iam-manager/1_setup_auto.sh | 61 ++++++++++++++----- 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/conf/docker/conf/mc-iam-manager/1_setup_auto.sh b/conf/docker/conf/mc-iam-manager/1_setup_auto.sh index 80943ff..fa81035 100755 --- a/conf/docker/conf/mc-iam-manager/1_setup_auto.sh +++ b/conf/docker/conf/mc-iam-manager/1_setup_auto.sh @@ -779,12 +779,22 @@ init_aws_csp_config() { local DOMAIN="${MC_IAM_MANAGER_PUBLIC_DOMAIN:-}" local REALM="${MC_IAM_MANAGER_KEYCLOAK_REALM:-mciam}" local PREFIX="${MC_IAM_MANAGER_CSP_ROLE_PREFIX:-mciam}" + local AUDIENCE="${MC_IAM_MANAGER_KEYCLOAK_OIDC_CLIENT_NAME:-}" # MC_IAM_MANAGER_AWS_ACCOUNT_ID 미설정 또는 placeholder이면 skip if [ -z "$ACCOUNT_ID" ] || [ "$ACCOUNT_ID" = "notyet" ]; then echo " ⓘ MC_IAM_MANAGER_AWS_ACCOUNT_ID not configured — skipping AWS CSP setup" return 0 fi + # 값이 틀리면 잘못된 계정·Config 를 만들지 않고 skip (.env 는 최초 설정용, 이후 변경은 API) + if ! [[ "$ACCOUNT_ID" =~ ^[0-9]{12}$ ]]; then + echo " ⚠️ skip: MC_IAM_MANAGER_AWS_ACCOUNT_ID ('$ACCOUNT_ID') is not a 12-digit AWS account ID — check .env" + return 0 + fi + if [ -z "$DOMAIN" ] || [ "$DOMAIN" = "localhost" ] || [[ "$DOMAIN" != *.* ]]; then + echo " ⚠️ skip: MC_IAM_MANAGER_PUBLIC_DOMAIN ('$DOMAIN') is empty or an internal host name — check .env" + return 0 + fi local OIDC_PROVIDER_ARN="arn:aws:iam::${ACCOUNT_ID}:oidc-provider/${DOMAIN}/auth/realms/${REALM}" local ROLE_ARN="arn:aws:iam::${ACCOUNT_ID}:role/${PREFIX}-platformadmin" @@ -796,12 +806,14 @@ init_aws_csp_config() { # --- Step 1: mcmp_csp_accounts 생성 --- POST /api/csp-accounts # list-first 패턴: 기존 항목이 있으면 ID를 가져오고, 없으면 생성 - local ACCOUNT_DB_ID http_code - ACCOUNT_DB_ID=$(curl -s -X POST \ + # (list 의 name 필터는 부분 일치라 이름이 정확히 같은 항목만 고른다. 기존 값은 갱신하지 않고 다르면 경고만) + local ACCOUNT_DB_ID ACCOUNT_JSON http_code + ACCOUNT_JSON=$(curl -s -X POST \ -H "Authorization: Bearer $MC_IAM_MANAGER_PLATFORMADMIN_ACCESSTOKEN" \ -H "Content-Type: application/json" \ "$MC_IAM_MANAGER_HOST/api/csp-accounts/list" \ - -d "{\"name\":\"aws-default\"}" | jq -r '.[0].id // empty' 2>/dev/null) + -d "{\"name\":\"aws-default\",\"csp_type\":\"aws\"}" | jq -c 'if type == "array" then ([.[] | select(.name == "aws-default")][0] // empty) else empty end' 2>/dev/null) + ACCOUNT_DB_ID=$(echo "$ACCOUNT_JSON" | jq -r '.id // empty' 2>/dev/null) if [ -z "$ACCOUNT_DB_ID" ]; then local account_resp account_body @@ -821,41 +833,62 @@ init_aws_csp_config() { fi else echo " ✓ CspAccount already exists (id=${ACCOUNT_DB_ID})" + local existing_account_id + existing_account_id=$(echo "$ACCOUNT_JSON" | jq -r '.account_info.account_id // empty' 2>/dev/null) + if [ "$existing_account_id" != "$ACCOUNT_ID" ]; then + echo " ⚠️ CspAccount account_id ('$existing_account_id') differs from .env ('$ACCOUNT_ID') — not changed (update via API)" + fi fi [ -z "$ACCOUNT_DB_ID" ] && { echo " ✗ CspAccount ID not found"; return 1; } # --- Step 2: mcmp_csp_idp_configs 생성 (OIDC) --- POST /api/csp-idp-configs - # list-first 패턴 - local IDP_EXISTS - IDP_EXISTS=$(curl -s -X POST \ + # list-first 패턴 (이름 정확히 일치, 기존 값은 갱신하지 않고 다르면 경고만) + local IDP_CONFIG_ID IDP_JSON + IDP_JSON=$(curl -s -X POST \ -H "Authorization: Bearer $MC_IAM_MANAGER_PLATFORMADMIN_ACCESSTOKEN" \ -H "Content-Type: application/json" \ "$MC_IAM_MANAGER_HOST/api/csp-idp-configs/list" \ - -d "{\"name\":\"aws-oidc\",\"csp_account_id\":${ACCOUNT_DB_ID}}" | jq -r '.[0].id // empty' 2>/dev/null) - - if [ -z "$IDP_EXISTS" ]; then - http_code=$(curl -s -o /dev/null -w "%{http_code}" -X POST \ + -d "{\"name\":\"aws-oidc\",\"csp_account_id\":${ACCOUNT_DB_ID}}" | jq -c 'if type == "array" then ([.[] | select(.name == "aws-oidc")][0] // empty) else empty end' 2>/dev/null) + IDP_CONFIG_ID=$(echo "$IDP_JSON" | jq -r '.id // empty' 2>/dev/null) + + if [ -z "$IDP_CONFIG_ID" ]; then + local idp_body idp_resp + idp_body=$(jq -n --argjson acc "$ACCOUNT_DB_ID" --arg role "$ROLE_ARN" --arg provider "$OIDC_PROVIDER_ARN" --arg aud "$AUDIENCE" \ + '{name: "aws-oidc", csp_account_id: $acc, auth_method: "OIDC", + config: ({role_arn: $role, oidc_provider_arn: $provider} + (if $aud != "" then {audience: $aud} else {} end))}') + idp_resp=$(curl -s -w "\n%{http_code}" -X POST \ -H "Authorization: Bearer $MC_IAM_MANAGER_PLATFORMADMIN_ACCESSTOKEN" \ -H "Content-Type: application/json" \ "$MC_IAM_MANAGER_HOST/api/csp-idp-configs" \ - -d "{\"name\":\"aws-oidc\",\"csp_account_id\":${ACCOUNT_DB_ID},\"auth_method\":\"OIDC\",\"config\":{\"role_arn\":\"${ROLE_ARN}\",\"oidc_provider_arn\":\"${OIDC_PROVIDER_ARN}\"}}") + -d "$idp_body") + http_code=$(echo "$idp_resp" | tail -1) if [ "$http_code" = "201" ] || [ "$http_code" = "200" ]; then echo " ✓ CspIdpConfig (OIDC) created" + IDP_CONFIG_ID=$(echo "$idp_resp" | sed '$d' | jq -r '.id // empty' 2>/dev/null) else - echo " ✗ CspIdpConfig failed (HTTP $http_code)" + echo " ✗ CspIdpConfig failed (HTTP $http_code): $(echo "$idp_resp" | sed '$d')" return 1 fi else - echo " ✓ CspIdpConfig already exists" + echo " ✓ CspIdpConfig already exists (id=${IDP_CONFIG_ID})" + local existing_role existing_provider + existing_role=$(echo "$IDP_JSON" | jq -r '.config.role_arn // empty' 2>/dev/null) + existing_provider=$(echo "$IDP_JSON" | jq -r '.config.oidc_provider_arn // empty' 2>/dev/null) + if [ "$existing_role" != "$ROLE_ARN" ] || [ "$existing_provider" != "$OIDC_PROVIDER_ARN" ]; then + echo " ⚠️ CspIdpConfig role_arn/oidc_provider_arn differ from .env — not changed (update via API)" + echo " existing: role_arn=$existing_role oidc_provider_arn=$existing_provider" + fi fi + [ -z "$IDP_CONFIG_ID" ] && { echo " ✗ CspIdpConfig ID not found"; return 1; } # --- Step 3: mcmp_role_csp_roles 등록 — POST /api/roles/csp --- + # 소속 IdP Config 를 넘기면 IAM 이 계정과 idp_identifier(Config 의 Provider ARN)를 채운다 local csp_role_resp csp_role_resp=$(curl -s -w "\n%{http_code}" -X POST \ -H "Authorization: Bearer $MC_IAM_MANAGER_PLATFORMADMIN_ACCESSTOKEN" \ -H "Content-Type: application/json" \ "$MC_IAM_MANAGER_HOST/api/roles/csp" \ - -d "{\"cspRoleName\":\"${CSP_ROLE_NAME}\",\"cspType\":\"aws\",\"authMethod\":\"OIDC\"}") + -d "{\"cspRoleName\":\"${CSP_ROLE_NAME}\",\"cspType\":\"aws\",\"authMethod\":\"OIDC\",\"cspIdpConfigId\":${IDP_CONFIG_ID}}") http_code=$(echo "$csp_role_resp" | tail -1) local csp_role_body csp_role_body=$(echo "$csp_role_resp" | sed '$d') From 607bf35f5d3c19f1b300777720837f4ae6781e52 Mon Sep 17 00:00:00 2001 From: yh-noh Date: Tue, 17 Nov 2026 10:59:52 +0900 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20workflow=20=EB=A9=94=EB=89=B4=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=EB=A5=BC=20=EC=A0=95=EC=8B=9D=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20/web/workflows/workflow/list=20=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../conf/mc-web-console/api/conf/webconsole_menu_resources.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/docker/conf/mc-web-console/api/conf/webconsole_menu_resources.yaml b/conf/docker/conf/mc-web-console/api/conf/webconsole_menu_resources.yaml index 38321f6..211880d 100644 --- a/conf/docker/conf/mc-web-console/api/conf/webconsole_menu_resources.yaml +++ b/conf/docker/conf/mc-web-console/api/conf/webconsole_menu_resources.yaml @@ -305,7 +305,7 @@ menus: menunumber: 2109 viewtype: iframe frameworkservice: mc-workflow-manager-fe - path: /web/workflow/list + path: /web/workflows/workflow/list - id: mceventlistener parentid: workflows