treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

security-util UserRoleVerification поправил логи

Browse source
This commit is contained in:
AKurakin 2023-11-24 19:04:55 +03:00
parent 4bcc725c26
commit 793171b3da
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
clearing-parent/security-util/src/main/java/ru/spcex/clearing/util/security/UserRoleVerification.java
View file

@ -77,26 +77,32 @@ public class UserRoleVerification {
public void validateRoleAndThrow(BaseRequest<?> req) throws ValidationException { public void validateRoleAndThrow(BaseRequest<?> req) throws ValidationException {
Objects.requireNonNull(roleForVerification); Objects.requireNonNull(roleForVerification);
Long requesterId = req.getUserId(); Long requesterId = req.getUserId();
if (requesterId != null && !userHasRole(requesterId, roleForVerification)) { if (requesterId == null) {
log.trace("User {} has no role to allow this action", requesterId);
throw new ValidationException(roleVerificationError);
} else {
log.trace("Request without userId"); log.trace("Request without userId");
} else {
if (!userHasRole(requesterId, roleForVerification)) {
log.trace("User {} has no role to allow this action", requesterId);
throw new ValidationException(roleVerificationError);
}
} }
} }
public RequestInfoUpdate validateRoleAndGetResult(BaseRequest<?> req) { public RequestInfoUpdate validateRoleAndGetResult(BaseRequest<?> req) {
Objects.requireNonNull(roleForVerification); Objects.requireNonNull(roleForVerification);
Long requesterId = req.getUserId(); Long requesterId = req.getUserId();
if (requesterId != null && !userHasRole(requesterId, roleForVerification)) { if (requesterId == null) {
String errMsg = messageResolver.resolve(new EnumMessage(roleVerificationError, requesterId));
log.info("User {} has no role: {}", requesterId, errMsg);
return new RequestInfoUpdate()
.setId(req.getId())
.setStatus(ru.spcex.clearing.platform.messaging.service.Status.Error)
.setMessage(errMsg);
} else {
log.debug("Request without userId"); log.debug("Request without userId");
} else {
if (!userHasRole(requesterId, roleForVerification)) {
String errMsg = messageResolver.resolve(new EnumMessage(roleVerificationError, requesterId));
log.info("User {} has no role: {}", requesterId, errMsg);
return new RequestInfoUpdate()
.setId(req.getId())
.setStatus(ru.spcex.clearing.platform.messaging.service.Status.Error)
.setMessage(errMsg);
} else {
log.trace("Request validateRoleAndGetResult for userId={} success", requesterId);
}
} }
return null; return null;
} }