mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-10-13 01:14:59 +03:00
MHSanaei
b124af2a1b
The panel scheduler runs WithSeconds(), whose parser rejects a standard five-field crontab such as "30 8 * * *". An admin who typed one into the Telegram/Discord notify time or the LDAP sync schedule saved it without error, AddJob then failed at startup, and the job silently never ran. Admin-typed schedules now go through internal/util/cronspec, which takes an optional seconds column plus the @descriptors and hands the scheduler a parsed cron.Schedule. CheckValid rejects an unparseable schedule on save, and a stored legacy value falls back to the job's default instead of dropping the job.
106 lines
3.3 KiB
Go
106 lines
3.3 KiB
Go
package entity
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func TestCheckValidSmtpFrom(t *testing.T) {
|
|
base := func() *AllSetting {
|
|
return &AllSetting{WebPort: 2053, SubPort: 2096}
|
|
}
|
|
|
|
for _, v := range []string{"", "panel@example.com"} {
|
|
s := base()
|
|
s.SmtpFrom = v
|
|
if err := s.CheckValid(); err != nil {
|
|
t.Errorf("CheckValid with smtpFrom=%q: unexpected error %v", v, err)
|
|
}
|
|
}
|
|
|
|
for _, v := range []string{
|
|
"not-an-address",
|
|
"panel@example.com\r\nBcc: evil@example.com",
|
|
"a@b\nSubject: injected",
|
|
} {
|
|
s := base()
|
|
s.SmtpFrom = v
|
|
if err := s.CheckValid(); err == nil {
|
|
t.Errorf("CheckValid with smtpFrom=%q: want error, got nil", v)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestCheckValidWildcardListenPortConflict(t *testing.T) {
|
|
s := &AllSetting{WebPort: 2053, SubPort: 2053, WebListen: "0.0.0.0", SubListen: ""}
|
|
if err := s.CheckValid(); err == nil {
|
|
t.Error("CheckValid must reject the same port bound on 0.0.0.0 and \"\" (both wildcard)")
|
|
}
|
|
|
|
ok := &AllSetting{WebPort: 2053, SubPort: 2053, WebListen: "127.0.0.1", SubListen: "192.168.1.1"}
|
|
if err := ok.CheckValid(); err != nil {
|
|
t.Errorf("distinct specific listens on the same port should be allowed: %v", err)
|
|
}
|
|
}
|
|
|
|
// The allowlist and the trusted-proxy list share one validator, so this also
|
|
// pins that each list still reports its own message (#5378).
|
|
func TestCheckValidIPOrCIDRLists(t *testing.T) {
|
|
base := func() *AllSetting {
|
|
return &AllSetting{WebPort: 2053, SubPort: 2096}
|
|
}
|
|
|
|
for _, v := range []string{"", "203.0.113.10", "198.51.100.0/24", " 203.0.113.10 , 2001:db8::/32 ", "203.0.113.10,,"} {
|
|
s := base()
|
|
s.IpLimitAllowlist = v
|
|
if err := s.CheckValid(); err != nil {
|
|
t.Errorf("ipLimitAllowlist=%q: unexpected error %v", v, err)
|
|
}
|
|
}
|
|
|
|
for _, v := range []string{"nonsense", "203.0.113.10/33", "203.0.113.10, oops"} {
|
|
s := base()
|
|
s.IpLimitAllowlist = v
|
|
err := s.CheckValid()
|
|
if err == nil {
|
|
t.Errorf("ipLimitAllowlist=%q: want error, got nil", v)
|
|
continue
|
|
}
|
|
if !strings.Contains(err.Error(), "IP limit allowlist entry is not valid:") {
|
|
t.Errorf("ipLimitAllowlist=%q: error %q does not name the setting", v, err)
|
|
}
|
|
}
|
|
|
|
s := base()
|
|
s.TrustedProxyCIDRs = "127.0.0.1/32, bogus"
|
|
err := s.CheckValid()
|
|
if err == nil || !strings.Contains(err.Error(), "trusted proxy CIDR is not valid: bogus") {
|
|
t.Errorf("trustedProxyCIDRs error = %v, want it to name the trusted-proxy list and the bad entry", err)
|
|
}
|
|
}
|
|
|
|
// A schedule the scheduler cannot parse used to be saved anyway, and the report
|
|
// or sync job then silently never ran.
|
|
func TestCheckValidSchedules(t *testing.T) {
|
|
set := map[string]func(*AllSetting, string){
|
|
"tgRunTime": func(s *AllSetting, v string) { s.TgRunTime = v },
|
|
"discordRunTime": func(s *AllSetting, v string) { s.DiscordRunTime = v },
|
|
"ldapSyncCron": func(s *AllSetting, v string) { s.LdapSyncCron = v },
|
|
}
|
|
for name, apply := range set {
|
|
for _, v := range []string{"", "@daily", "30 8 * * *", "0 30 8 * * *", "@every 1m"} {
|
|
s := &AllSetting{WebPort: 2053, SubPort: 2096}
|
|
apply(s, v)
|
|
if err := s.CheckValid(); err != nil {
|
|
t.Errorf("%s=%q: unexpected error %v", name, v, err)
|
|
}
|
|
}
|
|
s := &AllSetting{WebPort: 2053, SubPort: 2096}
|
|
apply(s, "every morning")
|
|
err := s.CheckValid()
|
|
if err == nil || !strings.Contains(err.Error(), name) {
|
|
t.Errorf("%s=%q: want an error naming %s, got %v", name, "every morning", name, err)
|
|
}
|
|
}
|
|
}
|