Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: replace md5 with sha256 for commenter email hash #7092

Merged
merged 11 commits into from
Dec 9, 2024
Merged

refactor: replace md5 with sha256 for commenter email hash #7092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ee0f2e0
Update CommentPublicQueryServiceImpl.java
cryptochecktool Nov 28, 2024
8ad7ae8
Update CommentPublicQueryServiceImpl.java
cryptochecktool Nov 28, 2024
c576f00
Update CommentPublicQueryServiceIntegrationTest.java
cryptochecktool Nov 28, 2024
04e9a31
Update CommentPublicQueryServiceImpl.java
cryptochecktool Dec 2, 2024
41f6e46
Merge branch 'main' into main
ruibaby Dec 3, 2024
a8a7eba
Update CommentPublicQueryServiceImpl.java
cryptochecktool Dec 5, 2024
34ca42c
Update CommentPublicQueryServiceImpl.java
cryptochecktool Dec 5, 2024
0f9f25a
Merge branch 'main' into main
ruibaby Dec 6, 2024
d750219
Update CommentPublicQueryServiceIntegrationTest.java
cryptochecktool Dec 6, 2024
ed9fa4e
Update CommentPublicQueryServiceImpl.java
cryptochecktool Dec 6, 2024
b618791
Format code
JohnNiang Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions application/src/main/java/run/halo/app/theme/finders/impl/CommentPublicQueryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package run.halo.app.theme.finders.impl;


import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
import static run.halo.app.extension.index.query.QueryFactory.and;
import static run.halo.app.extension.index.query.QueryFactory.equal;
import static run.halo.app.extension.index.query.QueryFactory.isNull;
import static run.halo.app.extension.index.query.QueryFactory.or;

import com.google.common.hash.Hashing;
import java.security.Principal;
import java.util.HashMap;
import java.util.Optional;
Expand All @@ -20,7 +22,6 @@
import org.springframework.security.core.context.SecurityContext;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
import org.springframework.util.DigestUtils;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import run.halo.app.content.comment.OwnerInfo;
Expand Down Expand Up @@ -172,7 +173,9 @@ private Mono<? extends CommentVo> filterCommentSensitiveData(CommentVo commentVo
specOwner.setName("");
var email = owner.getEmail();
if (StringUtils.isNotBlank(email)) {
var emailHash = DigestUtils.md5DigestAsHex(email.getBytes());
var emailHash = Hashing.sha256()
.hashString(email.toLowerCase(), UTF_8)
.toString();
if (specOwner.getAnnotations() == null) {
specOwner.setAnnotations(new HashMap<>(2));
}
Expand Down Expand Up @@ -224,7 +227,9 @@ private Mono<? extends ReplyVo> filterReplySensitiveData(ReplyVo replyVo) {
specOwner.setName("");
var email = owner.getEmail();
if (StringUtils.isNotBlank(email)) {
var emailHash = DigestUtils.md5DigestAsHex(email.getBytes());
var emailHash = Hashing.sha256()
.hashString(email.toLowerCase(), UTF_8)
.toString();
if (specOwner.getAnnotations() == null) {
specOwner.setAnnotations(new HashMap<>(2));
}
Expand Down
3 changes: 2 additions & 1 deletion ...c/test/java/run/halo/app/theme/finders/impl/CommentPublicQueryServiceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,8 @@ String fakeReplyJson() {
"name":"",
"displayName":"fake-display-name",
"annotations":{
"email-hash": "4249f4df72b475e7894fabed1c5888cf"
"email-hash": \
"79783106d88279c6c8f94f1f4dec22bdb9f90a8d14c9d6c6628a11430e236cbf"
}
},
"creationTime": "2024-03-11T06:23:42.923294424Z",
Expand Down
Loading