diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java index 1cfee224e..6b7a88cf9 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java @@ -238,7 +238,7 @@ public class AdminGroupAction extends FessAdminAction { switch (form.crudMode) { case CrudMode.CREATE: return OptionalEntity.of(new Group()).map(entity -> { - entity.setId(Base64.getEncoder().encodeToString(form.name.getBytes(Constants.CHARSET_UTF_8))); + entity.setId(Base64.getUrlEncoder().encodeToString(form.name.getBytes(Constants.CHARSET_UTF_8))); return entity; }); case CrudMode.EDIT: diff --git a/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java b/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java index 0763bdabf..452ee9e2e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java @@ -83,7 +83,7 @@ public class AdminLogAction extends FessAdminAction { stream.filter(entry -> entry.getFileName().toString().endsWith(".log")).forEach(filePath -> { final Map map = new HashMap<>(); final String name = filePath.getFileName().toString(); - map.put("id", Base64.getEncoder().encodeToString(name.getBytes(StandardCharsets.UTF_8))); + map.put("id", Base64.getUrlEncoder().encodeToString(name.getBytes(StandardCharsets.UTF_8))); map.put("name", name); try { map.put("lastModified", new Date(Files.getLastModifiedTime(filePath).toMillis())); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java index db6434c5f..fa97b123c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java @@ -192,7 +192,7 @@ public class AdminRoleAction extends FessAdminAction { switch (form.crudMode) { case CrudMode.CREATE: return OptionalEntity.of(new Role()).map(entity -> { - entity.setId(Base64.getEncoder().encodeToString(form.name.getBytes(Constants.CHARSET_UTF_8))); + entity.setId(Base64.getUrlEncoder().encodeToString(form.name.getBytes(Constants.CHARSET_UTF_8))); return entity; }); case CrudMode.EDIT: diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java index d9330c5bd..65299101f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java @@ -267,7 +267,7 @@ public class AdminUserAction extends FessAdminAction { switch (form.crudMode) { case CrudMode.CREATE: return OptionalEntity.of(new User()).map(entity -> { - entity.setId(Base64.getEncoder().encodeToString(form.name.getBytes(Constants.CHARSET_UTF_8))); + entity.setId(Base64.getUrlEncoder().encodeToString(form.name.getBytes(Constants.CHARSET_UTF_8))); return entity; }); case CrudMode.EDIT: diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryCreator.java b/src/main/java/org/codelibs/fess/dict/DictionaryCreator.java index 8b89ebf1e..e88c3b17c 100644 --- a/src/main/java/org/codelibs/fess/dict/DictionaryCreator.java +++ b/src/main/java/org/codelibs/fess/dict/DictionaryCreator.java @@ -39,7 +39,7 @@ public abstract class DictionaryCreator { } protected String encodePath(final String path) { - return Base64.getEncoder().encodeToString(path.getBytes(Constants.CHARSET_UTF_8)); + return Base64.getUrlEncoder().encodeToString(path.getBytes(Constants.CHARSET_UTF_8)); } protected boolean isTarget(final String path) { diff --git a/src/main/java/org/codelibs/fess/ldap/LdapManager.java b/src/main/java/org/codelibs/fess/ldap/LdapManager.java index 4106a74f1..f7bd3138b 100644 --- a/src/main/java/org/codelibs/fess/ldap/LdapManager.java +++ b/src/main/java/org/codelibs/fess/ldap/LdapManager.java @@ -333,9 +333,9 @@ public class LdapManager { processSearchRoles(result, (entryDn, name) -> { final String lowerEntryDn = entryDn.toLowerCase(Locale.ROOT); if (lowerEntryDn.indexOf(lowerGroupDn) != -1) { - groupList.add(Base64.getEncoder().encodeToString(name.getBytes(Constants.CHARSET_UTF_8))); + groupList.add(Base64.getUrlEncoder().encodeToString(name.getBytes(Constants.CHARSET_UTF_8))); } else if (lowerEntryDn.indexOf(lowerRoleDn) != -1) { - roleList.add(Base64.getEncoder().encodeToString(name.getBytes(Constants.CHARSET_UTF_8))); + roleList.add(Base64.getUrlEncoder().encodeToString(name.getBytes(Constants.CHARSET_UTF_8))); } }); user.setGroups(groupList.toArray(new String[groupList.size()]));