Removed salt from config and updated config files.
Change-Id: Idfd066f0e56f5e5568325e5ea6072fb12c551ff2
diff --git a/full/src/main/java/de/ids_mannheim/korap/encryption/DefaultEncryption.java b/full/src/main/java/de/ids_mannheim/korap/encryption/DefaultEncryption.java
index 0f18f20..aaee8d2 100644
--- a/full/src/main/java/de/ids_mannheim/korap/encryption/DefaultEncryption.java
+++ b/full/src/main/java/de/ids_mannheim/korap/encryption/DefaultEncryption.java
@@ -1,16 +1,12 @@
package de.ids_mannheim.korap.encryption;
-import de.ids_mannheim.korap.config.ContextHolder;
+import java.math.BigInteger;
+import java.security.SecureRandom;
+
import de.ids_mannheim.korap.config.Configurable;
+import de.ids_mannheim.korap.config.ContextHolder;
import de.ids_mannheim.korap.exceptions.KustvaktException;
import de.ids_mannheim.korap.interfaces.EncryptionIface;
-import de.ids_mannheim.korap.user.User;
-
-import java.io.UnsupportedEncodingException;
-import java.math.BigInteger;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.util.Map;
/**
* @author hanl
@@ -35,8 +31,7 @@
@Override
- public String secureHash (String input) throws NoSuchAlgorithmException,
- UnsupportedEncodingException, KustvaktException {
+ public String secureHash (String input) {
return null;
}
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ClientService.java b/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ClientService.java
index cfe962d..b6d7e2b 100644
--- a/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ClientService.java
+++ b/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ClientService.java
@@ -119,8 +119,7 @@
// specific device.
secret = codeGenerator.createRandomCode();
- secretHashcode = encryption.secureHash(secret,
- config.getPasscodeSaltField());
+ secretHashcode = encryption.secureHash(secret);
}
String id = codeGenerator.createRandomCode();
@@ -245,8 +244,7 @@
|| client.getRegisteredBy().equals(username)) {
String secret = codeGenerator.createRandomCode();
- String secretHashcode = encryption.secureHash(secret,
- config.getPasscodeSaltField());
+ String secretHashcode = encryption.secureHash(secret);
client.setSecret(secretHashcode);
clientDao.updateClient(client);
@@ -291,8 +289,7 @@
OAuth2Error.INVALID_CLIENT);
}
}
- else if (!encryption.checkHash(clientSecret, client.getSecret(),
- config.getPasscodeSaltField())) {
+ else if (!encryption.checkHash(clientSecret, client.getSecret())) {
throw new KustvaktException(
StatusCodes.CLIENT_AUTHENTICATION_FAILED,
"Invalid client credentials", OAuth2Error.INVALID_CLIENT);