Skip to content

utils: make timestamp validation strict #39

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

Open
tllovesxs wants to merge 1 commit into
base: main
Choose a base branch
from
Open

utils: make timestamp validation strict #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 8 additions & 11 deletions utils/src/main/java/org/zstack/utils/TimeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import java.text.DateFormat;
import java.text.ParseException;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDateTime;
Expand Down Expand Up @@ -142,22 +143,18 @@ public static long parseTimeToMillis(String time){
private static final String DEFAULT_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";

public static boolean isValidTimestampFormat(String timestamp) {
try {
new SimpleDateFormat(DEFAULT_TIME_FORMAT).parse(timestamp);
return true;
} catch (ParseException e) {
return false;
}
return isValidTimestampFormat(timestamp, DEFAULT_TIME_FORMAT);
}

public static boolean isValidTimestampFormat(String timestamp, String dformat) {
try {
DateFormat dateFormat = new SimpleDateFormat(dformat);
dateFormat.parse(timestamp);
return true;
} catch (ParseException e) {
if (timestamp == null || dformat == null) {
return false;
}

SimpleDateFormat dateFormat = new SimpleDateFormat(dformat);
dateFormat.setLenient(false);
ParsePosition position = new ParsePosition(0);
return dateFormat.parse(timestamp, position) != null && position.getIndex() == timestamp.length();
}

public static long parseFormatStringToTimeStamp(String timestamp, String dformat) {
Expand Down
23 changes: 23 additions & 0 deletions utils/src/test/java/org/zstack/utils/test/TestTimeUtilsEdgeCases.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package org.zstack.utils.test;

import org.junit.Test;
import org.zstack.utils.TimeUtils;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

public class TestTimeUtilsEdgeCases {
@Test
public void testDefaultTimestampValidation() {
assertTrue(TimeUtils.isValidTimestampFormat("2024-02-29 10:00:00"));
assertFalse(TimeUtils.isValidTimestampFormat("2024-02-30 10:00:00"));
assertFalse(TimeUtils.isValidTimestampFormat("2024-01-01 10:00:00xyz"));
}

@Test
public void testCustomTimestampValidation() {
assertTrue(TimeUtils.isValidTimestampFormat("2024/02/29", "yyyy/MM/dd"));
assertFalse(TimeUtils.isValidTimestampFormat("2024/02/30", "yyyy/MM/dd"));
assertFalse(TimeUtils.isValidTimestampFormat("2024/02/29 trailing", "yyyy/MM/dd"));
}
}