CERBERUS/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-08-27 04:08:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

feat(backup): prefix backup filenames with date and time

Browse source
This commit is contained in:
Nikan Zeyaei 2026-06-27 12:58:15 +03:30
parent 7ad087639b
commit 546cb11e27
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/web/service/backup_filename_test.go
View file

@ -38,8 +38,8 @@ func TestSanitizeBackupHost(t *testing.T) {
}
}
// datePrefixRegex narrows backupFilenameRegex to the exact YYYY-MM-DD_ shape.
var datePrefixRegex = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}_$`)
// datePrefixRegex narrows backupFilenameRegex to the exact YYYY-MM-DD_HHMMSS_ shape.
var datePrefixRegex = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}_\d{6}_$`)
func TestBackupDatePrefix(t *testing.T) {
cases := []struct {
@ -47,9 +47,9 @@ func TestBackupDatePrefix(t *testing.T) {
now time.Time
want string
}{
{"utc midnight", time.Date(2026, 6, 27, 0, 0, 0, 0, time.UTC), "2026-06-27_"},
{"end of year", time.Date(2025, 12, 31, 23, 59, 59, 0, time.UTC), "2025-12-31_"},
{"single digit month/day padded", time.Date(2026, 1, 5, 9, 4, 0, 0, time.UTC), "2026-01-05_"},
{"utc midnight", time.Date(2026, 6, 27, 0, 0, 0, 0, time.UTC), "2026-06-27_000000_"},
{"end of year", time.Date(2025, 12, 31, 23, 59, 59, 0, time.UTC), "2025-12-31_235959_"},
{"single digit month/day padded", time.Date(2026, 1, 5, 9, 4, 0, 0, time.UTC), "2026-01-05_090400_"},
}
for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
@ -60,7 +60,6 @@ func TestBackupDatePrefix(t *testing.T) {
if !datePrefixRegex.MatchString(got) {
t.Errorf("backupDatePrefix(%v) = %q, not a valid date prefix", tc.now, got)
}
// The prefix must also satisfy the controller's filename safety regex.
if !backupFilenameRegex.MatchString(got) {
t.Errorf("backupDatePrefix(%v) = %q, not a valid download filename char", tc.now, got)
}

11
internal/web/service/server.go
View file

@ -1297,8 +1297,9 @@ func (s *ServerService) GetDb() ([]byte, error) {
}
// BackupFilename returns the filename for a database backup, prefixed with the
// current date (YYYY-MM-DD_) so files accumulated in Telegram chat history sort
// chronologically, and named after the panel's address so a downloaded or
// current date and time (YYYY-MM-DD_HHMMSS_) so files accumulated in Telegram
// chat history sort chronologically and same-day backups stay distinct, and
// named after the panel's address so a downloaded or
// Telegram-sent backup identifies the server it came from. requestHost is the
// browser's address: the getDb handler passes c.Request.Host so a panel download
// is named after whatever address the user reached the panel with, no Listen
@ -1314,11 +1315,11 @@ func (s *ServerService) BackupFilename(requestHost string) string {
return backupDatePrefix(time.Now()) + s.backupHost(requestHost) + ext
}
// backupDatePrefix returns the YYYY-MM-DD_ chronological-sort prefix prepended to
// backup filenames. The date uses server-local time for consistency with the
// backupDatePrefix returns the YYYY-MM-DD_HHMMSS_ chronological-sort prefix
// prepended to backup filenames. Uses server-local time for consistency with the
// timestamp printed in the Telegram backup message body.
func backupDatePrefix(now time.Time) string {
return now.Format("2006-01-02") + "_"
return now.Format("2006-01-02_150405") + "_"
}
// backupHost picks the address used to name backup files: the browser's request