Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
App Blocks
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Genesys PGR
App Blocks
Commits
ce45ba76
Commit
ce45ba76
authored
Dec 25, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
AclObjectIdentityExt provides extended information on Object Identity
parent
f70eb997
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
62 additions
and
0 deletions
+62
-0
security/src/main/java/org/genesys/blocks/security/service/CustomAclService.java
...org/genesys/blocks/security/service/CustomAclService.java
+26
-0
security/src/main/java/org/genesys/blocks/security/service/impl/CustomAclServiceImpl.java
...ys/blocks/security/service/impl/CustomAclServiceImpl.java
+36
-0
No files found.
security/src/main/java/org/genesys/blocks/security/service/CustomAclService.java
View file @
ce45ba76
...
...
@@ -15,6 +15,7 @@
*/
package
org.genesys.blocks.security.service
;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.genesys.blocks.util.JsonSidConverter
;
...
...
@@ -23,10 +24,14 @@ import org.genesys.blocks.security.model.AclClass;
import
org.genesys.blocks.security.model.AclEntry
;
import
org.genesys.blocks.security.model.AclObjectIdentity
;
import
org.genesys.blocks.security.model.AclSid
;
import
org.genesys.blocks.security.serialization.AclEntriesToPermissions
;
import
org.genesys.blocks.security.serialization.Permissions
;
import
org.genesys.blocks.security.serialization.SidPermissions
;
import
org.springframework.security.acls.model.Permission
;
import
com.fasterxml.jackson.annotation.JsonUnwrapped
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
/**
* The Interface CustomAclService.
*/
...
...
@@ -255,4 +260,25 @@ public interface CustomAclService extends JsonSidConverter.SidProvider {
*/
String
getSidName
(
long
id
);
/**
* Load object identity extended information
*
* @param objectIdentity the object identity
* @return the acl object identity ext
*/
AclObjectIdentityExt
loadObjectIdentityExt
(
AclObjectIdentity
objectIdentity
);
/**
* Wraps {@link AclObjectIdentity} and adds list of inherited permissions.
*/
public
static
class
AclObjectIdentityExt
{
@JsonUnwrapped
public
AclObjectIdentity
original
;
@JsonSerialize
(
converter
=
AclEntriesToPermissions
.
class
)
public
List
<
AclEntry
>
inherited
=
new
ArrayList
<>();
public
AclObjectIdentityExt
(
AclObjectIdentity
source
)
{
this
.
original
=
source
;
}
}
}
security/src/main/java/org/genesys/blocks/security/service/impl/CustomAclServiceImpl.java
View file @
ce45ba76
...
...
@@ -16,7 +16,9 @@
package
org.genesys.blocks.security.service.impl
;
import
java.util.ArrayList
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Set
;
import
javax.persistence.EntityManager
;
...
...
@@ -385,6 +387,38 @@ public class CustomAclServiceImpl implements CustomAclService {
return
aclClass
;
}
@Override
@Transactional
(
readOnly
=
true
)
public
AclObjectIdentityExt
loadObjectIdentityExt
(
AclObjectIdentity
objectIdentity
)
{
if
(
objectIdentity
!=
null
)
{
objectIdentity
=
getObjectIdentity
(
objectIdentity
.
getId
());
AclObjectIdentityExt
_aclObjectIdentity
=
new
AclObjectIdentityExt
(
objectIdentity
);
objectIdentity
.
getAclEntries
().
forEach
(
entry
->
entry
.
getAclSid
().
getId
());
List
<
AclEntry
>
inheritedEntries
=
inherited
(
objectIdentity
.
getParentObject
(),
new
ArrayList
<>(),
new
HashSet
<>());
_aclObjectIdentity
.
inherited
.
addAll
(
inheritedEntries
);
// lazy load for JSON
_aclObjectIdentity
.
inherited
.
forEach
(
entry
->
entry
.
getAclSid
().
getId
());
return
_aclObjectIdentity
;
}
return
null
;
}
private
List
<
AclEntry
>
inherited
(
AclObjectIdentity
objectIdentity
,
List
<
AclEntry
>
aclEntries
,
Set
<
AclObjectIdentity
>
handled
)
{
if
(
objectIdentity
==
null
||
handled
.
contains
(
objectIdentity
))
{
return
aclEntries
;
}
aclEntries
.
addAll
(
objectIdentity
.
getAclEntries
());
handled
.
add
(
objectIdentity
);
if
(
objectIdentity
.
getParentObject
()
!=
null
)
{
inherited
(
objectIdentity
.
getParentObject
(),
aclEntries
,
handled
);
}
return
aclEntries
;
}
/*
* (non-Javadoc)
...
...
@@ -558,6 +592,7 @@ public class CustomAclServiceImpl implements CustomAclService {
* @see org.genesys.blocks.security.service.CustomAclService#removePermissions(org.genesys.blocks.security.model.AclObjectIdentity, org.genesys.blocks.security.model.AclSid)
*/
@Override
@Transactional
(
propagation
=
Propagation
.
REQUIRED
,
isolation
=
Isolation
.
READ_UNCOMMITTED
)
public
AclObjectIdentity
removePermissions
(
AclObjectIdentity
objectIdentity
,
AclSid
sid
)
{
if
(
objectIdentity
==
null
)
{
throw
new
NullPointerException
(
"AclObjectIdentity must be provided, was null."
);
...
...
@@ -569,6 +604,7 @@ public class CustomAclServiceImpl implements CustomAclService {
try
{
final
List
<
AclEntry
>
aclEntries
=
aclEntryPersistence
.
findBySidAndObjectIdentity
(
sid
,
objectIdentity
);
// delete ACL entries for sid
LOG
.
debug
(
"Deleting {} AclEntries for {}"
,
aclEntries
.
size
(),
sid
);
aclEntryPersistence
.
delete
(
aclEntries
);
return
getObjectIdentity
(
objectIdentity
.
getId
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment