-
Notifications
You must be signed in to change notification settings - Fork 0
[FIX] 문서 NUL 문자 정제 및 Discord 알림 길이 제한 #199
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
ssd-api/src/main/java/or/hyu/ssd/api/document/request/RequestStringSanitizer.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package or.hyu.ssd.api.document.request; | ||
|
|
||
| final class RequestStringSanitizer { | ||
|
|
||
| private RequestStringSanitizer() { | ||
| } | ||
|
|
||
| static String stripNullChar(String value) { | ||
| if (value == null || !value.contains("\u0000")) { | ||
| return value; | ||
| } | ||
| return value.replace("\u0000", ""); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
ssd-external/src/test/java/or/hyu/ssd/external/alert/discord/DiscordWebhookNotifierTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| package or.hyu.ssd.external.alert.discord; | ||
|
|
||
| import org.junit.jupiter.api.DisplayName; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.springframework.mock.env.MockEnvironment; | ||
| import or.hyu.ssd.external.config.DiscordProperties; | ||
|
|
||
| import java.lang.reflect.Method; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| class DiscordWebhookNotifierTest { | ||
|
|
||
| @Test | ||
| @DisplayName("디스코드 본문이 2000자를 넘으면 잘라낸다") | ||
| void truncateMessageWhenContentTooLong() throws Exception { | ||
| // given | ||
| DiscordWebhookNotifier notifier = new DiscordWebhookNotifier(new DiscordProperties(), new MockEnvironment()); | ||
| Method truncateMethod = DiscordWebhookNotifier.class.getDeclaredMethod("truncateForDiscord", String.class); | ||
| truncateMethod.setAccessible(true); | ||
| String longMessage = "a".repeat(2100); | ||
|
|
||
| // when | ||
| String truncated = (String) truncateMethod.invoke(notifier, longMessage); | ||
|
|
||
| // then | ||
| assertThat(truncated.length()).isLessThanOrEqualTo(2000); | ||
| assertThat(truncated).endsWith("\n...(truncated)"); | ||
| assertThat(truncated).startsWith(longMessage.substring(0, 1985)); | ||
| } | ||
|
|
||
| @Test | ||
| @DisplayName("디스코드 본문이 2000자 이하면 그대로 둔다") | ||
| void keepMessageWhenWithinLimit() throws Exception { | ||
| // given | ||
| DiscordWebhookNotifier notifier = new DiscordWebhookNotifier(new DiscordProperties(), new MockEnvironment()); | ||
| Method truncateMethod = DiscordWebhookNotifier.class.getDeclaredMethod("truncateForDiscord", String.class); | ||
| truncateMethod.setAccessible(true); | ||
| String message = "a".repeat(2000); | ||
|
|
||
| // when | ||
| String truncated = (String) truncateMethod.invoke(notifier, message); | ||
|
|
||
| // then | ||
| assertThat(truncated).isEqualTo(message); | ||
| } | ||
|
|
||
| @Test | ||
| @DisplayName("디스코드 본문이 null이면 빈 문자열을 반환한다") | ||
| void returnEmptyStringWhenContentIsNull() throws Exception { | ||
| // given | ||
| DiscordWebhookNotifier notifier = new DiscordWebhookNotifier(new DiscordProperties(), new MockEnvironment()); | ||
| Method truncateMethod = DiscordWebhookNotifier.class.getDeclaredMethod("truncateForDiscord", String.class); | ||
| truncateMethod.setAccessible(true); | ||
|
|
||
| // when | ||
| String truncated = (String) truncateMethod.invoke(notifier, (String) null); | ||
|
|
||
| // then | ||
| assertThat(truncated).isEqualTo(""); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.