From 7e98cd58dd670fd83c0ace5e9c8ef9a0407fd575 Mon Sep 17 00:00:00 2001 From: zeripath Date: Mon, 27 Sep 2021 02:02:01 +0100 Subject: Add SkipLocal2FA option to pam and smtp sources (#17078) * Add SkipLocal2FA option to other pam and smtp sources Extend #16954 to allow setting skip local 2fa on pam and SMTP authentication sources Signed-off-by: Andrew Thornton * make SkipLocal2FA omitempty Signed-off-by: Andrew Thornton Co-authored-by: 6543 <6543@obermui.de> --- services/auth/source/smtp/source.go | 1 + services/auth/source/smtp/source_authenticate.go | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'services/auth/source/smtp') diff --git a/services/auth/source/smtp/source.go b/services/auth/source/smtp/source.go index 487375c304..52e2505670 100644 --- a/services/auth/source/smtp/source.go +++ b/services/auth/source/smtp/source.go @@ -27,6 +27,7 @@ type Source struct { SkipVerify bool HeloHostname string DisableHelo bool + SkipLocalTwoFA bool `json:",omitempty"` // reference to the loginSource loginSource *login.Source diff --git a/services/auth/source/smtp/source_authenticate.go b/services/auth/source/smtp/source_authenticate.go index f50baa56a2..f51c884c3a 100644 --- a/services/auth/source/smtp/source_authenticate.go +++ b/services/auth/source/smtp/source_authenticate.go @@ -85,3 +85,8 @@ func (source *Source) Authenticate(user *models.User, userName, password string) return user, nil } + +// IsSkipLocalTwoFA returns if this source should skip local 2fa for password authentication +func (source *Source) IsSkipLocalTwoFA() bool { + return source.SkipLocalTwoFA +} -- cgit v1.2.3