logging updates
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/ConditionManagement.java b/src/main/java/de/ids_mannheim/korap/security/ac/ConditionManagement.java
index 1e8dafc..c239f99 100644
--- a/src/main/java/de/ids_mannheim/korap/security/ac/ConditionManagement.java
+++ b/src/main/java/de/ids_mannheim/korap/security/ac/ConditionManagement.java
@@ -9,7 +9,6 @@
import de.ids_mannheim.korap.resources.Permissions;
import de.ids_mannheim.korap.security.PolicyCondition;
import de.ids_mannheim.korap.user.User;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,10 +20,8 @@
*/
public class ConditionManagement {
- private static final Logger errorLogger = LoggerFactory
- .getLogger(KustvaktLogger.ERROR_LOG);
- private static final Logger secErrorLogger = LoggerFactory
- .getLogger(KustvaktLogger.SECURITY_LOG);
+ private static final Logger jlog = LoggerFactory
+ .getLogger(ConditionManagement.class);
private User user;
private PolicyHandlerIface policydao;
@@ -50,7 +47,7 @@
== 1) {
policydao.addToCondition(usernames, condition, admin);
}else
- secErrorLogger.error("Users could not be added to condition '{}'",
+ jlog.error("Users could not be added to condition '{}'",
condition.getSpecifier());
}
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/PolicyDao.java b/src/main/java/de/ids_mannheim/korap/security/ac/PolicyDao.java
index ec611e7..378f087 100644
--- a/src/main/java/de/ids_mannheim/korap/security/ac/PolicyDao.java
+++ b/src/main/java/de/ids_mannheim/korap/security/ac/PolicyDao.java
@@ -13,10 +13,10 @@
import de.ids_mannheim.korap.user.Attributes;
import de.ids_mannheim.korap.user.User;
import de.ids_mannheim.korap.utils.BooleanUtils;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import de.ids_mannheim.korap.utils.StringUtils;
import de.ids_mannheim.korap.utils.TimeUtils;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ResultSetExtractor;
import org.springframework.jdbc.core.RowCallbackHandler;
@@ -38,8 +38,7 @@
// todo: transactions and exception management
public class PolicyDao implements PolicyHandlerIface {
- private static final Logger jlog = KustvaktLogger
- .getLogger(PolicyDao.class);
+ private static final Logger jlog = LoggerFactory.getLogger(PolicyDao.class);
private NamedParameterJdbcTemplate jdbcTemplate;
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/PolicyEvaluator.java b/src/main/java/de/ids_mannheim/korap/security/ac/PolicyEvaluator.java
index 745ef1f..4e6508a 100644
--- a/src/main/java/de/ids_mannheim/korap/security/ac/PolicyEvaluator.java
+++ b/src/main/java/de/ids_mannheim/korap/security/ac/PolicyEvaluator.java
@@ -8,9 +8,9 @@
import de.ids_mannheim.korap.security.SecurityPolicy;
import de.ids_mannheim.korap.user.KorAPUser;
import de.ids_mannheim.korap.user.User;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import edu.emory.mathcs.backport.java.util.Collections;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.List;
@@ -21,7 +21,7 @@
*/
public class PolicyEvaluator {
- private static final Logger jlog = KustvaktLogger
+ private static final Logger jlog = LoggerFactory
.getLogger(PolicyEvaluator.class);
private final User user;
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/ResourceFinder.java b/src/main/java/de/ids_mannheim/korap/security/ac/ResourceFinder.java
index d2607cc..53e1706 100755
--- a/src/main/java/de/ids_mannheim/korap/security/ac/ResourceFinder.java
+++ b/src/main/java/de/ids_mannheim/korap/security/ac/ResourceFinder.java
@@ -8,8 +8,8 @@
import de.ids_mannheim.korap.resources.ResourceFactory;
import de.ids_mannheim.korap.security.PermissionsBuffer;
import de.ids_mannheim.korap.user.User;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.*;
@@ -18,7 +18,7 @@
*/
public class ResourceFinder {
- private static final Logger log = KustvaktLogger
+ private static final Logger jlog = LoggerFactory
.getLogger(ResourceFinder.class);
private static PolicyHandlerIface policydao;
@@ -107,15 +107,16 @@
try {
T resource = (T) iface
.findbyId(c.getPersistentID(), this.user);
- PolicyEvaluator e = PolicyEvaluator
- .setFlags(user, resource);
- resource.setManaged(e.getFlag("managed", false));
- resources.add(resource);
+ if (resource != null) {
+ PolicyEvaluator e = PolicyEvaluator
+ .setFlags(user, resource);
+ resource.setManaged(e.getFlag("managed", false));
+ resources.add(resource);
+ }
}catch (KustvaktException e) {
// don't handle connection error or no handler registered!
- KustvaktLogger.ERROR_LOGGER
- .error("Error while retrieving containers '{}' ",
- this.containers);
+ jlog.error("Error while retrieving containers '{}' ",
+ this.containers);
return Collections.emptySet();
}
}
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/ResourceHandler.java b/src/main/java/de/ids_mannheim/korap/security/ac/ResourceHandler.java
index c3e3cee..85665c0 100644
--- a/src/main/java/de/ids_mannheim/korap/security/ac/ResourceHandler.java
+++ b/src/main/java/de/ids_mannheim/korap/security/ac/ResourceHandler.java
@@ -8,10 +8,10 @@
import de.ids_mannheim.korap.resources.Permissions;
import de.ids_mannheim.korap.resources.ResourceFactory;
import de.ids_mannheim.korap.user.User;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Collection;
@@ -23,7 +23,7 @@
@SuppressWarnings("all")
public class ResourceHandler {
- private static Logger log = KustvaktLogger.getLogger(ResourceHandler.class);
+ private static Logger jlog = LoggerFactory.getLogger(ResourceHandler.class);
public ResourceHandler() {
}
diff --git a/src/main/java/de/ids_mannheim/korap/security/ac/SecurityManager.java b/src/main/java/de/ids_mannheim/korap/security/ac/SecurityManager.java
index d1fc2b9..8fe09ad 100644
--- a/src/main/java/de/ids_mannheim/korap/security/ac/SecurityManager.java
+++ b/src/main/java/de/ids_mannheim/korap/security/ac/SecurityManager.java
@@ -14,8 +14,8 @@
import de.ids_mannheim.korap.security.PolicyCondition;
import de.ids_mannheim.korap.security.SecurityPolicy;
import de.ids_mannheim.korap.user.User;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.*;
@@ -32,9 +32,9 @@
public class SecurityManager<T extends KustvaktResource> {
// private static final Logger errorLogger = LoggerFactory
- // .getLogger(KustvaktLogger.ERROR_LOG);
+ // .getLogger(LoggerFactory.ERROR_LOG);
- private static final Logger jlog = KustvaktLogger
+ private static final Logger jlog = LoggerFactory
.getLogger(SecurityManager.class);
private static PolicyHandlerIface policydao;
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java b/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
index 9476fe7..854c81d 100644
--- a/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
+++ b/src/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java
@@ -11,7 +11,6 @@
import de.ids_mannheim.korap.interfaces.db.AuditingIface;
import de.ids_mannheim.korap.interfaces.db.EntityHandlerIface;
import de.ids_mannheim.korap.user.*;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import de.ids_mannheim.korap.utils.StringUtils;
import de.ids_mannheim.korap.utils.TimeUtils;
import net.sf.ehcache.Cache;
@@ -19,6 +18,7 @@
import net.sf.ehcache.Element;
import org.joda.time.DateTime;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.cache.annotation.CachePut;
import java.io.UnsupportedEncodingException;
@@ -35,7 +35,7 @@
public class KustvaktAuthenticationManager extends AuthenticationManagerIface {
private static String KEY = "kustvakt:key";
- private static Logger jlog = KustvaktLogger
+ private static Logger jlog = LoggerFactory
.getLogger(KustvaktAuthenticationManager.class);
private EncryptionIface crypto;
private EntityHandlerIface entHandler;
@@ -252,9 +252,9 @@
jlog.debug("Account is not yet activated for user '{}'",
user.getUsername());
if (TimeUtils.getNow().isAfter(param.getUriExpiration())) {
- KustvaktLogger.ERROR_LOGGER
- .error("URI token is expired. Deleting account for user {}",
- user.getUsername());
+ jlog.error(
+ "URI token is expired. Deleting account for user {}",
+ user.getUsername());
deleteAccount(user);
throw new WrappedException(
new KustvaktException(unknown.getId(),
@@ -268,9 +268,8 @@
StatusCodes.UNCONFIRMED_ACCOUNT),
StatusCodes.LOGIN_FAILED, username);
}
- KustvaktLogger.ERROR_LOGGER
- .error("ACCESS DENIED: account not active for '{}'",
- unknown.getUsername());
+ jlog.error("ACCESS DENIED: account not active for '{}'",
+ unknown.getUsername());
throw new WrappedException(
new KustvaktException(unknown.getId(),
StatusCodes.ACCOUNT_DEACTIVATED),
@@ -297,7 +296,7 @@
return null;
}catch (KustvaktException e) {
- KustvaktLogger.ERROR_LOGGER.error("KorAPException", e);
+ jlog.error("KorAPException", e);
throw new KustvaktException(username, StatusCodes.ILLEGAL_ARGUMENT,
"username invalid", username);
}
@@ -329,8 +328,7 @@
try {
this.lockAccount(user);
}catch (KustvaktException e) {
- KustvaktLogger.ERROR_LOGGER
- .error("user account could not be locked!", e);
+ jlog.error("user account could not be locked!", e);
throw new WrappedException(e,
StatusCodes.UPDATE_ACCOUNT_FAILED);
}
@@ -390,7 +388,7 @@
safeUser = crypto.validateString(username);
safePass = crypto.validatePassphrase(newPassphrase);
}catch (KustvaktException e) {
- KustvaktLogger.ERROR_LOGGER.error("Error", e);
+ jlog.error("Error", e);
throw new WrappedException(new KustvaktException(username,
StatusCodes.ILLEGAL_ARGUMENT, "password invalid",
newPassphrase), StatusCodes.PASSWORD_RESET_FAILED, username,
@@ -400,7 +398,7 @@
try {
safePass = crypto.produceSecureHash(safePass);
}catch (NoSuchAlgorithmException | UnsupportedEncodingException e) {
- KustvaktLogger.ERROR_LOGGER.error("Encoding/Algorithm Error", e);
+ jlog.error("Encoding/Algorithm Error", e);
throw new WrappedException(new KustvaktException(username,
StatusCodes.ILLEGAL_ARGUMENT, "password invalid",
newPassphrase), StatusCodes.PASSWORD_RESET_FAILED, username,
@@ -424,7 +422,7 @@
try {
safeUser = crypto.validateString(username);
}catch (KustvaktException e) {
- KustvaktLogger.ERROR_LOGGER.error("error", e);
+ jlog.error("error", e);
throw new WrappedException(e,
StatusCodes.ACCOUNT_CONFIRMATION_FAILED, username,
uriFragment);
@@ -476,7 +474,7 @@
try {
hash = crypto.produceSecureHash(safePass);
}catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
- KustvaktLogger.ERROR_LOGGER.error("Encryption error", e);
+ jlog.error("Encryption error", e);
throw new KustvaktException(StatusCodes.ILLEGAL_ARGUMENT);
}
@@ -579,7 +577,7 @@
try {
result = entHandler.updateAccount(user) > 0;
}catch (KustvaktException e) {
- KustvaktLogger.ERROR_LOGGER.error("Error ", e);
+ jlog.error("Error ", e);
throw new WrappedException(e,
StatusCodes.UPDATE_ACCOUNT_FAILED);
}
@@ -601,7 +599,7 @@
try {
result = entHandler.deleteAccount(user.getId()) > 0;
}catch (KustvaktException e) {
- KustvaktLogger.ERROR_LOGGER.error("Error ", e);
+ jlog.error("Error ", e);
throw new WrappedException(e,
StatusCodes.DELETE_ACCOUNT_FAILED);
}
@@ -648,7 +646,7 @@
try {
entHandler.updateAccount(user);
}catch (KustvaktException e) {
- KustvaktLogger.ERROR_LOGGER.error("Error ", e);
+ jlog.error("Error ", e);
throw new WrappedException(e, StatusCodes.PASSWORD_RESET_FAILED);
}
return new Object[] { uritoken,
@@ -664,7 +662,7 @@
try {
entHandler.updateSettings(settings);
}catch (KustvaktException e) {
- KustvaktLogger.ERROR_LOGGER.error("Error ", e);
+ jlog.error("Error ", e);
throw new WrappedException(e,
StatusCodes.UPDATE_ACCOUNT_FAILED);
}
@@ -680,7 +678,7 @@
try {
entHandler.updateUserDetails(details);
}catch (KustvaktException e) {
- KustvaktLogger.ERROR_LOGGER.error("Error ", e);
+ jlog.error("Error ", e);
throw new WrappedException(e,
StatusCodes.UPDATE_ACCOUNT_FAILED);
}
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/LoginCounter.java b/src/main/java/de/ids_mannheim/korap/security/auth/LoginCounter.java
index 62bf939..7f6ae2d 100644
--- a/src/main/java/de/ids_mannheim/korap/security/auth/LoginCounter.java
+++ b/src/main/java/de/ids_mannheim/korap/security/auth/LoginCounter.java
@@ -1,9 +1,9 @@
package de.ids_mannheim.korap.security.auth;
import de.ids_mannheim.korap.config.KustvaktConfiguration;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import de.ids_mannheim.korap.utils.TimeUtils;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Arrays;
import java.util.HashMap;
@@ -15,7 +15,7 @@
*/
public class LoginCounter {
- private static Logger jlog = KustvaktLogger.getLogger(LoginCounter.class);
+ private static Logger jlog = LoggerFactory.getLogger(LoginCounter.class);
private final Map<String, Long[]> failedLogins;
private KustvaktConfiguration config;
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/SessionAuthentication.java b/src/main/java/de/ids_mannheim/korap/security/auth/SessionAuthentication.java
index c02e2c8..3a74954 100644
--- a/src/main/java/de/ids_mannheim/korap/security/auth/SessionAuthentication.java
+++ b/src/main/java/de/ids_mannheim/korap/security/auth/SessionAuthentication.java
@@ -8,10 +8,10 @@
import de.ids_mannheim.korap.user.Attributes;
import de.ids_mannheim.korap.user.TokenContext;
import de.ids_mannheim.korap.user.User;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import de.ids_mannheim.korap.utils.TimeUtils;
import org.joda.time.DateTime;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Map;
import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -25,7 +25,7 @@
*/
public class SessionAuthentication implements AuthenticationIface {
- private static Logger jlog = KustvaktLogger
+ private static Logger jlog = LoggerFactory
.getLogger(SessionAuthentication.class);
private SessionFactory sessions;
private ScheduledThreadPoolExecutor scheduled;
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/SessionFactory.java b/src/main/java/de/ids_mannheim/korap/security/auth/SessionFactory.java
index b663479..426d594 100644
--- a/src/main/java/de/ids_mannheim/korap/security/auth/SessionFactory.java
+++ b/src/main/java/de/ids_mannheim/korap/security/auth/SessionFactory.java
@@ -5,10 +5,10 @@
import de.ids_mannheim.korap.user.DemoUser;
import de.ids_mannheim.korap.user.TokenContext;
import de.ids_mannheim.korap.utils.ConcurrentMultiMap;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import de.ids_mannheim.korap.utils.TimeUtils;
import org.joda.time.DateTime;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
@@ -27,7 +27,7 @@
*/
public class SessionFactory implements Runnable {
- private static Logger jlog = KustvaktLogger.getLogger(SessionFactory.class);
+ private static Logger jlog = LoggerFactory.getLogger(SessionFactory.class);
private final ConcurrentMap<String, TokenContext> sessionsObject;
private final ConcurrentMap<String, DateTime> timeCheck;