Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
App Blocks
Commits
03dc333d
Commit
03dc333d
authored
Jul 20, 2017
by
Matija Obreza
Browse files
Fixed bug in #ensureObjectIdentity using user email instead of uuid
parent
7b55e2a0
Changes
2
Hide whitespace changes
Inline
Side-by-side
security/src/main/java/org/genesys/blocks/security/component/AclAssignerAspect.java
View file @
03dc333d
...
@@ -38,10 +38,10 @@ public class AclAssignerAspect {
...
@@ -38,10 +38,10 @@ public class AclAssignerAspect {
boolean
needsAcl
=
false
;
boolean
needsAcl
=
false
;
final
Authentication
auth
=
SecurityContextHolder
.
getContext
().
getAuthentication
();
final
Authentication
auth
=
SecurityContextHolder
.
getContext
().
getAuthentication
();
if
(
result
instanceof
AclAwareMode
l
)
{
if
(
auth
!=
nul
l
)
{
final
AclAwareModel
aclModel
=
(
AclAwareModel
)
result
;
if
(
result
instanceof
AclAwareModel
)
{
if
(
aclModel
.
getId
()
!=
null
)
{
final
AclAwareModel
aclModel
=
(
AclAwareModel
)
result
;
if
(
a
uth
!=
null
)
{
if
(
a
clModel
.
getId
()
!=
null
)
{
needsAcl
=
true
;
needsAcl
=
true
;
}
}
}
}
...
@@ -50,7 +50,7 @@ public class AclAssignerAspect {
...
@@ -50,7 +50,7 @@ public class AclAssignerAspect {
try
{
try
{
if
(
needsAcl
)
{
if
(
needsAcl
)
{
final
AclAwareModel
aclModel
=
(
AclAwareModel
)
result
;
final
AclAwareModel
aclModel
=
(
AclAwareModel
)
result
;
LOG
.
trace
(
"Inserting ACL entries for owner={}"
,
aclModel
.
getId
());
LOG
.
debug
(
"Inserting ACL entries for owner={}"
,
aclModel
.
getId
());
aclService
.
addCreatorPermissions
(
aclModel
);
aclService
.
addCreatorPermissions
(
aclModel
);
}
}
return
result
;
return
result
;
...
@@ -71,7 +71,7 @@ public class AclAssignerAspect {
...
@@ -71,7 +71,7 @@ public class AclAssignerAspect {
try
{
try
{
if
(
arg0
instanceof
AclAwareModel
)
{
if
(
arg0
instanceof
AclAwareModel
)
{
final
AclAwareModel
aclModel
=
(
AclAwareModel
)
arg0
;
final
AclAwareModel
aclModel
=
(
AclAwareModel
)
arg0
;
LOG
.
trace
(
"Removing ACL entries for model={}"
,
aclModel
);
LOG
.
debug
(
"Removing ACL entries for model={}"
,
aclModel
);
aclService
.
removePermissions
(
aclModel
);
aclService
.
removePermissions
(
aclModel
);
}
}
}
finally
{
}
finally
{
...
...
security/src/main/java/org/genesys/blocks/security/service/impl/CustomAclServiceImpl.java
View file @
03dc333d
...
@@ -146,7 +146,7 @@ public class CustomAclServiceImpl implements CustomAclService {
...
@@ -146,7 +146,7 @@ public class CustomAclServiceImpl implements CustomAclService {
AclClass
aclClass
=
aclClassPersistence
.
findByAclClass
(
className
);
AclClass
aclClass
=
aclClassPersistence
.
findByAclClass
(
className
);
if
(
aclClass
==
null
)
{
if
(
aclClass
==
null
)
{
LOG
.
warn
(
"Missing AclClass
..."
);
LOG
.
warn
(
"Missing AclClass
'{}'"
,
className
);
aclClass
=
new
AclClass
();
aclClass
=
new
AclClass
();
aclClass
.
setAclClass
(
className
);
aclClass
.
setAclClass
(
className
);
return
aclClassPersistence
.
save
(
aclClass
);
return
aclClassPersistence
.
save
(
aclClass
);
...
@@ -166,7 +166,7 @@ public class CustomAclServiceImpl implements CustomAclService {
...
@@ -166,7 +166,7 @@ public class CustomAclServiceImpl implements CustomAclService {
aclSid
.
setSid
(
uuid
);
aclSid
.
setSid
(
uuid
);
// save it into db
// save it into db
LOG
.
warn
(
"New SID
"
+
aclSid
);
LOG
.
warn
(
"New SID
sid={} principal={}"
,
aclSid
.
getSid
(),
aclSid
.
isPrincipal
()
);
return
aclSidPersistence
.
save
(
aclSid
);
return
aclSidPersistence
.
save
(
aclSid
);
}
}
...
@@ -292,7 +292,7 @@ public class CustomAclServiceImpl implements CustomAclService {
...
@@ -292,7 +292,7 @@ public class CustomAclServiceImpl implements CustomAclService {
aoi
.
setObjectIdIdentity
(
objectIdIdentity
);
aoi
.
setObjectIdIdentity
(
objectIdIdentity
);
aoi
.
setAclClass
(
ensureAclClass
(
className
));
aoi
.
setAclClass
(
ensureAclClass
(
className
));
// System user UUID
// System user UUID
final
String
uuid
=
SecurityContextUtil
.
getMe
().
get
Email
();
final
String
uuid
=
SecurityContextUtil
.
getMe
().
get
Uuid
();
final
AclSid
ownerSid
=
ensureSid
(
uuid
,
true
);
final
AclSid
ownerSid
=
ensureSid
(
uuid
,
true
);
aoi
.
setOwnerSid
(
ownerSid
);
aoi
.
setOwnerSid
(
ownerSid
);
aoi
=
aclObjectIdentityPersistence
.
save
(
aoi
);
aoi
=
aclObjectIdentityPersistence
.
save
(
aoi
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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