resoure service error
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/APIAuthentication.java b/src/main/java/de/ids_mannheim/korap/security/auth/APIAuthentication.java
index 69ef5bf..977f797 100644
--- a/src/main/java/de/ids_mannheim/korap/security/auth/APIAuthentication.java
+++ b/src/main/java/de/ids_mannheim/korap/security/auth/APIAuthentication.java
@@ -11,6 +11,7 @@
import de.ids_mannheim.korap.user.TokenContext;
import de.ids_mannheim.korap.user.User;
import de.ids_mannheim.korap.utils.NamingUtils;
+import de.ids_mannheim.korap.utils.StringUtils;
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;
@@ -46,7 +47,7 @@
Element ein = invalided.get(authToken);
if (e == null && ein == null) {
try {
- authToken = NamingUtils.stripTokenType(authToken);
+ authToken = StringUtils.stripTokenType(authToken);
context = signedToken.getTokenContext(authToken);
context.setTokenType(Attributes.API_AUTHENTICATION);
}
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/BasicHttpAuth.java b/src/main/java/de/ids_mannheim/korap/security/auth/BasicHttpAuth.java
index ccad916..8c1ad22 100644
--- a/src/main/java/de/ids_mannheim/korap/security/auth/BasicHttpAuth.java
+++ b/src/main/java/de/ids_mannheim/korap/security/auth/BasicHttpAuth.java
@@ -12,6 +12,7 @@
import de.ids_mannheim.korap.user.TokenContext;
import de.ids_mannheim.korap.user.User;
import de.ids_mannheim.korap.utils.NamingUtils;
+import de.ids_mannheim.korap.utils.StringUtils;
import org.apache.commons.codec.binary.Base64;
import org.apache.oltu.oauth2.common.utils.OAuthUtils;
@@ -25,17 +26,6 @@
public static String[] decode (String token) {
return OAuthUtils.decodeClientAuthenticationHeader(token);
-
- // String t = StringUtils.getTokenType(token);
- // if (t != null && t.toUpperCase()
- // .equals(Attributes.BASIC_AUTHENTICATION.toUpperCase())) {
- // token = StringUtils.stripTokenType(token);
- // String[] sp = new String(Base64.decodeBase64(token)).split(":", 2);
- // sp[0].replaceAll(" ", "");
- // sp[1].replaceAll(" ", "");
- // return sp;
- // }
- // return null;
}
@@ -68,7 +58,7 @@
c.setTokenType(Attributes.BASIC_AUTHENTICATION);
// todo: for production mode, set true
c.setSecureRequired(false);
- c.setToken(NamingUtils.stripTokenType(authToken));
+ c.setToken(StringUtils.stripTokenType(authToken));
// fixme: you can make queries, but user sensitive data is off limits?!
c.addContextParameter(Attributes.SCOPES,
Scopes.Scope.search.toString());
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 5c98f8f..f7387c4 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
@@ -14,6 +14,7 @@
import de.ids_mannheim.korap.interfaces.db.UserDataDbIface;
import de.ids_mannheim.korap.user.*;
import de.ids_mannheim.korap.utils.NamingUtils;
+import de.ids_mannheim.korap.utils.StringUtils;
import de.ids_mannheim.korap.utils.TimeUtils;
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheManager;
@@ -79,7 +80,7 @@
jlog.info("getting session status of token type '{}'",
token.split(" ")[0]);
AuthenticationIface provider = getProvider(
- NamingUtils.getTokenType(token), null);
+ StringUtils.getTokenType(token), null);
if (provider == null)
// throw exception for missing type paramter
@@ -398,7 +399,7 @@
StatusCodes.PASSWORD_RESET_FAILED);
try {
- user.setPassword(crypto.produceSecureHash(newPassword));
+ user.setPassword(crypto.secureHash(newPassword));
}
catch (NoSuchAlgorithmException | UnsupportedEncodingException e) {
// throw new KorAPException(StatusCodes.ILLEGAL_ARGUMENT,
@@ -431,7 +432,7 @@
}
try {
- safePass = crypto.produceSecureHash(safePass);
+ safePass = crypto.secureHash(safePass);
}
catch (NoSuchAlgorithmException | UnsupportedEncodingException e) {
jlog.error("Encoding/Algorithm Error", e);
@@ -514,7 +515,7 @@
(String) safeMap.get(Attributes.PASSWORD), Attributes.PASSWORD);
String hash;
try {
- hash = crypto.produceSecureHash(safePass);
+ hash = crypto.secureHash(safePass);
}
catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
jlog.error("Encryption error", e);
@@ -789,7 +790,7 @@
private String cache_key (String input) throws KustvaktException {
try {
- return crypto.hash(KEY + "@" + input);
+ return crypto.secureHash(KEY + "@" + input);
}
catch (Exception e) {
jlog.error("illegal cache key input '{}'", input);
diff --git a/src/main/java/de/ids_mannheim/korap/security/auth/OpenIDconnectAuthentication.java b/src/main/java/de/ids_mannheim/korap/security/auth/OpenIDconnectAuthentication.java
index e8de6c7..9515c93 100644
--- a/src/main/java/de/ids_mannheim/korap/security/auth/OpenIDconnectAuthentication.java
+++ b/src/main/java/de/ids_mannheim/korap/security/auth/OpenIDconnectAuthentication.java
@@ -12,6 +12,7 @@
import de.ids_mannheim.korap.user.TokenContext;
import de.ids_mannheim.korap.user.User;
import de.ids_mannheim.korap.utils.NamingUtils;
+import de.ids_mannheim.korap.utils.StringUtils;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;
import org.springframework.cache.annotation.CacheEvict;
@@ -41,7 +42,7 @@
@Override
public TokenContext getUserStatus (String authToken)
throws KustvaktException {
- authToken = NamingUtils.stripTokenType(authToken);
+ authToken = StringUtils.stripTokenType(authToken);
return this.database.getContext(authToken);
}