hostsharing/hs.hsadmin.ng
1
0
Fork 0
Code Activity

add CustomerRepositoryIntegrationTest, fix testcontainers liquibase context and improve error messages

Browse Source
This commit is contained in:
Michael Hoennig
2022-07-31 18:56:03 +02:00
parent 5d4fb85383
commit 27c5699c36
6 changed files with 214 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/resources/db/changelog/2022-07-28-005-rbac-base.sql
View File

@ -601,8 +601,12 @@ begin
objectTable := pureIdentifier(objectTable);
objectIdName := pureIdentifier(objectIdName);
sql := format('select * from %sUuidByIdName(%L);', objectTable, objectIdName);
raise notice 'sql: %', sql;
execute sql into uuid;
begin
raise notice 'sql: %', sql;
execute sql into uuid;
exception when OTHERS then
raise exception 'function %UuidByIdName(...) not found, add identity view support for table %', objectTable, objectTable;
end;
return uuid;
end; $$;
@ -622,8 +626,12 @@ declare
roleUuidToAssume uuid;
begin
currentUserId := currentUserId();
if currentUserId is null then
raise exception 'user % does not exist', currentUser();
end if;
roleNames := assumedRoles();
if (cardinality(roleNames) = 0) then
if cardinality(roleNames) = 0 then
return array [currentUserId];
end if;
@ -645,7 +653,7 @@ begin
and r.roleType = roleTypeToAssume
into roleUuidToAssume;
if (not isGranted(currentUserId, roleUuidToAssume)) then
raise exception 'user % has no permission to assume role %', currentUser(), roleUuidToAssume;
raise exception 'user % (%) has no permission to assume role % (%)', currentUser(), currentUserId, roleName, roleUuidToAssume;
end if;
roleIdsToAssume := roleIdsToAssume || roleUuidToAssume;
end loop;

55
src/main/resources/db/changelog/2022-07-29-050-hs-base.sql
View File

@ -9,19 +9,44 @@
Otherwise these columns needed to be nullable and
many queries would be more complicated.
*/
create table Hostsharing
create table Global
(
uuid uuid primary key references RbacObject (uuid)
uuid uuid primary key references RbacObject (uuid),
name varchar(63)
);
create unique index Hostsharing_Singleton on Hostsharing ((0));
create unique index Global_Singleton on Global ((0));
/**
A single row to be referenced as a global object.
*/
insert
into RbacObject (objecttable) values ('hostsharing');
into RbacObject (objecttable) values ('global');
insert
into Hostsharing (uuid) values ((select uuid from RbacObject where objectTable = 'hostsharing'));
into Global (uuid, name) values ((select uuid from RbacObject where objectTable = 'global'), 'hostsharing');
--//
-- ============================================================================
--changeset hs-base-GLOBAL-IDENTITY-VIEW:1 endDelimiter:--//
-- ----------------------------------------------------------------------------
/*
Creates a view to the global object table which maps the identifying name to the objectUuid.
*/
drop view if exists global_iv;
create or replace view global_iv as
select distinct target.uuid, target.name as idName
from global as target;
grant all privileges on global_iv to restricted;
/*
Returns the objectUuid for a given identifying name (in this case the prefix).
*/
create or replace function globalUuidByIdName(idName varchar)
returns uuid
language sql
strict as $$
select uuid from global_iv iv where iv.idName = globalUuidByIdName.idName;
$$;
--//
-- ============================================================================
@ -35,12 +60,12 @@ create or replace function hostsharingAdmin()
returns null on null input
stable leakproof
language sql as $$
select 'global', (select uuid from RbacObject where objectTable = 'hostsharing'), 'admin'::RbacRoleType;
select 'global', (select uuid from RbacObject where objectTable = 'global'), 'admin'::RbacRoleType;
$$;
select createRole(hostsharingAdmin());
-- ============================================================================
--changeset hs-base-ADMIN-USERS:1 context:dev endDelimiter:--//
--changeset hs-base-ADMIN-USERS:1 context:dev,test,tc endDelimiter:--//
-- ----------------------------------------------------------------------------
/*
Create two users and assign both to the administrators role.
@ -58,7 +83,7 @@ $$;
-- ============================================================================
--changeset hs-base-hostsharing-TEST:1 context:dev runAlways:true endDelimiter:--//
--changeset hs-base-hostsharing-TEST:1 context:dev,test,tc runAlways:true endDelimiter:--//
-- ----------------------------------------------------------------------------
/*
@ -69,16 +94,16 @@ do language plpgsql $$
declare
userName varchar;
begin
set local hsadminng.currentUser = 'mike@hostsharing.net';
select userName from RbacUser where uuid = currentUserId() into userName;
if userName <> 'mike@hostsharing.net' then
raise exception 'fetching initial currentUser failed';
end if;
set local hsadminng.currentUser = 'sven@hostsharing.net';
select userName from RbacUser where uuid = currentUserId() into userName;
if userName <> 'sven@hostsharing.net' then
raise exception 'fetching changed currentUser failed';
raise exception 'setting or fetching initial currentUser failed, got: %', userName;
end if;
set local hsadminng.currentUser = 'mike@hostsharing.net';
select userName from RbacUser where uuid = currentUserId() into userName;
if userName = 'mike@hostsharing.net' then
raise exception 'currentUser should not change in one transaction, but did change, got: %', userName;
end if;
end; $$;
--//