mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 10:57:35 +00:00

This PR summarizes multiple changes specifically only available with ZITADEL v3: - feat: Web Keys management (https://github.com/zitadel/zitadel/pull/9526) - fix(cmd): ensure proper working of mirror (https://github.com/zitadel/zitadel/pull/9509) - feat(Authz): system user support for permission check v2 (https://github.com/zitadel/zitadel/pull/9640) - chore(license): change from Apache to AGPL (https://github.com/zitadel/zitadel/pull/9597) - feat(console): list v2 sessions (https://github.com/zitadel/zitadel/pull/9539) - fix(console): add loginV2 feature flag (https://github.com/zitadel/zitadel/pull/9682) - fix(feature flags): allow reading "own" flags (https://github.com/zitadel/zitadel/pull/9649) - feat(console): add Actions V2 UI (https://github.com/zitadel/zitadel/pull/9591) BREAKING CHANGE - feat(webkey): migrate to v2beta API (https://github.com/zitadel/zitadel/pull/9445) - chore!: remove CockroachDB Support (https://github.com/zitadel/zitadel/pull/9444) - feat(actions): migrate to v2beta API (https://github.com/zitadel/zitadel/pull/9489) --------- Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com> Co-authored-by: Silvan <27845747+adlerhurst@users.noreply.github.com> Co-authored-by: Ramon <mail@conblem.me> Co-authored-by: Elio Bischof <elio@zitadel.com> Co-authored-by: Kenta Yamaguchi <56732734+KEY60228@users.noreply.github.com> Co-authored-by: Harsha Reddy <harsha.reddy@klaviyo.com> Co-authored-by: Livio Spring <livio@zitadel.com> Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Iraq <66622793+kkrime@users.noreply.github.com> Co-authored-by: Florian Forster <florian@zitadel.com> Co-authored-by: Tim Möhlmann <tim+github@zitadel.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Max Peintner <peintnerm@gmail.com>
145 lines
4.6 KiB
PL/PgSQL
145 lines
4.6 KiB
PL/PgSQL
DROP FUNCTION IF EXISTS eventstore.check_system_user_perms;
|
|
|
|
CREATE OR REPLACE FUNCTION eventstore.check_system_user_perms(
|
|
system_user_perms JSONB
|
|
, perm TEXT
|
|
, filter_orgs TEXT
|
|
|
|
, org_ids OUT TEXT[]
|
|
)
|
|
LANGUAGE 'plpgsql'
|
|
AS $$
|
|
BEGIN
|
|
|
|
WITH found_permissions(member_type, aggregate_id, object_id ) AS (
|
|
SELECT * FROM eventstore.get_system_permissions(
|
|
system_user_perms,
|
|
perm)
|
|
)
|
|
|
|
SELECT array_agg(DISTINCT o.org_id) INTO org_ids
|
|
FROM eventstore.instance_orgs o, found_permissions
|
|
WHERE
|
|
CASE WHEN (SELECT TRUE WHERE found_permissions.member_type = 'System' LIMIT 1) THEN
|
|
TRUE
|
|
WHEN (SELECT TRUE WHERE found_permissions.member_type = 'IAM' LIMIT 1) THEN
|
|
-- aggregate_id not present
|
|
CASE WHEN (SELECT TRUE WHERE '' = ANY (
|
|
(
|
|
SELECT array_agg(found_permissions.aggregate_id)
|
|
FROM found_permissions
|
|
WHERE member_type = 'IAM'
|
|
GROUP BY member_type
|
|
LIMIT 1
|
|
)::TEXT[])) THEN
|
|
TRUE
|
|
-- aggregate_id is present
|
|
ELSE
|
|
o.instance_id = ANY (
|
|
(
|
|
SELECT array_agg(found_permissions.aggregate_id)
|
|
FROM found_permissions
|
|
WHERE member_type = 'IAM'
|
|
GROUP BY member_type
|
|
LIMIT 1
|
|
)::TEXT[])
|
|
END
|
|
WHEN (SELECT TRUE WHERE found_permissions.member_type = 'Organization' LIMIT 1) THEN
|
|
-- aggregate_id not present
|
|
CASE WHEN (SELECT TRUE WHERE '' = ANY (
|
|
(
|
|
SELECT array_agg(found_permissions.aggregate_id)
|
|
FROM found_permissions
|
|
WHERE member_type = 'Organization'
|
|
GROUP BY member_type
|
|
LIMIT 1
|
|
)::TEXT[])) THEN
|
|
TRUE
|
|
-- aggregate_id is present
|
|
ELSE
|
|
o.org_id = ANY (
|
|
(
|
|
SELECT array_agg(found_permissions.aggregate_id)
|
|
FROM found_permissions
|
|
WHERE member_type = 'Organization'
|
|
GROUP BY member_type
|
|
LIMIT 1
|
|
)::TEXT[])
|
|
END
|
|
END
|
|
AND
|
|
CASE WHEN filter_orgs != ''
|
|
THEN o.org_id IN (filter_orgs)
|
|
ELSE TRUE END
|
|
LIMIT 1;
|
|
END;
|
|
$$;
|
|
|
|
|
|
DROP FUNCTION IF EXISTS eventstore.permitted_orgs;
|
|
|
|
CREATE OR REPLACE FUNCTION eventstore.permitted_orgs(
|
|
instanceId TEXT
|
|
, userId TEXT
|
|
, system_user_perms JSONB
|
|
, perm TEXT
|
|
, filter_orgs TEXT
|
|
|
|
, org_ids OUT TEXT[]
|
|
)
|
|
LANGUAGE 'plpgsql'
|
|
AS $$
|
|
BEGIN
|
|
|
|
-- if system user
|
|
IF system_user_perms IS NOT NULL THEN
|
|
org_ids := eventstore.check_system_user_perms(system_user_perms, perm, filter_orgs);
|
|
-- if human/machine user
|
|
ELSE
|
|
DECLARE
|
|
matched_roles TEXT[]; -- roles containing permission
|
|
BEGIN
|
|
|
|
SELECT array_agg(rp.role) INTO matched_roles
|
|
FROM eventstore.role_permissions rp
|
|
WHERE rp.instance_id = instanceId
|
|
AND rp.permission = perm;
|
|
|
|
-- First try if the permission was granted thru an instance-level role
|
|
DECLARE
|
|
has_instance_permission bool;
|
|
BEGIN
|
|
SELECT true INTO has_instance_permission
|
|
FROM eventstore.instance_members im
|
|
WHERE im.role = ANY(matched_roles)
|
|
AND im.instance_id = instanceId
|
|
AND im.user_id = userId
|
|
LIMIT 1;
|
|
|
|
IF has_instance_permission THEN
|
|
-- Return all organizations or only those in filter_orgs
|
|
SELECT array_agg(o.org_id) INTO org_ids
|
|
FROM eventstore.instance_orgs o
|
|
WHERE o.instance_id = instanceId
|
|
AND CASE WHEN filter_orgs != ''
|
|
THEN o.org_id IN (filter_orgs)
|
|
ELSE TRUE END;
|
|
RETURN;
|
|
END IF;
|
|
END;
|
|
|
|
-- Return the organizations where permission were granted thru org-level roles
|
|
SELECT array_agg(sub.org_id) INTO org_ids
|
|
FROM (
|
|
SELECT DISTINCT om.org_id
|
|
FROM eventstore.org_members om
|
|
WHERE om.role = ANY(matched_roles)
|
|
AND om.instance_id = instanceID
|
|
AND om.user_id = userId
|
|
) AS sub;
|
|
END;
|
|
END IF;
|
|
END;
|
|
$$;
|
|
|