Skip to content

feat(user_oidc): use ENV as provider identifier + support special claims #59

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

Closed
dsteininger86 wants to merge 1 commit into from
Closed

feat(user_oidc): use ENV as provider identifier + support special claims #59

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
20 changes: 17 additions & 3 deletions configure-user-oidc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ configure_user_oidc() {
# which leads to the user_oidc not being used during runtime.
#
# https://github.com/nextcloud/user_oidc/blob/v5.0.3/lib/Service/LocalIdService.php#L30
./occ user_oidc:provider "${ENC_OIDC_CLIENT_ID}" \
./occ user_oidc:provider "${ENC_OIDC_PROVIDER_IDENTIFIER}" \
--clientid="${ENC_OIDC_CLIENT_ID}" \
--clientsecret="${ENC_OIDC_SECRET}" \
--discoveryuri="${ENC_OIDC_DISCOVERY_URI}" \
--extraClaims="${ENC_OIDC_EXTRA_CLAIMS}" \
--mapping-uid="${ENC_OIDC_MAPPING_UID}" \
--unique-uid=0 \
--scope="${ENC_OIDC_SCOPES}"

Expand Down Expand Up @@ -42,6 +44,10 @@ main() {
fail "jq not found"
fi

if [ -z "${ENC_OIDC_PROVIDER_IDENTIFIER}" ]; then
fail "ENC_OIDC_PROVIDER_IDENTIFIER not set"
fi

if [ -z "${ENC_OIDC_CLIENT_ID}" ]; then
fail "ENC_OIDC_CLIENT_ID not set"
fi
Expand All @@ -54,11 +60,19 @@ main() {
fail "ENC_OIDC_DISCOVERY_URI not set"
fi

if [ -z "${ENC_OIDC_EXTRA_CLAIMS}" ]; then
fail "ENC_OIDC_EXTRA_CLAIMS not set"
fi

if [ -z "${ENC_OIDC_MAPPING_UID}" ]; then
fail "ENC_OIDC_EXTRA_CLAIMS not set"
fi

if [ -z "${ENC_OIDC_SCOPES}" ]; then
fail "ENC_OIDC_SCOPES not set"
fi

provider_id="$( ./occ user_oidc:provider --output=json | jq --arg "clientId" "${ENC_OIDC_CLIENT_ID}" 'map( select(.clientId == $clientId) )[0].id' 2>/dev/null )"
provider_id="$( ./occ user_oidc:provider "${ENC_OIDC_PROVIDER_IDENTIFIER}" --output=json | jq --arg "clientId" "${ENC_OIDC_CLIENT_ID}" 'map( select(.clientId == $clientId) )[0].id' 2>/dev/null )"

if [ "${provider_id}" != "null" ]; then
echo "Provider already exists for client ID \"${ENC_OIDC_CLIENT_ID}\". Provider ID: ${provider_id}"
Expand All @@ -69,7 +83,7 @@ main() {
fail "Error creating provider with client ID \"${ENC_OIDC_CLIENT_ID}\" (occ failed)"
fi

provider_id="$( ./occ user_oidc:provider --output=json | jq --arg "clientId" "${ENC_OIDC_CLIENT_ID}" 'map( select(.clientId == $clientId) )[0].id' 2>/dev/null )"
provider_id="$( ./occ user_oidc:provider "${ENC_OIDC_PROVIDER_IDENTIFIER}" --output=json | jq --arg "clientId" "${ENC_OIDC_CLIENT_ID}" 'map( select(.clientId == $clientId) )[0].id' 2>/dev/null )"

if [ "${provider_id}" = "null" ]; then
fail "Error creating provider with client ID \"${ENC_OIDC_CLIENT_ID}\": not found"
Expand Down