github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

[release-2.6] Fix the meta description with special characters causing the page to display abnormally (#4035) 

This is an automated cherry-pick of #4031

/assign ruibaby

```release-note
修复 meta description 中含有特殊字符导致页面显示异常的问题
```
pull/4078/head
Halo Dev Bot 2023-06-04 18:15:22 +08:00 committed by GitHub
parent 77f2ee01d6
commit e5b99ee5c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/src/main/java/run/halo/app/theme/dialect/ContentTemplateHeadProcessor.java
View File

@ -10,6 +10,7 @@ import java.util.Map;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.util.HtmlUtils;
import org.thymeleaf.context.ITemplateContext; import org.thymeleaf.context.ITemplateContext;
import org.thymeleaf.model.IModel; import org.thymeleaf.model.IModel;
import org.thymeleaf.model.IModelFactory; import org.thymeleaf.model.IModelFactory;
@ -70,18 +71,19 @@ public class ContentTemplateHeadProcessor implements TemplateHeadProcessor {
static List<Map<String, String>> excerptToMetaDescriptionIfAbsent( static List<Map<String, String>> excerptToMetaDescriptionIfAbsent(
List<Map<String, String>> htmlMetas, List<Map<String, String>> htmlMetas,
String excerpt) { String excerpt) {
final String excerptNullSafe = StringUtils.defaultString(excerpt); String excerptNullSafe = StringUtils.defaultString(excerpt);
final String excerptSafe = HtmlUtils.htmlEscape(excerptNullSafe);
List<Map<String, String>> metas = new ArrayList<>(defaultIfNull(htmlMetas, List.of())); List<Map<String, String>> metas = new ArrayList<>(defaultIfNull(htmlMetas, List.of()));
metas.stream() metas.stream()
.filter(map -> Meta.DESCRIPTION.equals(map.get(Meta.NAME))) .filter(map -> Meta.DESCRIPTION.equals(map.get(Meta.NAME)))
.distinct() .distinct()
.findFirst() .findFirst()
.ifPresentOrElse(map -> .ifPresentOrElse(map ->
map.put(Meta.CONTENT, defaultIfBlank(map.get(Meta.CONTENT), excerptNullSafe)), map.put(Meta.CONTENT, defaultIfBlank(map.get(Meta.CONTENT), excerptSafe)),
() -> { () -> {
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put(Meta.NAME, Meta.DESCRIPTION); map.put(Meta.NAME, Meta.DESCRIPTION);
map.put(Meta.CONTENT, excerptNullSafe); map.put(Meta.CONTENT, excerptSafe);
metas.add(map); metas.add(map);
}); });
return metas; return metas;