garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

fix opml import encoding issue

Browse Source
This commit is contained in:
Athou
2024-08-12 16:40:43 +02:00
parent 04af355e0c
commit 78a5267198
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
commafeed-server/TODO.md
View File

@@ -17,4 +17,3 @@ Nice to have:
- remove rest assured or use only rest assured - remove rest assured or use only rest assured
- rename "servlets" since they are now rest endpoints - rename "servlets" since they are now rest endpoints
- warnings hibernate on startup - warnings hibernate on startup
- OPML encoding is not handled correctly

5
commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java
View File

@@ -2,6 +2,7 @@ package com.commafeed.frontend.resource;
import java.io.StringWriter; import java.io.StringWriter;
import java.net.URI; import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.time.Instant; import java.time.Instant;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
@@ -11,6 +12,7 @@ import java.util.Objects;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.SystemUtils;
import org.jboss.resteasy.reactive.RestForm; import org.jboss.resteasy.reactive.RestForm;
import com.commafeed.CommaFeedApplication; import com.commafeed.CommaFeedApplication;
@@ -505,7 +507,8 @@ public class FeedREST {
return Response.status(Status.FORBIDDEN).entity("Import is disabled for the demo account").build(); return Response.status(Status.FORBIDDEN).entity("Import is disabled for the demo account").build();
} }
try { try {
opmlImporter.importOpml(user, opml); // opml will be encoded in the default JVM encoding, bu we want UTF-8
opmlImporter.importOpml(user, new String(opml.getBytes(SystemUtils.FILE_ENCODING), StandardCharsets.UTF_8));
} catch (Exception e) { } catch (Exception e) {
return Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build(); return Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
} }