Skip to content

Modern Docker Management, Designed for Everyone

fix: allow LOGIN email authentication type (#2603)

Kyle Mendelle11d04ddd0f8
diff --git a/backend/go.mod b/backend/go.mod
index fa0a382dc..2477cd0e5 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -49,6 +49,7 @@ require (
github.com/shirou/gopsutil/v4 v4.26.4
github.com/spf13/cobra v1.10.2
github.com/stretchr/testify v1.11.1
+ github.com/wneessen/go-mail v0.7.3
go.podman.io/image/v5 v5.39.2
golang.org/x/crypto v0.51.0
golang.org/x/mod v0.36.0
diff --git a/backend/go.sum b/backend/go.sum
index 45287fe96..d0d79866e 100644
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -537,6 +537,8 @@ github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQ
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
github.com/vbatts/tar-split v0.12.2 h1:w/Y6tjxpeiFMR47yzZPlPj/FcPLpXbTUi/9H7d3CPa4=
github.com/vbatts/tar-split v0.12.2/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA=
+github.com/wneessen/go-mail v0.7.3 h1:g3DravXC5SMlVdboFrQA8Jx95A8sOzoBeS5F+vzNRK0=
+github.com/wneessen/go-mail v0.7.3/go.mod h1:QGhBX0yNbc1J+Mkjcu7z2rpj4B4l+BmDY8gYznPC9sk=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
diff --git a/backend/internal/models/notification.go b/backend/internal/models/notification.go
index 14be206fa..9bc6a0e6a 100644
--- a/backend/internal/models/notification.go
+++ b/backend/internal/models/notification.go
@@ -55,6 +55,15 @@ const (
EmailTLSModeSSL EmailTLSMode = "ssl"
)
+type EmailAuthMode string
+
+const (
+ EmailAuthModeAuto EmailAuthMode = "auto"
+ EmailAuthModePlain EmailAuthMode = "plain"
+ EmailAuthModeLogin EmailAuthMode = "login"
+ EmailAuthModeCRAMMD5 EmailAuthMode = "crammd5"
+)
+
type NotificationSettings struct {
ID uint `json:"id" gorm:"primaryKey"`
Provider NotificationProvider `json:"provider" gorm:"not null;index;type:varchar(50)"`
@@ -100,6 +109,7 @@ type EmailConfig struct {
FromAddress string `json:"fromAddress"`
ToAddresses []string `json:"toAddresses"`
TLSMode EmailTLSMode `json:"tlsMode"`
+ AuthMode EmailAuthMode `json:"authMode,omitempty"`
Events map[NotificationEventType]bool `json:"events,omitempty"`
}
diff --git a/backend/pkg/utils/notifications/email_sender.go b/backend/pkg/utils/notifications/email_sender.go
index 0c0a78410..6414200a9 100644
--- a/backend/pkg/utils/notifications/email_sender.go
+++ b/backend/pkg/utils/notifications/email_sender.go
@@ -2,14 +2,12 @@ package notifications
import (
"context"
+ "crypto/tls"
"fmt"
- "net/url"
"time"
"github.com/getarcaneapp/arcane/backend/internal/models"
- "github.com/nicholas-fedor/shoutrrr"
- shoutrrrSMTP "github.com/nicholas-fedor/shoutrrr/pkg/services/email/smtp"
- shoutrrrTypes "github.com/nicholas-fedor/shoutrrr/pkg/types"
+ "github.com/wneessen/go-mail"
)
const (
@@ -18,60 +16,8 @@ const (
)
type smtpBuildOptions struct {
- skipTLSVerify bool
- timeout time.Duration
-}
-
-func buildSMTPConfigInternal(config models.EmailConfig, options smtpBuildOptions) (*shoutrrrSMTP.Config, error) {
- port, err := smtpPortFromConfigInternal(config.SMTPPort)
- if err != nil {
- return nil, err
- }
-
- smtpConfig := &shoutrrrSMTP.Config{
- Host: config.SMTPHost,
- Port: port,
- Username: config.SMTPUsername,
- Password: config.SMTPPassword,
- FromAddress: config.FromAddress,
- ToAddresses: config.ToAddresses,
- Auth: shoutrrrSMTP.AuthTypes.None,
- Encryption: shoutrrrSMTP.EncMethods.None,
- UseStartTLS: false,
- UseHTML: true,
- ClientHost: defaultSMTPClientHost,
- Timeout: smtpTimeoutFromOptionsInternal(options),
- SkipTLSVerify: options.skipTLSVerify,
- }
-
- if config.SMTPUsername != "" || config.SMTPPassword != "" {
- smtpConfig.Auth = shoutrrrSMTP.AuthTypes.Plain
- }
-
- switch config.TLSMode {
- case models.EmailTLSModeNone:
- smtpConfig.Encryption = shoutrrrSMTP.EncMethods.None
- smtpConfig.UseStartTLS = false
- case models.EmailTLSModeStartTLS:
- smtpConfig.Encryption = shoutrrrSMTP.EncMethods.Auto
- smtpConfig.UseStartTLS = true
- smtpConfig.RequireStartTLS = true
- case models.EmailTLSModeSSL:
- smtpConfig.Encryption = shoutrrrSMTP.EncMethods.ImplicitTLS
- default:
- smtpConfig.Encryption = shoutrrrSMTP.EncMethods.None
- smtpConfig.UseStartTLS = false
- }
-
- return smtpConfig, nil
-}
-
-func smtpPortFromConfigInternal(port int) (uint16, error) {
- if port < 1 || port > 65535 {
- return 0, fmt.Errorf("invalid SMTP port: %d", port)
- }
-
- return uint16(port), nil
+ tlsConfig *tls.Config
+ timeout time.Duration
}
func smtpTimeoutFromOptionsInternal(options smtpBuildOptions) time.Duration {
@@ -98,65 +44,106 @@ func smtpBuildOptionsFromContextInternal(ctx context.Context) smtpBuildOptions {
return options
}
-func buildSMTPURLInternal(config models.EmailConfig, options smtpBuildOptions) (string, error) {
- smtpConfig, err := buildSMTPConfigInternal(config, options)
- if err != nil {
- return "", fmt.Errorf("failed to build SMTP config: %w", err)
+func smtpAuthTypeFromModeInternal(mode models.EmailAuthMode) mail.SMTPAuthType {
+ switch mode {
+ case models.EmailAuthModeAuto:
+ return mail.SMTPAuthAutoDiscover
+ case models.EmailAuthModePlain:
+ return mail.SMTPAuthPlain
+ case models.EmailAuthModeLogin:
+ return mail.SMTPAuthLogin
+ case models.EmailAuthModeCRAMMD5:
+ return mail.SMTPAuthCramMD5
+ default:
+ return mail.SMTPAuthAutoDiscover
}
+}
- u := smtpConfig.GetURL()
- if u == nil {
- return "", fmt.Errorf("failed to build SMTP config URL")
+func buildMailClientInternal(config models.EmailConfig, options smtpBuildOptions) (*mail.Client, error) {
+ if config.SMTPHost == "" {
+ return nil, fmt.Errorf("SMTP host is empty")
+ }
+ if config.SMTPPort < 1 || config.SMTPPort > 65535 {
+ return nil, fmt.Errorf("invalid SMTP port: %d", config.SMTPPort)
}
- parsedURL, err := url.Parse(u.String())
- if err != nil {
- return "", fmt.Errorf("failed to parse SMTP config URL: %w", err)
+ opts := []mail.Option{
+ mail.WithPort(config.SMTPPort),
+ mail.WithTimeout(smtpTimeoutFromOptionsInternal(options)),
+ mail.WithHELO(defaultSMTPClientHost),
+ }
+
+ switch config.TLSMode {
+ case models.EmailTLSModeNone:
+ opts = append(opts, mail.WithTLSPolicy(mail.NoTLS))
+ case models.EmailTLSModeStartTLS:
+ opts = append(opts, mail.WithTLSPolicy(mail.TLSMandatory))
+ case models.EmailTLSModeSSL:
+ opts = append(opts, mail.WithSSL())
+ default:
+ opts = append(opts, mail.WithTLSPolicy(mail.NoTLS))
}
- q := parsedURL.Query()
- if q.Get("fromname") == "" {
- q.Del("fromname")
+ if options.tlsConfig != nil {
+ opts = append(opts, mail.WithTLSConfig(options.tlsConfig))
}
- if q.Get("subject") == "" {
- q.Del("subject")
+
+ if config.SMTPUsername != "" || config.SMTPPassword != "" {
+ opts = append(opts,
+ mail.WithSMTPAuth(smtpAuthTypeFromModeInternal(config.AuthMode)),
+ mail.WithUsername(config.SMTPUsername),
+ mail.WithPassword(config.SMTPPassword),
+ )
+ } else {
+ opts = append(opts, mail.WithSMTPAuth(mail.SMTPAuthNoAuth))
}
- parsedURL.RawQuery = q.Encode()
- return parsedURL.String(), nil
+ client, err := mail.NewClient(config.SMTPHost, opts...)
+ if err != nil {
+ return nil, fmt.Errorf("failed to construct SMTP client: %w", err)
+ }
+
+ return client, nil
}
-// SendEmail sends pre-rendered HTML via Shoutrrr
+// SendEmail sends pre-rendered HTML via go-mail.
func SendEmail(ctx context.Context, config models.EmailConfig, subject, htmlBody string) error {
return sendEmailInternal(ctx, config, subject, htmlBody, smtpBuildOptionsFromContextInternal(ctx))
}
func sendEmailInternal(ctx context.Context, config models.EmailConfig, subject, htmlBody string, options smtpBuildOptions) error {
- if ctx != nil {
- if err := ctx.Err(); err != nil {
- return fmt.Errorf("email send canceled: %w", err)
- }
+ if ctx == nil {
+ return fmt.Errorf("email send context is required")
+ }
+ if err := ctx.Err(); err != nil {
+ return fmt.Errorf("email send canceled: %w", err)
}
- shoutrrrURL, err := buildSMTPURLInternal(config, options)
- if err != nil {
- return fmt.Errorf("failed to build shoutrrr URL: %w", err)
+ if config.FromAddress == "" {
+ return fmt.Errorf("from address is required")
+ }
+ if len(config.ToAddresses) == 0 {
+ return fmt.Errorf("at least one recipient is required")
}
- sender, err := shoutrrr.CreateSender(shoutrrrURL)
+ client, err := buildMailClientInternal(config, options)
if err != nil {
- return fmt.Errorf("failed to create shoutrrr sender: %w", err)
+ return fmt.Errorf("failed to build SMTP client: %w", err)
}
- params := shoutrrrTypes.Params{
- "subject": subject,
+ msg := mail.NewMsg()
+ if err := msg.From(config.FromAddress); err != nil {
+ return fmt.Errorf("invalid from address %q: %w", config.FromAddress, err)
+ }
+ if err := msg.To(config.ToAddresses...); err != nil {
+ return fmt.Errorf("invalid recipient address(es): %w", err)
}
+ msg.Subject(subject)
+ msg.SetBodyString(mail.TypeTextHTML, htmlBody)
- errs := sender.Send(htmlBody, &params)
- for _, err := range errs {
- if err != nil {
- return fmt.Errorf("failed to send email via shoutrrr: %w", err)
- }
+ if err := client.DialAndSendWithContext(ctx, msg); err != nil {
+ return fmt.Errorf("failed to send email: %w", err)
}
+
return nil
}
diff --git a/backend/pkg/utils/notifications/email_sender_test.go b/backend/pkg/utils/notifications/email_sender_test.go
index feb7b4365..0e7b053ba 100644
--- a/backend/pkg/utils/notifications/email_sender_test.go
+++ b/backend/pkg/utils/notifications/email_sender_test.go
@@ -8,6 +8,7 @@ import (
"crypto/tls"
"crypto/x509"
"crypto/x509/pkix"
+ "encoding/base64"
"encoding/pem"
"errors"
"fmt"
@@ -31,71 +32,20 @@ const smtpTestConnTimeout = 2 * time.Second
type smtpTestServer struct {
listener net.Listener
tlsConfig *tls.Config
+ clientTLSConfig *tls.Config
supportStartTLS bool
+ authMechanisms []string
done chan error
mu sync.Mutex
commands []string
+ authMechanismUsed string
authBeforeTLS bool
authAfterTLS bool
startTLSNegotiated bool
}
-func TestBuildSMTPURLInternal(t *testing.T) {
- tests := []struct {
- name string
- config models.EmailConfig
- wantURL string
- }{
- {
- name: "Basic SMTP no auth, no TLS",
- config: models.EmailConfig{
- SMTPHost: "smtp.example.com",
- SMTPPort: 25,
- FromAddress: "[email protected]",
- ToAddresses: []string{"[email protected]"},
- TLSMode: models.EmailTLSModeNone,
- },
- wantURL: "smtp://smtp.example.com:25/?auth=None&clienthost=localhost&encryption=None&fromaddress=from%40example.com&timeout=10s&toaddresses=to%40example.com&usehtml=Yes&usestarttls=No",
- },
- {
- name: "SMTP with auth and starttls",
- config: models.EmailConfig{
- SMTPHost: "smtp.example.com",
- SMTPPort: 587,
- SMTPUsername: "user",
- SMTPPassword: "password",
- FromAddress: "[email protected]",
- ToAddresses: []string{"[email protected]", "[email protected]"},
- TLSMode: models.EmailTLSModeStartTLS,
- },
- wantURL: "smtp://user:[email protected]:587/?auth=Plain&clienthost=localhost&encryption=Auto&fromaddress=from%40example.com&requirestarttls=Yes&timeout=10s&toaddresses=to1%40example.com%2Cto2%40example.com&usehtml=Yes&usestarttls=Yes",
- },
- {
- name: "SMTP with SSL/TLS and special characters in credentials",
- config: models.EmailConfig{
- SMTPHost: "smtp.example.com",
- SMTPPort: 465,
- SMTPUsername: "[email protected]",
- SMTPPassword: "pass/word!",
- FromAddress: "[email protected]",
- ToAddresses: []string{"[email protected]"},
- TLSMode: models.EmailTLSModeSSL,
- },
- wantURL: "smtp://user%40example.com:pass%2Fword%[email protected]:465/?auth=Plain&clienthost=localhost&encryption=ImplicitTLS&fromaddress=from%40example.com&timeout=10s&toaddresses=to%40example.com&usehtml=Yes&usestarttls=No",
- },
- }
-
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- gotURL, err := buildSMTPURLInternal(tt.config, smtpBuildOptions{})
- require.NoError(t, err)
- assert.Equal(t, tt.wantURL, gotURL)
- })
- }
-}
-
func TestSendEmailStartTLSRequiresTLSBeforeAuth(t *testing.T) {
- server := newSMTPTestServerInternal(t, true)
+ server := newSMTPTestServerInternal(t, true, []string{"PLAIN"})
defer server.Close()
config := models.EmailConfig{
@@ -113,7 +63,7 @@ func TestSendEmailStartTLSRequiresTLSBeforeAuth(t *testing.T) {
config,
"Arcane STARTTLS Test",
"<p>Test</p>",
- smtpBuildOptions{skipTLSVerify: true},
+ smtpBuildOptions{tlsConfig: server.ClientTLSConfig()},
)
require.NoError(t, err)
require.NoError(t, server.Wait())
@@ -124,8 +74,8 @@ func TestSendEmailStartTLSRequiresTLSBeforeAuth(t *testing.T) {
assertCommandOrderInternal(t, server.Commands(), "EHLO", "STARTTLS", "EHLO", "AUTH", "MAIL", "RCPT", "DATA", "QUIT")
}
-func TestSendEmailStartTLSFailsBeforePlainAuthFallback(t *testing.T) {
- server := newSMTPTestServerInternal(t, false)
+func TestSendEmailStartTLSFailsWhenServerDoesNotSupportIt(t *testing.T) {
+ server := newSMTPTestServerInternal(t, false, []string{"PLAIN"})
defer server.Close()
config := models.EmailConfig{
@@ -140,7 +90,7 @@ func TestSendEmailStartTLSFailsBeforePlainAuthFallback(t *testing.T) {
err := SendEmail(context.Background(), config, "Arcane STARTTLS Test", "<p>Test</p>")
require.Error(t, err)
- assert.ErrorContains(t, err, "error enabling StartTLS")
+ assert.Contains(t, err.Error(), "STARTTLS")
assert.NotContains(t, err.Error(), "unencrypted connection")
require.NoError(t, server.Wait())
@@ -149,10 +99,40 @@ func TestSendEmailStartTLSFailsBeforePlainAuthFallback(t *testing.T) {
assert.False(t, server.AuthAfterTLS(), "did not expect AUTH after failed STARTTLS setup")
}
-func newSMTPTestServerInternal(t *testing.T, supportStartTLS bool) *smtpTestServer {
+func TestSendEmailAuthLoginAgainstExchangeStyleServer(t *testing.T) {
+ server := newSMTPTestServerInternal(t, true, []string{"LOGIN"})
+ defer server.Close()
+
+ config := models.EmailConfig{
+ SMTPHost: smtpTestHost,
+ SMTPPort: server.Port(),
+ SMTPUsername: "user",
+ SMTPPassword: "password",
+ FromAddress: "[email protected]",
+ ToAddresses: []string{"[email protected]"},
+ TLSMode: models.EmailTLSModeStartTLS,
+ AuthMode: models.EmailAuthModeLogin,
+ }
+
+ err := sendEmailInternal(
+ context.Background(),
+ config,
+ "Arcane AUTH LOGIN Test",
+ "<p>Test</p>",
+ smtpBuildOptions{tlsConfig: server.ClientTLSConfig()},
+ )
+ require.NoError(t, err)
+ require.NoError(t, server.Wait())
+
+ assert.True(t, server.StartTLSNegotiated(), "expected STARTTLS to be negotiated")
+ assert.Equal(t, "LOGIN", server.AuthMechanismUsed(), "expected AUTH LOGIN to be used")
+ assertCommandOrderInternal(t, server.Commands(), "EHLO", "STARTTLS", "EHLO", "AUTH", "MAIL", "RCPT", "DATA", "QUIT")
+}
+
+func newSMTPTestServerInternal(t *testing.T, supportStartTLS bool, authMechanisms []string) *smtpTestServer {
t.Helper()
- serverCert := generateServerCertificateInternal(t, smtpTestHost)
+ serverCert, certPool := generateServerCertificateInternal(t, smtpTestHost)
listener, err := net.Listen("tcp4", "127.0.0.1:0")
require.NoError(t, err)
@@ -160,7 +140,9 @@ func newSMTPTestServerInternal(t *testing.T, supportStartTLS bool) *smtpTestServ
server := &smtpTestServer{
listener: listener,
tlsConfig: &tls.Config{Certificates: []tls.Certificate{serverCert}, MinVersion: tls.VersionTLS12},
+ clientTLSConfig: &tls.Config{RootCAs: certPool, ServerName: smtpTestHost, MinVersion: tls.VersionTLS12},
supportStartTLS: supportStartTLS,
+ authMechanisms: authMechanisms,
done: make(chan error, 1),
}
@@ -185,6 +167,10 @@ func (s *smtpTestServer) Close() {
_ = s.listener.Close()
}
+func (s *smtpTestServer) ClientTLSConfig() *tls.Config {
+ return s.clientTLSConfig.Clone()
+}
+
func (s *smtpTestServer) Wait() error {
select {
case err := <-s.done:
@@ -224,6 +210,31 @@ func (s *smtpTestServer) StartTLSNegotiated() bool {
return s.startTLSNegotiated
}
+func (s *smtpTestServer) AuthMechanismUsed() string {
+ s.mu.Lock()
+ defer s.mu.Unlock()
+ return s.authMechanismUsed
+}
+
+func (s *smtpTestServer) ehloLinesInternal() []string {
+ lines := []string{"arcane smtp test server"}
+ if s.supportStartTLS {
+ lines = append(lines, "STARTTLS")
+ }
+ if len(s.authMechanisms) > 0 {
+ lines = append(lines, "AUTH "+strings.Join(s.authMechanisms, " "))
+ }
+ return lines
+}
+
+func (s *smtpTestServer) ehloLinesAfterTLSInternal() []string {
+ lines := []string{"arcane smtp test server"}
+ if len(s.authMechanisms) > 0 {
+ lines = append(lines, "AUTH "+strings.Join(s.authMechanisms, " "))
+ }
+ return lines
+}
+
func (s *smtpTestServer) handleConnection(conn net.Conn) error {
defer func() { _ = conn.Close() }()
_ = conn.SetDeadline(time.Now().Add(smtpTestConnTimeout))
@@ -245,27 +256,19 @@ func (s *smtpTestServer) handleConnection(conn net.Conn) error {
return err
}
- verb, _, _ := strings.Cut(line, " ")
+ verb, rest, _ := strings.Cut(line, " ")
verb = strings.ToUpper(strings.TrimSpace(verb))
s.recordCommand(verb, tlsActive)
switch verb {
case "EHLO", "HELO":
- if s.supportStartTLS && !tlsActive {
- if err := writeSMTPMultiLineResponseInternal(writer, 250, []string{
- "arcane smtp test server",
- "STARTTLS",
- "AUTH PLAIN",
- }); err != nil {
- return err
- }
- continue
+ var lines []string
+ if tlsActive {
+ lines = s.ehloLinesAfterTLSInternal()
+ } else {
+ lines = s.ehloLinesInternal()
}
-
- if err := writeSMTPMultiLineResponseInternal(writer, 250, []string{
- "arcane smtp test server",
- "AUTH PLAIN",
- }); err != nil {
+ if err := writeSMTPMultiLineResponseInternal(writer, 250, lines); err != nil {
return err
}
case "STARTTLS":
@@ -292,7 +295,14 @@ func (s *smtpTestServer) handleConnection(conn net.Conn) error {
tlsActive = true
s.markStartTLSNegotiated()
case "AUTH":
- if err := writeSMTPResponseInternal(writer, 235, false, "2.7.0 Authentication successful"); err != nil {
+ mechanism, _, _ := strings.Cut(strings.TrimSpace(rest), " ")
+ mechanism = strings.ToUpper(mechanism)
+ s.recordAuthMechanismInternal(mechanism)
+ if err := s.handleAuthInternal(reader, writer, mechanism); err != nil {
+ return err
+ }
+ case "NOOP", "RSET":
+ if err := writeSMTPResponseInternal(writer, 250, false, "2.0.0 OK"); err != nil {
return err
}
case "MAIL":
@@ -332,6 +342,25 @@ func (s *smtpTestServer) handleConnection(conn net.Conn) error {
}
}
+func (s *smtpTestServer) handleAuthInternal(reader *textproto.Reader, writer *textproto.Writer, mechanism string) error {
+ switch mechanism {
+ case "LOGIN":
+ if err := writeSMTPResponseInternal(writer, 334, false, base64.StdEncoding.EncodeToString([]byte("Username:"))); err != nil {
+ return err
+ }
+ if _, err := reader.ReadLine(); err != nil {
+ return err
+ }
+ if err := writeSMTPResponseInternal(writer, 334, false, base64.StdEncoding.EncodeToString([]byte("Password:"))); err != nil {
+ return err
+ }
+ if _, err := reader.ReadLine(); err != nil {
+ return err
+ }
+ }
+ return writeSMTPResponseInternal(writer, 235, false, "2.7.0 Authentication successful")
+}
+
func (s *smtpTestServer) recordCommand(command string, tlsActive bool) {
s.mu.Lock()
defer s.mu.Unlock()
@@ -346,6 +375,12 @@ func (s *smtpTestServer) recordCommand(command string, tlsActive bool) {
}
}
+func (s *smtpTestServer) recordAuthMechanismInternal(mechanism string) {
+ s.mu.Lock()
+ defer s.mu.Unlock()
+ s.authMechanismUsed = mechanism
+}
+
func (s *smtpTestServer) markStartTLSNegotiated() {
s.mu.Lock()
defer s.mu.Unlock()
@@ -389,7 +424,7 @@ func assertCommandOrderInternal(t *testing.T, commands []string, expected ...str
}
}
-func generateServerCertificateInternal(t *testing.T, host string) tls.Certificate {
+func generateServerCertificateInternal(t *testing.T, host string) (tls.Certificate, *x509.CertPool) {
t.Helper()
caKey, err := rsa.GenerateKey(rand.Reader, 2048)
@@ -405,7 +440,7 @@ func generateServerCertificateInternal(t *testing.T, host string) tls.Certificat
IsCA: true,
}
- _, err = x509.CreateCertificate(rand.Reader, caTemplate, caTemplate, &caKey.PublicKey, caKey)
+ caDER, err := x509.CreateCertificate(rand.Reader, caTemplate, caTemplate, &caKey.PublicKey, caKey)
require.NoError(t, err)
serverKey, err := rsa.GenerateKey(rand.Reader, 2048)
@@ -429,7 +464,10 @@ func generateServerCertificateInternal(t *testing.T, host string) tls.Certificat
serverCert, err := tls.X509KeyPair(certPEM, keyPEM)
require.NoError(t, err)
- return serverCert
+ certPool := x509.NewCertPool()
+ require.True(t, certPool.AppendCertsFromPEM(pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: caDER})))
+
+ return serverCert, certPool
}
func mustSerialNumberInternal(t *testing.T) *big.Int {
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 421a1f42f..4d5a2798d 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -2221,6 +2221,10 @@
"notifications_email_tls_mode_label": "TLS Mode",
"notifications_email_tls_mode_placeholder": "Select TLS mode",
"notifications_email_tls_mode_description": "StartTLS (default) upgrades from plain connection. SSL/TLS uses encryption from start. None uses no encryption.",
+ "notifications_email_auth_mode_label": "Authentication Method",
+ "notifications_email_auth_mode_placeholder": "Select authentication method",
+ "notifications_email_auth_mode_description": "Auto-detect (default) picks the strongest method the server advertises. Pick LOGIN for Microsoft Exchange or Office 365 if auto-detect fails.",
+ "notifications_email_auth_mode_option_auto": "Auto-detect (recommended)",
"notifications_email_test_simple": "Simple Test Notification",
"notifications_email_test_image_update": "Image Update Notification",
"notifications_email_test_batch_image_update": "Batch Image Updates Notification",
diff --git a/frontend/src/lib/types/notification-providers.ts b/frontend/src/lib/types/notification-providers.ts
index 974f2b7f8..7f57e5b2b 100644
--- a/frontend/src/lib/types/notification-providers.ts
+++ b/frontend/src/lib/types/notification-providers.ts
@@ -1,4 +1,4 @@
-import type { NotificationSettings, AppriseSettings, EmailTLSMode } from './notification.type';
+import type { NotificationSettings, AppriseSettings, EmailTLSMode, EmailAuthMode } from './notification.type';
// Provider keys - this is the source of truth for all providers (alphabetically sorted)
export const NOTIFICATION_PROVIDER_KEYS = [
@@ -41,6 +41,7 @@ export interface EmailFormValues extends BaseProviderFormValues {
fromAddress: string;
toAddresses: string;
tlsMode: EmailTLSMode;
+ authMode: EmailAuthMode;
}
export interface TelegramFormValues extends BaseProviderFormValues {
@@ -226,6 +227,7 @@ export function emailSettingsToFormValues(settings?: NotificationSettings): Emai
fromAddress: getString(cfg, 'fromAddress'),
toAddresses: getStringArray(cfg, 'toAddresses').join(', '),
tlsMode: getString(cfg, 'tlsMode', 'starttls') as EmailTLSMode,
+ authMode: getString(cfg, 'authMode', 'auto') as EmailAuthMode,
...eventFlagsToFormValues(events)
};
}
@@ -322,6 +324,7 @@ export function emailFormValuesToSettings(values: EmailFormValues): Notification
.map((addr) => addr.trim())
.filter((addr) => addr.length > 0),
tlsMode: values.tlsMode,
+ authMode: values.authMode,
events: {
image_update: values.eventImageUpdate,
container_update: values.eventContainerUpdate,
diff --git a/frontend/src/lib/types/notification.type.ts b/frontend/src/lib/types/notification.type.ts
index b2fde77b5..4928436a5 100644
--- a/frontend/src/lib/types/notification.type.ts
+++ b/frontend/src/lib/types/notification.type.ts
@@ -10,6 +10,7 @@ export type NotificationProvider =
| 'matrix'
| 'generic';
export type EmailTLSMode = 'none' | 'starttls' | 'ssl';
+export type EmailAuthMode = 'auto' | 'plain' | 'login' | 'crammd5';
export interface NotificationSettings {
provider: NotificationProvider;
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte
index 5aac2b7a7..b1e520d86 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte
@@ -111,6 +111,7 @@
fromAddress: z.string(),
toAddresses: z.string(),
tlsMode: z.enum(['none', 'starttls', 'ssl']),
+ authMode: z.enum(['auto', 'plain', 'login', 'crammd5']),
eventImageUpdate: z.boolean(),
eventContainerUpdate: z.boolean(),
eventVulnerabilityFound: z.boolean(),
@@ -499,6 +500,20 @@
{ value: 'starttls', label: 'StartTLS' },
{ value: 'ssl', label: 'SSL/TLS' }
]
+ },
+ {
+ kind: 'select',
+ key: 'authMode',
+ id: 'email-auth-mode',
+ label: m.notifications_email_auth_mode_label(),
+ placeholder: m.notifications_email_auth_mode_placeholder(),
+ description: m.notifications_email_auth_mode_description(),
+ options: [
+ { value: 'auto', label: m.notifications_email_auth_mode_option_auto() },
+ { value: 'plain', label: 'PLAIN' },
+ { value: 'login', label: 'LOGIN' },
+ { value: 'crammd5', label: 'CRAM-MD5' }
+ ]
}
],
telegram: [
diff --git a/go.work.sum b/go.work.sum
index a6276526d..0f99838a3 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -27,6 +27,7 @@ cloud.google.com/go/storage v1.56.0 h1:iixmq2Fse2tqxMbWhLWC9HfBj1qdxqAmiK8/eqtsL
cloud.google.com/go/storage v1.56.0/go.mod h1:Tpuj6t4NweCLzlNbw9Z9iwxEkrSem20AetIeH/shgVU=
code.cloudfoundry.org/clock v1.1.0 h1:XLzC6W3Ah/Y7ht1rmZ6+QfPdt1iGWEAAtIZXgiaj57c=
code.cloudfoundry.org/clock v1.1.0/go.mod h1:yA3fxddT9RINQL2XHS7PS+OXxKCGhfrZmlNUCIM6AKo=
+cyphar.com/go-pathrs v0.2.1 h1:9nx1vOgwVvX1mNBWDu93+vaceedpbsDqo+XuBGL40b8=
cyphar.com/go-pathrs v0.2.1/go.mod h1:y8f1EMG7r+hCuFf/rXsKqMJrJAUoADZGNh5/vZPKcGc=
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
@@ -254,6 +255,7 @@ github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uS
github.com/bytedance/sonic v1.15.0/go.mod h1:tFkWrPz0/CUCLEF4ri4UkHekCIcdnkqXw9VduqpJh0k=
github.com/bytedance/sonic/loader v0.5.0 h1:gXH3KVnatgY7loH5/TkeVyXPfESoqSBSBEiDd5VjlgE=
github.com/bytedance/sonic/loader v0.5.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo=
+github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo=
github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
@@ -262,6 +264,7 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P
github.com/charmbracelet/x/ansi v0.11.3/go.mod h1:yI7Zslym9tCJcedxz5+WBq+eUGMJT0bM06Fqy1/Y4dI=
github.com/checkpoint-restore/checkpointctl v1.4.0 h1:3kRns56TArwiyHOMakaumUgSZZlB1hZBkjVgR6IeZ3E=
github.com/checkpoint-restore/checkpointctl v1.4.0/go.mod h1:ynQ52zQBazgcTZuxpwTFzRinIcAf0haDTC1X1LA/FKA=
+github.com/checkpoint-restore/checkpointctl v1.5.0 h1:Uu+D2cOf/GUyCMk23Y8L69P6YoATTe6pH+Au64O3y28=
github.com/checkpoint-restore/checkpointctl v1.5.0/go.mod h1:y5HRs1ZWQUZGyEuthlTHmTJN9PUMOjlaH6JvVaNq9kE=
github.com/checkpoint-restore/go-criu/v7 v7.2.0 h1:qGiWA4App1gGlEfIJ68WR9jbezV9J7yZdjzglezcqKo=
github.com/checkpoint-restore/go-criu/v7 v7.2.0/go.mod h1:u0LCWLg0w4yqqu14aXhiB4YD3a1qd8EcCEg7vda5dwo=
@@ -323,16 +326,19 @@ github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.7 h1:pD+wZQE81lBgjiQRaD
github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.7/go.mod h1:gzkTvoDZmX6hLuNn6qQ8s3wkTJ+Va9SbT76v07GzVK0=
github.com/containerd/go-cni v1.1.13 h1:eFSGOKlhoYNxpJ51KRIMHZNlg5UgocXEIEBGkY7Hnis=
github.com/containerd/go-cni v1.1.13/go.mod h1:nTieub0XDRmvCZ9VI/SBG6PyqT95N4FIhxsauF1vSBI=
+github.com/containerd/go-dmverity v0.1.0 h1:aqnpBRI6mmscya/XqvknZ4wQNJnXzx6lKxPa7Q71hDo=
github.com/containerd/go-dmverity v0.1.0/go.mod h1:vYevYgfeVF244IpQCKshXLvyKoRHwoVrFG0HV6GrUrs=
github.com/containerd/go-runc v1.1.0 h1:OX4f+/i2y5sUT7LhmcJH7GYrjjhHa1QI4e8yO0gGleA=
github.com/containerd/go-runc v1.1.0/go.mod h1:xJv2hFF7GvHtTJd9JqTS2UVxMkULUYw4JN5XAUZqH5U=
github.com/containerd/imgcrypt/v2 v2.0.1 h1:gQcmeCKA97fAl0wlpq0itSY/PagFBsn4/mlKUy6kOio=
github.com/containerd/imgcrypt/v2 v2.0.1/go.mod h1:/qIJL8nxzdzMA2n5iYyyuIY36KfoVQWmgTWdfVtyebM=
+github.com/containerd/imgcrypt/v2 v2.0.2 h1:WOEaE33CaSxzuRF8YLfAjHWuu1Xh27aPPQtqtALqfuM=
github.com/containerd/imgcrypt/v2 v2.0.2/go.mod h1:8r4JW1b83jkDhaioOUZ7idxIYp+Wn1k4E4KXwy2oSNI=
github.com/containerd/nri v0.10.0 h1:bt2NzfvlY6OJE0i+fB5WVeGQEycxY7iFVQpEbh7J3Go=
github.com/containerd/nri v0.10.0/go.mod h1:5VyvLa/4uL8FjyO8nis1UjbCutXDpngil17KvBSL6BU=
github.com/containerd/nri v0.11.0 h1:26mcQwNG58AZn0YkOrlJQ0yxQVmyZooflnVWJTqQrqQ=
github.com/containerd/nri v0.11.0/go.mod h1:bjGTLdUA58WgghKHg8azFMGXr05n1wDHrt3NSVBHiGI=
+github.com/containerd/nri v0.12.0 h1:RvZtyCM64XOB1UmMAFOlfReTTwCd+hE2IEQ5XEpkKA0=
github.com/containerd/nri v0.12.0/go.mod h1:TGAfPLH4a+qwbv0PxsefPiR+PobYecDj2aXMtz7GQcg=
github.com/containerd/otelttrpc v0.1.0 h1:UOX68eVTE8H/T45JveIg+I22Ev2aFj4qPITCmXsskjw=
github.com/containerd/otelttrpc v0.1.0/go.mod h1:XhoA2VvaGPW1clB2ULwrBZfXVuEWuyOd2NUD1IM0yTg=
@@ -427,6 +433,7 @@ github.com/envoyproxy/protoc-gen-validate v1.3.3 h1:MVQghNeW+LZcmXe7SY1V36Z+WFMD
github.com/envoyproxy/protoc-gen-validate v1.3.3/go.mod h1:TsndJ/ngyIdQRhMcVVGDDHINPLWB7C82oDArY51KfB0=
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
+github.com/erofs/go-erofs v0.3.0 h1:o/W5ABAA3sHYl97WL93dacKEfeDpJhdFf3c2snAti7I=
github.com/erofs/go-erofs v0.3.0/go.mod h1:XkSeN9MHszGd4+3gcEjadJLYHCQpWzJ7/8yznzMuzJs=
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
@@ -625,6 +632,7 @@ github.com/ianlancetaylor/demangle v0.0.0-20250417193237-f615e6bd150b/go.mod h1:
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/intel/goresctrl v0.10.0 h1:Q94PBhLtQM/aVxVTKzB1j/ooMuV+9XleTN1fq2OGsSo=
github.com/intel/goresctrl v0.10.0/go.mod h1:1S8GDqL46GuKb525bxNhIEEkhf4rhVcbSf9DuKhp7mw=
+github.com/intel/goresctrl v0.12.0 h1:F44m7jiVgOdqWfTTWaREF+5HTeX3i06qhvpuzpnrBko=
github.com/intel/goresctrl v0.12.0/go.mod h1:5GWtmPY4BWl/a9rU8apGED9Xul5b5WoLtg/qOWaghWU=
github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
@@ -723,6 +731,7 @@ github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec h1:2tTW6cDth2T
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec/go.mod h1:TmwEoGCwIti7BCeJ9hescZgRtatxRE+A72pCoPfmcfk=
github.com/letsencrypt/boulder v0.20251110.0 h1:J8MnKICeilO91dyQ2n5eBbab24neHzUpYMUIOdOtbjc=
github.com/letsencrypt/boulder v0.20251110.0/go.mod h1:ogKCJQwll82m7OVHWyTuf8eeFCjuzdRQlgnZcCl0V+8=
+github.com/letsencrypt/boulder v0.20260223.0 h1:xdS2OnJNUasR6TgVIOpqqcvdkOu47+PQQMBk9ThuWBw=
github.com/letsencrypt/boulder v0.20260223.0/go.mod h1:r3aTSA7UZ7dbDfiGK+HLHJz0bWNbHk6YSPiXgzl23sA=
github.com/lib/pq v0.0.0-20150723085316-0dad96c0b94f/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/magiconair/properties v1.5.3 h1:C8fxWnhYyME3n0klPOhVM7PtYUB3eV1W3DeFmN3j53Y=
@@ -840,6 +849,7 @@ github.com/opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2 h1:
github.com/opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2/go.mod h1:MXdPzqAA8pHC58USHqNCSjyLnRQ6D+NjbpP+02Z1U/0=
github.com/opencontainers/runtime-tools v0.9.1-0.20251114084447-edf4cb3d2116 h1:tAKu3NkKWZYpqBSOJKwTxT1wIGueiF7gcmcNgr5pNTY=
github.com/opencontainers/runtime-tools v0.9.1-0.20251114084447-edf4cb3d2116/go.mod h1:DKDEfzxvRkoQ6n9TGhxQgg2IM1lY4aM0eaQP4e3oElw=
+github.com/opencontainers/selinux v1.13.1 h1:A8nNeceYngH9Ow++M+VVEwJVpdFmrlxsN22F+ISDCJE=
github.com/opencontainers/selinux v1.13.1/go.mod h1:S10WXZ/osk2kWOYKy1x2f/eXF5ZHJoUs8UU/2caNRbg=
github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
@@ -946,12 +956,14 @@ github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZB
github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
github.com/tetratelabs/wazero v1.10.1 h1:2DugeJf6VVk58KTPszlNfeeN8AhhpwcZqkJj2wwFuH8=
github.com/tetratelabs/wazero v1.10.1/go.mod h1:DRm5twOQ5Gr1AoEdSi0CLjDQF1J9ZAuyqFIjl1KKfQU=
+github.com/tetratelabs/wazero v1.11.0 h1:+gKemEuKCTevU4d7ZTzlsvgd1uaToIDtlQlmNbwqYhA=
github.com/tetratelabs/wazero v1.11.0/go.mod h1:eV28rsN8Q+xwjogd7f4/Pp4xFxO7uOGbLcD/LzB1wiU=
github.com/theupdateframework/go-tuf v0.7.0/go.mod h1:uEB7WSY+7ZIugK6R1hiBMBjQftaFzn7ZCDJcp1tCUug=
github.com/theupdateframework/notary v0.7.0 h1:QyagRZ7wlSpjT5N2qQAh/pN+DVqgekv4DzbAiAiEL3c=
github.com/theupdateframework/notary v0.7.0/go.mod h1:c9DRxcmhHmVLDay4/2fUYdISnHqbFDGRSlXPO0AhYWw=
github.com/tink-crypto/tink-go/v2 v2.5.0 h1:B8KLF6AofxdBIE4UJIaFbmoj5/1ehEtt7/MmzfI4Zpw=
github.com/tink-crypto/tink-go/v2 v2.5.0/go.mod h1:2WbBA6pfNsAfBwDCggboaHeB2X29wkU8XHtGwh2YIk8=
+github.com/tink-crypto/tink-go/v2 v2.6.0 h1:+KHNBHhWH33Vn+igZWcsgdEPUxKwBMEe0QC60t388v4=
github.com/tink-crypto/tink-go/v2 v2.6.0/go.mod h1:2WbBA6pfNsAfBwDCggboaHeB2X29wkU8XHtGwh2YIk8=
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 h1:e/5i7d4oYZ+C1wj2THlRK+oAhjeS/TRQwMfkIuet3w0=
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399/go.mod h1:LdwHTNJT99C5fTAzDz0ud328OgXz+gierycbcIx2fRs=
@@ -1222,6 +1234,7 @@ golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c h1:6a8FdnNk6bTXBjR4AGK
golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c/go.mod h1:TpUTTEp9frx7rTdLpC9gFG9kdI7zVLFTFFlqaH2Cncw=
golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa h1:efT73AJZfAAUV7SOip6pWGkwJDzIGiKBZGVzHYa+ve4=
golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa/go.mod h1:kHjTxDEnAu6/Nl9lDkzjWpR+bmKfxeiRuSDlsMb70gE=
+golang.org/x/telemetry v0.0.0-20260508192327-42602be52be6 h1:HjU6IWBiAgRIdAJ9/y1rwCn+UELEmwV+VsTLzj/W4sE=
golang.org/x/telemetry v0.0.0-20260508192327-42602be52be6/go.mod h1:Eqhaxk/wZsWEH8CRxLwj6xzEJbz7k1EFGqx7nyCoabE=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -1359,36 +1372,47 @@ k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
k8s.io/api v0.35.2 h1:tW7mWc2RpxW7HS4CoRXhtYHSzme1PN1UjGHJ1bdrtdw=
k8s.io/api v0.35.2/go.mod h1:7AJfqGoAZcwSFhOjcGM7WV05QxMMgUaChNfLTXDRE60=
+k8s.io/api v0.36.0 h1:SgqDhZzHdOtMk40xVSvCXkP9ME0H05hPM3p9AB1kL80=
k8s.io/api v0.36.0/go.mod h1:m1LVrGPNYax5NBHdO+QuAedXyuzTt4RryI/qnmNvs34=
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
k8s.io/apimachinery v0.35.2 h1:NqsM/mmZA7sHW02JZ9RTtk3wInRgbVxL8MPfzSANAK8=
k8s.io/apimachinery v0.35.2/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
+k8s.io/apimachinery v0.36.0 h1:jZyPzhd5Z+3h9vJLt0z9XdzW9VzNzWAUw+P1xZ9PXtQ=
k8s.io/apimachinery v0.36.0/go.mod h1:FklypaRJt6n5wUIwWXIP6GJlIpUizTgfo1T/As+Tyxc=
k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=
k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
k8s.io/client-go v0.35.2 h1:YUfPefdGJA4aljDdayAXkc98DnPkIetMl4PrKX97W9o=
k8s.io/client-go v0.35.2/go.mod h1:4QqEwh4oQpeK8AaefZ0jwTFJw/9kIjdQi0jpKeYvz7g=
+k8s.io/client-go v0.36.0 h1:pOYi7C4RHChYjMiHpZSpSbIM6ZxVbRXBy7CuiIwqA3c=
k8s.io/client-go v0.36.0/go.mod h1:ZKKcpwF0aLYfkHFCjillCKaTK/yBkEDHTDXCFY6AS9Y=
+k8s.io/component-base v0.36.0 h1:hFjEktssxiJhrK1zfybkH4kJOi8iZuF+mIDCqS5+jRo=
k8s.io/component-base v0.36.0/go.mod h1:JZvIfcNHk+uck+8LhJzhSBtydWXaZNQwX2OdL+Mnwsk=
k8s.io/cri-api v0.34.1 h1:n2bU++FqqJq0CNjP/5pkOs0nIx7aNpb1Xa053TecQkM=
k8s.io/cri-api v0.34.1/go.mod h1:4qVUjidMg7/Z9YGZpqIDygbkPWkg3mkS1PvOx/kpHTE=
+k8s.io/cri-api v0.36.0 h1:DSuUPB3HjUPIFBXmXIWbooJlr1euKXzPSdhpeCRgLFA=
k8s.io/cri-api v0.36.0/go.mod h1:1gMX7udEAiRCWGS4uxscdbxq6vufwhZt38Ri+XH6P00=
+k8s.io/cri-client v0.36.0 h1:1xca/ii9afypuGzSnWAnaPSyYIZGC+7P2EkaEsk+RDc=
k8s.io/cri-client v0.36.0/go.mod h1:sMNSZqkBxzc/8IqPQyVg+QaKnntLn6bnP5xjOQ9OX6U=
+k8s.io/cri-streaming v0.36.0 h1:ZCULHNFtJj3taZj6XEQVS5atO2M+qfJkXUMkea0hsj8=
k8s.io/cri-streaming v0.36.0/go.mod h1:AGYm+qv2gm7CTj9Gotc6CxPy7xEvyJGVvc3RhWNK5NQ=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
+k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA=
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE=
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
+k8s.io/kube-openapi v0.0.0-20260319004828-5883c5ee87b9 h1:Sztf7ESG9tAXRW/ACJZjrj5jhdOUqS2KFRQT+CTvu78=
k8s.io/kube-openapi v0.0.0-20260319004828-5883c5ee87b9/go.mod h1:uGBT7iTA6c6MvqUvSXIaYZo9ukscABYi2btjhvgKGZ0=
+k8s.io/streaming v0.36.0 h1:agnTxU+NFulUrtYzXUGKO3ndEa8jKwht1Kwn9nu9x+4=
k8s.io/streaming v0.36.0/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 h1:kBawHLSnx/mYHmRnNUf9d4CpjREbeZuxoSGOX/J+aYM=
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
kernel.org/pub/linux/libs/security/libcap/cap v1.2.76 h1:mrdLPj8ujM6eIKGtd1PkkuCIodpFFDM42Cfm0YODkIM=
kernel.org/pub/linux/libs/security/libcap/cap v1.2.76/go.mod h1:7V2BQeHnVAQwhCnCPJ977giCeGDiywVewWF+8vkpPlc=
@@ -1430,6 +1454,7 @@ sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=
sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
+sigs.k8s.io/structured-merge-diff/v6 v6.3.2 h1:kwVWMx5yS1CrnFWA/2QHyRVJ8jM6dBA80uLmm0wJkk8=
sigs.k8s.io/structured-merge-diff/v6 v6.3.2/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=