You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/08/23 11:47:09 UTC
syncope git commit: [SYNCOPE-938] Base64 encoder (not MIME encoder)
is required for cookies
Repository: syncope
Updated Branches:
refs/heads/master 4759ad8ea -> 183be626f
[SYNCOPE-938] Base64 encoder (not MIME encoder) is required for cookies
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/183be626
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/183be626
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/183be626
Branch: refs/heads/master
Commit: 183be626f4e439a60181f14c56247eec5e4a27bf
Parents: 4759ad8
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Aug 23 13:47:04 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Aug 23 13:47:04 2017 +0200
----------------------------------------------------------------------
.../syncope/client/console/PreferenceManager.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/183be626/client/console/src/main/java/org/apache/syncope/client/console/PreferenceManager.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/PreferenceManager.java b/client/console/src/main/java/org/apache/syncope/client/console/PreferenceManager.java
index 5df1e4b..473e024 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/PreferenceManager.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/PreferenceManager.java
@@ -25,6 +25,7 @@ import java.io.Serializable;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -34,7 +35,6 @@ import org.apache.wicket.request.Request;
import org.apache.wicket.request.Response;
import org.apache.wicket.util.cookies.CookieDefaults;
import org.apache.wicket.util.cookies.CookieUtils;
-import org.apache.wicket.util.crypt.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -95,7 +95,7 @@ public class PreferenceManager implements Serializable {
String prefString = COOKIE_UTILS.load(COOKIE_NAME);
if (prefString != null) {
- final Map<String, String> prefs = getPrefs(new String(Base64.decodeBase64(prefString.getBytes())));
+ Map<String, String> prefs = getPrefs(new String(Base64.getDecoder().decode(prefString.getBytes())));
result = prefs.get(key);
}
@@ -131,16 +131,16 @@ public class PreferenceManager implements Serializable {
String prefString = COOKIE_UTILS.load(COOKIE_NAME);
if (prefString != null) {
- current.putAll(getPrefs(new String(Base64.decodeBase64(prefString.getBytes()))));
+ current.putAll(getPrefs(new String(Base64.getDecoder().decode(prefString.getBytes()))));
}
// after retrieved previous setting in order to overwrite the key ...
- for (Map.Entry<String, List<String>> entry : prefs.entrySet()) {
+ prefs.entrySet().forEach(entry -> {
current.put(entry.getKey(), StringUtils.join(entry.getValue(), ";"));
- }
+ });
try {
- COOKIE_UTILS.save(COOKIE_NAME, new String(Base64.encodeBase64(setPrefs(current).getBytes())));
+ COOKIE_UTILS.save(COOKIE_NAME, Base64.getEncoder().encodeToString(setPrefs(current).getBytes()));
} catch (IOException e) {
LOG.error("Could not save {} info: {}", getClass().getSimpleName(), current, e);
}
@@ -151,14 +151,14 @@ public class PreferenceManager implements Serializable {
final Map<String, String> current = new HashMap<>();
if (prefString != null) {
- current.putAll(getPrefs(new String(Base64.decodeBase64(prefString.getBytes()))));
+ current.putAll(getPrefs(new String(Base64.getDecoder().decode(prefString.getBytes()))));
}
// after retrieved previous setting in order to overwrite the key ...
current.put(key, value);
try {
- COOKIE_UTILS.save(COOKIE_NAME, new String(Base64.encodeBase64(setPrefs(current).getBytes())));
+ COOKIE_UTILS.save(COOKIE_NAME, Base64.getEncoder().encodeToString(setPrefs(current).getBytes()));
} catch (IOException e) {
LOG.error("Could not save {} info: {}", getClass().getSimpleName(), current, e);
}