Skip to content

High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.

Add minor security enhancements (#2682)

Rohith Kumar Ankam39658c446f97
diff --git a/cmd/auth.go b/cmd/auth.go
index 07bdc238..1598aaf4 100644
--- a/cmd/auth.go
+++ b/cmd/auth.go
@@ -323,9 +323,17 @@ func (a *App) createOIDCUser(claims auth.OIDCclaim, c echo.Context) (auth.User,
// doLogin logs a user in with a username and password.
func (a *App) doLogin(c echo.Context) error {
var (
+ startTime = time.Now()
username = strings.TrimSpace(c.FormValue("username"))
password = strings.TrimSpace(c.FormValue("password"))
)
+
+ // Ensure timing mitigation is applied regardless of early returns
+ defer func() {
+ if elapsed := time.Since(startTime).Milliseconds(); elapsed < 100 {
+ time.Sleep(time.Duration(100-elapsed) * time.Millisecond)
+ }
+ }()
if !strHasLen(username, 3, stdInputMaxLen) {
return echo.NewHTTPError(http.StatusBadRequest, a.i18n.Ts("globals.messages.invalidFields", "name", "username"))
@@ -340,11 +348,6 @@ func (a *App) doLogin(c echo.Context) error {
return err
}
- // Resist potential constant-time-comparison attacks with a min response time.
- if ms := time.Since(time.Now()).Milliseconds(); ms < 100 {
- time.Sleep(time.Duration(ms))
- }
-
// Set the session in the DB and cookie.
if err := a.auth.SaveSession(user, "", c); err != nil {
return err
diff --git a/cmd/init.go b/cmd/init.go
index 19935f20..6707e09d 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -1005,6 +1005,7 @@ func initTplFuncs(i *i18n.I18n, u *UrlConfig) template.FuncMap {
sprigFuncs := sprig.GenericFuncMap()
delete(sprigFuncs, "env")
delete(sprigFuncs, "expandenv")
+ delete(sprigFuncs, "getHostByName")
maps.Copy(funcs, sprigFuncs)
diff --git a/internal/manager/manager.go b/internal/manager/manager.go
index 314454b6..4fdf8eb8 100644
--- a/internal/manager/manager.go
+++ b/internal/manager/manager.go
@@ -624,6 +624,7 @@ func (m *Manager) makeGnericFuncMap() template.FuncMap {
sprigFuncs := sprig.GenericFuncMap()
delete(sprigFuncs, "env")
delete(sprigFuncs, "expandenv")
+ delete(sprigFuncs, "getHostByName")
maps.Copy(funcs, sprigFuncs)