Removed salt from config and updated config files.
Change-Id: Idfd066f0e56f5e5568325e5ea6072fb12c551ff2
diff --git a/core/Changes b/core/Changes
index 8589452..a315367 100644
--- a/core/Changes
+++ b/core/Changes
@@ -1,3 +1,7 @@
+# version 0.62.4
+24/01/2020
+ - Removed salt from config and updated config files.
+
# version 0.62.3
03/12/2019
- Implemented pipe extension in the search API (margaretha)
diff --git a/core/pom.xml b/core/pom.xml
index be3b949..05faeee 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.ids_mannheim.korap</groupId>
<artifactId>Kustvakt-core</artifactId>
- <version>0.62.3</version>
+ <version>0.62.4</version>
<properties>
<java.version>1.8</java.version>
@@ -240,7 +240,7 @@
<dependency>
<groupId>de.ids_mannheim.korap</groupId>
<artifactId>Koral</artifactId>
- <version>[0.35,)</version>
+ <version>[0.36,)</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
@@ -298,7 +298,7 @@
<dependency>
<groupId>de.ids_mannheim.korap</groupId>
<artifactId>Krill</artifactId>
- <version>[0.59.0,)</version>
+ <version>[0.59.1,)</version>
<exclusions>
<exclusion>
<groupId>org.glassfish.jersey.containers</groupId>
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java b/core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
index 26075d1..f66f196 100644
--- a/core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
+++ b/core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
@@ -72,7 +72,6 @@
private int tokenTTL;
private int shortTokenTTL;
private String[] rewrite_strategies;
- private String passcodeSaltField;
private String default_pos;
private String default_morphology;
@@ -197,10 +196,6 @@
properties.getProperty("security.tokenTTL", "72H"));
shortTokenTTL = TimeUtils.convertTimeToSeconds(
properties.getProperty("security.shortTokenTTL", "3H"));
-
- // passcodeSaltField =
- // properties.getProperty("security.passcode.salt",
- // "accountCreation");
}
@Deprecated
diff --git a/core/src/main/java/de/ids_mannheim/korap/constant/AuthenticationMethod.java b/core/src/main/java/de/ids_mannheim/korap/constant/AuthenticationMethod.java
index 7c7dbae..cbdc07f 100644
--- a/core/src/main/java/de/ids_mannheim/korap/constant/AuthenticationMethod.java
+++ b/core/src/main/java/de/ids_mannheim/korap/constant/AuthenticationMethod.java
@@ -10,5 +10,9 @@
*
*/
public enum AuthenticationMethod {
- LDAP, SHIBBOLETH, DATABASE, TEST;
+ LDAP,
+ // not available
+ SHIBBOLETH, DATABASE,
+ // by pass authentication for testing
+ TEST;
}
diff --git a/core/src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java
index 134ebdb..46f519a 100644
--- a/core/src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java
+++ b/core/src/main/java/de/ids_mannheim/korap/interfaces/EncryptionIface.java
@@ -26,8 +26,7 @@
throws KustvaktException;
- public String secureHash (String input) throws NoSuchAlgorithmException,
- UnsupportedEncodingException, KustvaktException;
+ public String secureHash (String input);
/**