Skip to content

Commit d3c4f4c

Browse files
author
Kent Yeh
committed
Force upload fields using UTF-8 encoding.
1 parent 18de798 commit d3c4f4c

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

bridges/java/src/main/com/monosand/drinkout/web/servlet/AngularFileManagerServlet.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
221221
// if request contains multipart-form-data
222222
if (ServletFileUpload.isMultipartContent(request)) {
223223
if (isSupportFeature(Mode.upload)) {
224-
if (Boolean.TRUE.equals(enabledAction.get(Mode.upload))) {
225-
uploadFile(request, response);
226-
} else {
227-
setError(new IllegalAccessError(notSupportFeature(Mode.upload).getAsString("error")), response);
228-
}
224+
uploadFile(request, response);
225+
} else {
226+
setError(new IllegalAccessError(notSupportFeature(Mode.upload).getAsString("error")), response);
229227
}
230228
} // all other post request has jspn params in body
231229
else {
@@ -270,13 +268,14 @@ private void uploadFile(HttpServletRequest request, HttpServletResponse response
270268
try {
271269
String destination = null;
272270
Map<String, InputStream> files = new HashMap<>();
273-
274-
List<FileItem> items = new ServletFileUpload(new DiskFileItemFactory()).parseRequest(request);
271+
ServletFileUpload sfu = new ServletFileUpload(new DiskFileItemFactory());
272+
sfu.setHeaderEncoding("UTF-8");
273+
List<FileItem> items = sfu.parseRequest(request);
275274
for (FileItem item : items) {
276275
if (item.isFormField()) {
277276
// Process regular form field (input type="text|radio|checkbox|etc", select, etc).
278277
if ("destination".equals(item.getFieldName())) {
279-
destination = item.getString();
278+
destination = item.getString("UTF-8");
280279
}
281280
} else {
282281
// Process form file field (input type="file").

0 commit comments

Comments
 (0)