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

Fix policy_groups policy authorization to pull from the correct org #643

Merged
merged 1 commit into from
Sep 13, 2016
Merged

Fix policy_groups policy authorization to pull from the correct org #643

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
6 changes: 3 additions & 3 deletions src/oc_erchef/apps/oc_chef_authz/priv/pgsql_statements.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,21 +169,21 @@
{find_policy_by_group_asoc_and_name,
<<"SELECT g.id, g.org_id, g.policy_group_name, g.policy_group_authz_id, g.policy_revision_revision_id, g.policy_revision_name, r.policy_authz_id, r.serialized_object
FROM policy_revisions_policy_groups_association AS g
LEFT JOIN policy_revisions AS r ON (g.policy_revision_revision_id = r.revision_id)
LEFT JOIN policy_revisions AS r ON (r.org_id = g.org_id AND g.policy_revision_revision_id = r.revision_id)
WHERE (g.org_id = $1 AND g.policy_group_name = $2 AND r.name = $3 )">>}.

{find_all_policy_revisions_by_group_and_name,
<<"SELECT g.id, g.policy_group_name, g.policy_group_authz_id,
g.policy_revision_revision_id, g.policy_revision_name
FROM policy_revisions_policy_groups_association AS g
LEFT JOIN policy_revisions AS r ON (g.policy_revision_revision_id = r.revision_id)
LEFT JOIN policy_revisions AS r ON (r.org_id = g.org_id AND g.policy_revision_revision_id = r.revision_id)
WHERE (g.org_id = $1)">>}.

{find_all_policy_revisions_associated_to_group,
<<"SELECT g.id, g.policy_group_name, g.policy_group_authz_id,
g.policy_revision_revision_id, g.policy_revision_name
FROM policy_revisions_policy_groups_association AS g
LEFT JOIN policy_revisions AS r ON (g.policy_revision_revision_id = r.revision_id)
LEFT JOIN policy_revisions AS r ON (r.org_id = g.org_id AND g.policy_revision_revision_id = r.revision_id)
WHERE (g.org_id = $1 AND g.policy_group_name = $2)">>}.

{find_client_name_in_authz_ids, <<"SELECT name, authz_id FROM clients WHERE authz_id = ANY($1)">>}.
Expand Down