Closes #2289 - fix Sonarcloud vulnerabilities and bugs
This commit is contained in:
parent
208ee77474
commit
f7c7ad2667
|
@ -179,11 +179,8 @@ public class ClassificationServiceImpl implements ClassificationService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Classification createClassification(Classification classification)
|
public Classification createClassification(Classification classification)
|
||||||
throws ClassificationAlreadyExistException,
|
throws ClassificationAlreadyExistException, DomainNotFoundException, InvalidArgumentException,
|
||||||
DomainNotFoundException,
|
MalformedServiceLevelException, NotAuthorizedException {
|
||||||
InvalidArgumentException,
|
|
||||||
MalformedServiceLevelException,
|
|
||||||
NotAuthorizedException {
|
|
||||||
taskanaEngine.getEngine().checkRoleMembership(TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
|
taskanaEngine.getEngine().checkRoleMembership(TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
|
||||||
if (!taskanaEngine.domainExists(classification.getDomain())
|
if (!taskanaEngine.domainExists(classification.getDomain())
|
||||||
&& !MASTER_DOMAIN.equals(classification.getDomain())) {
|
&& !MASTER_DOMAIN.equals(classification.getDomain())) {
|
||||||
|
@ -222,7 +219,9 @@ public class ClassificationServiceImpl implements ClassificationService {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (LOGGER.isDebugEnabled()) {
|
if (LOGGER.isDebugEnabled()) {
|
||||||
LOGGER.debug("Method createClassification created classification {}.", classificationImpl);
|
LOGGER.debug(
|
||||||
|
"Method createClassification created classification {}.",
|
||||||
|
LogSanitizer.stripLineBreakingChars(classificationImpl));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!classification.getDomain().isEmpty()) {
|
if (!classification.getDomain().isEmpty()) {
|
||||||
|
@ -236,11 +235,8 @@ public class ClassificationServiceImpl implements ClassificationService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Classification updateClassification(Classification classification)
|
public Classification updateClassification(Classification classification)
|
||||||
throws ConcurrencyException,
|
throws ConcurrencyException, ClassificationNotFoundException, InvalidArgumentException,
|
||||||
ClassificationNotFoundException,
|
MalformedServiceLevelException, NotAuthorizedException {
|
||||||
InvalidArgumentException,
|
|
||||||
MalformedServiceLevelException,
|
|
||||||
NotAuthorizedException {
|
|
||||||
taskanaEngine.getEngine().checkRoleMembership(TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
|
taskanaEngine.getEngine().checkRoleMembership(TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
|
||||||
ClassificationImpl classificationImpl;
|
ClassificationImpl classificationImpl;
|
||||||
try {
|
try {
|
||||||
|
@ -283,7 +279,8 @@ public class ClassificationServiceImpl implements ClassificationService {
|
||||||
}
|
}
|
||||||
if (LOGGER.isDebugEnabled()) {
|
if (LOGGER.isDebugEnabled()) {
|
||||||
LOGGER.debug(
|
LOGGER.debug(
|
||||||
"Method updateClassification() updated the classification {}.", classificationImpl);
|
"Method updateClassification() updated the classification {}.",
|
||||||
|
LogSanitizer.stripLineBreakingChars(classificationImpl));
|
||||||
}
|
}
|
||||||
return classification;
|
return classification;
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
@ -16,6 +16,7 @@ import pro.taskana.common.api.TaskanaRole;
|
||||||
import pro.taskana.common.api.exceptions.InvalidArgumentException;
|
import pro.taskana.common.api.exceptions.InvalidArgumentException;
|
||||||
import pro.taskana.common.api.exceptions.NotAuthorizedException;
|
import pro.taskana.common.api.exceptions.NotAuthorizedException;
|
||||||
import pro.taskana.common.internal.InternalTaskanaEngine;
|
import pro.taskana.common.internal.InternalTaskanaEngine;
|
||||||
|
import pro.taskana.common.internal.util.LogSanitizer;
|
||||||
import pro.taskana.user.api.UserService;
|
import pro.taskana.user.api.UserService;
|
||||||
import pro.taskana.user.api.exceptions.UserAlreadyExistException;
|
import pro.taskana.user.api.exceptions.UserAlreadyExistException;
|
||||||
import pro.taskana.user.api.exceptions.UserNotFoundException;
|
import pro.taskana.user.api.exceptions.UserNotFoundException;
|
||||||
|
@ -103,7 +104,9 @@ public class UserServiceImpl implements UserService {
|
||||||
((UserImpl) userToCreate).setDomains(determineDomains(userToCreate));
|
((UserImpl) userToCreate).setDomains(determineDomains(userToCreate));
|
||||||
|
|
||||||
if (LOGGER.isDebugEnabled()) {
|
if (LOGGER.isDebugEnabled()) {
|
||||||
LOGGER.debug("Method createUser() created User '{}'.", userToCreate);
|
LOGGER.debug(
|
||||||
|
"Method createUser() created User '{}'.",
|
||||||
|
LogSanitizer.stripLineBreakingChars(userToCreate));
|
||||||
}
|
}
|
||||||
return userToCreate;
|
return userToCreate;
|
||||||
}
|
}
|
||||||
|
@ -127,7 +130,9 @@ public class UserServiceImpl implements UserService {
|
||||||
((UserImpl) userToUpdate).setDomains(determineDomains(userToUpdate));
|
((UserImpl) userToUpdate).setDomains(determineDomains(userToUpdate));
|
||||||
|
|
||||||
if (LOGGER.isDebugEnabled()) {
|
if (LOGGER.isDebugEnabled()) {
|
||||||
LOGGER.debug("Method updateUser() updated User '{}'.", userToUpdate);
|
LOGGER.debug(
|
||||||
|
"Method updateUser() updated User '{}'.",
|
||||||
|
LogSanitizer.stripLineBreakingChars(userToUpdate));
|
||||||
}
|
}
|
||||||
|
|
||||||
return userToUpdate;
|
return userToUpdate;
|
||||||
|
|
|
@ -24,6 +24,7 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException;
|
||||||
import pro.taskana.common.api.exceptions.TaskanaException;
|
import pro.taskana.common.api.exceptions.TaskanaException;
|
||||||
import pro.taskana.common.internal.InternalTaskanaEngine;
|
import pro.taskana.common.internal.InternalTaskanaEngine;
|
||||||
import pro.taskana.common.internal.util.IdGenerator;
|
import pro.taskana.common.internal.util.IdGenerator;
|
||||||
|
import pro.taskana.common.internal.util.LogSanitizer;
|
||||||
import pro.taskana.common.internal.util.ObjectAttributeChangeDetector;
|
import pro.taskana.common.internal.util.ObjectAttributeChangeDetector;
|
||||||
import pro.taskana.spi.history.api.events.workbasket.WorkbasketAccessItemCreatedEvent;
|
import pro.taskana.spi.history.api.events.workbasket.WorkbasketAccessItemCreatedEvent;
|
||||||
import pro.taskana.spi.history.api.events.workbasket.WorkbasketAccessItemDeletedEvent;
|
import pro.taskana.spi.history.api.events.workbasket.WorkbasketAccessItemDeletedEvent;
|
||||||
|
@ -644,8 +645,8 @@ public class WorkbasketServiceImpl implements WorkbasketService {
|
||||||
LOGGER.debug(
|
LOGGER.debug(
|
||||||
"Method setDistributionTargets() created distribution target "
|
"Method setDistributionTargets() created distribution target "
|
||||||
+ "for source '{}' and target {}",
|
+ "for source '{}' and target {}",
|
||||||
sourceWorkbasketId,
|
LogSanitizer.stripLineBreakingChars(sourceWorkbasketId),
|
||||||
targetId);
|
LogSanitizer.stripLineBreakingChars(targetId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ public class TaskanaTestController {
|
||||||
NotAuthorizedException {
|
NotAuthorizedException {
|
||||||
taskanaEngine.getWorkbasketService().createWorkbasket(createWorkBasket("key", "workbasket"));
|
taskanaEngine.getWorkbasketService().createWorkbasket(createWorkBasket("key", "workbasket"));
|
||||||
|
|
||||||
int workbaskets = getWorkbaskets();
|
Integer workbaskets = getWorkbaskets();
|
||||||
if (Boolean.parseBoolean(rollback)) {
|
if (Boolean.parseBoolean(rollback)) {
|
||||||
throw new RuntimeException();
|
throw new RuntimeException();
|
||||||
} else {
|
} else {
|
||||||
|
@ -113,12 +113,12 @@ public class TaskanaTestController {
|
||||||
return "cleaned workbasket and test tables";
|
return "cleaned workbasket and test tables";
|
||||||
}
|
}
|
||||||
|
|
||||||
private int getWorkbaskets() {
|
private Integer getWorkbaskets() {
|
||||||
// return taskanaEngine.getWorkbasketService().getWorkbaskets().size();
|
// return taskanaEngine.getWorkbasketService().getWorkbaskets().size();
|
||||||
return jdbcTemplate.queryForObject("SELECT COUNT(*) FROM WORKBASKET", Integer.class);
|
return jdbcTemplate.queryForObject("SELECT COUNT(*) FROM WORKBASKET", Integer.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
private int getCustomdbTests() {
|
private Integer getCustomdbTests() {
|
||||||
return jdbcTemplate.queryForObject("SELECT COUNT(*) FROM CUSTOMDB.TEST", Integer.class);
|
return jdbcTemplate.queryForObject("SELECT COUNT(*) FROM CUSTOMDB.TEST", Integer.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html xmlns:th="http://www.thymeleaf.org">
|
<html xmlns:th="http://www.thymeleaf.org" lang="en">
|
||||||
<head>
|
<head>
|
||||||
<link rel="icon" type="image/x-icon" th:href="@{/img/logo.png}">
|
<link rel="icon" type="image/x-icon" th:href="@{/img/logo.png}">
|
||||||
<title>Taskana login</title>
|
<title>Taskana login</title>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html xmlns:th="http://www.thymeleaf.org">
|
<html xmlns:th="http://www.thymeleaf.org" lang="en">
|
||||||
<head>
|
<head>
|
||||||
<link rel="icon" type="image/x-icon" th:href="@{/img/logo.png}">
|
<link rel="icon" type="image/x-icon" th:href="@{/img/logo.png}">
|
||||||
<title>Taskana login</title>
|
<title>Taskana login</title>
|
||||||
|
|
|
@ -31,6 +31,7 @@ import pro.taskana.TaskanaConfiguration;
|
||||||
import pro.taskana.common.api.TaskanaRole;
|
import pro.taskana.common.api.TaskanaRole;
|
||||||
import pro.taskana.common.api.exceptions.InvalidArgumentException;
|
import pro.taskana.common.api.exceptions.InvalidArgumentException;
|
||||||
import pro.taskana.common.api.exceptions.SystemException;
|
import pro.taskana.common.api.exceptions.SystemException;
|
||||||
|
import pro.taskana.common.internal.util.LogSanitizer;
|
||||||
import pro.taskana.common.rest.models.AccessIdRepresentationModel;
|
import pro.taskana.common.rest.models.AccessIdRepresentationModel;
|
||||||
import pro.taskana.user.api.models.User;
|
import pro.taskana.user.api.models.User;
|
||||||
import pro.taskana.user.internal.models.UserImpl;
|
import pro.taskana.user.internal.models.UserImpl;
|
||||||
|
@ -92,7 +93,7 @@ public class LdapClient {
|
||||||
|
|
||||||
LOGGER.debug(
|
LOGGER.debug(
|
||||||
"entry to searchUsersByNameOrAccessIdInUserRoleGroups(nameOrAccessId = {}).",
|
"entry to searchUsersByNameOrAccessIdInUserRoleGroups(nameOrAccessId = {}).",
|
||||||
nameOrAccessId);
|
LogSanitizer.stripLineBreakingChars(nameOrAccessId));
|
||||||
|
|
||||||
isInitOrFail();
|
isInitOrFail();
|
||||||
testMinSearchForLength(nameOrAccessId);
|
testMinSearchForLength(nameOrAccessId);
|
||||||
|
@ -261,11 +262,12 @@ public class LdapClient {
|
||||||
andFilter.and(orFilter);
|
andFilter.and(orFilter);
|
||||||
|
|
||||||
String[] userAttributesToReturn = {getUserIdAttribute(), getGroupNameAttribute()};
|
String[] userAttributesToReturn = {getUserIdAttribute(), getGroupNameAttribute()};
|
||||||
|
if (LOGGER.isDebugEnabled()) {
|
||||||
LOGGER.debug(
|
LOGGER.debug(
|
||||||
"Using filter '{}' for LDAP query with group search base {}.",
|
"Using filter '{}' for LDAP query with group search base {}.",
|
||||||
andFilter,
|
andFilter,
|
||||||
getGroupSearchBase());
|
getGroupSearchBase());
|
||||||
|
}
|
||||||
|
|
||||||
return ldapTemplate.search(
|
return ldapTemplate.search(
|
||||||
getGroupSearchBase(),
|
getGroupSearchBase(),
|
||||||
|
|
|
@ -138,11 +138,11 @@ public class ReportRepresentationModelAssembler {
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
public ReportRepresentationModel toModel(
|
public ReportRepresentationModel toModel(
|
||||||
@NonNull TaskStatusReport report,
|
TaskStatusReport report,
|
||||||
@NonNull List<String> domain,
|
List<String> domain,
|
||||||
@NonNull List<TaskState> state,
|
List<TaskState> state,
|
||||||
@NonNull List<String> workbasketIds,
|
List<String> workbasketIds,
|
||||||
@NonNull Integer priorityMinimum)
|
Integer priorityMinimum)
|
||||||
throws NotAuthorizedException {
|
throws NotAuthorizedException {
|
||||||
ReportRepresentationModel resource = toReportResource(report);
|
ReportRepresentationModel resource = toReportResource(report);
|
||||||
resource.add(
|
resource.add(
|
||||||
|
|
Loading…
Reference in New Issue