diff --git a/config/smtp.go b/config/smtp.go index 9ec799f..d53de06 100644 --- a/config/smtp.go +++ b/config/smtp.go @@ -1,39 +1,31 @@ package config import ( - "errors" "fmt" + + "github.com/go-playground/validator/v10" ) // SMTPConfig handles mandatory parameters for the STMP server connection type SMTPConfig struct { - User string - Password string - Url string - Port string + User string `validate:"required"` + Password string `validate:"required"` + Url string `validate:"required"` + Port string `validate:"required"` } func NewSMTPConfig(user, password, url, port string) (SMTPConfig, error) { - var config SMTPConfig - if user == "" { - return config, errors.New("SMTP user can't be empty") + config := SMTPConfig{ + User: user, + Password: password, + Url: url, + Port: port, } - config.User = user - if password == "" { - return config, errors.New("SMTP password can't be empty") + validate := validator.New(validator.WithRequiredStructEnabled()) + if err := validate.Struct(config); err != nil { + return config, err } - config.Password = password - - if url == "" { - return config, errors.New("SMTP server url can't be empty") - } - config.Url = url - - if port == "" { - return config, errors.New("SMTP server port can't be empty") - } - config.Port = port return config, nil } diff --git a/config/smtp_test.go b/config/smtp_test.go new file mode 100644 index 0000000..2d08f55 --- /dev/null +++ b/config/smtp_test.go @@ -0,0 +1,26 @@ +package config + +import ( + "testing" + + "github.com/go-playground/validator/v10" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestSMTPConfig(t *testing.T) { + t.Run("right config", func(t *testing.T) { + _, err := NewSMTPConfig("test", "test", "test", "test") + require.NoError(t, err) + }) + + t.Run("empty user", func(t *testing.T) { + _, err := NewSMTPConfig("", "test", "test", "test") + require.Error(t, err) + + _, ok := err.(*validator.InvalidValidationError) + require.False(t, ok) + + assert.Contains(t, err.Error(), "validation for 'User'") + }) +} diff --git a/go.mod b/go.mod index b374ca0..9d93794 100644 --- a/go.mod +++ b/go.mod @@ -4,14 +4,26 @@ go 1.20 require ( github.com/alecthomas/kingpin/v2 v2.3.2 + github.com/go-playground/validator/v10 v10.15.3 github.com/rs/zerolog v1.29.1 + github.com/stretchr/testify v1.8.2 gopkg.in/ini.v1 v1.67.0 ) require ( github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/gabriel-vasile/mimetype v1.4.2 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/leodido/go-urn v1.2.4 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect github.com/xhit/go-str2duration/v2 v2.1.0 // indirect - golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect + golang.org/x/crypto v0.7.0 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/text v0.8.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 93116ed..352f208 100644 --- a/go.sum +++ b/go.sum @@ -5,7 +5,19 @@ github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8V github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= +github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.15.3 h1:S+sSpunYjNPDuXkWbK+x+bA7iXiW296KG4dL3X7xUZo= +github.com/go-playground/validator/v10 v10.15.3/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= +github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= @@ -17,15 +29,30 @@ github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc= github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= +golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/mail/mail.go b/mail/mail.go index 18b6964..49a9114 100644 --- a/mail/mail.go +++ b/mail/mail.go @@ -5,14 +5,18 @@ import ( "fmt" "os" "strings" + + "github.com/go-playground/validator/v10" ) +var validate *validator.Validate + type Email struct { Path string - Sender string `json:"sender"` - Receivers string `json:"receivers"` - Subject string `json:"subject"` - Content string `json:"content"` + Sender string `json:"sender" validate:"required,email"` + Receivers string `json:"receivers" validate:"required"` + Subject string `json:"subject" validate:"required"` + Content string `json:"content" validate:"required"` } func FromJSON(path string) (Email, error) { @@ -27,6 +31,11 @@ func FromJSON(path string) (Email, error) { return mail, err } + validate = validator.New(validator.WithRequiredStructEnabled()) + if err := validate.Struct(mail); err != nil { + return mail, err + } + return mail, nil } diff --git a/mail/mail_test.go b/mail/mail_test.go new file mode 100644 index 0000000..2a2a777 --- /dev/null +++ b/mail/mail_test.go @@ -0,0 +1,60 @@ +package mail + +import ( + "os" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestFromJson(t *testing.T) { + t.Run("right format", func(t *testing.T) { + f, err := os.CreateTemp("", "temptest-") + require.NoError(t, err) + + defer f.Close() + defer os.Remove(f.Name()) + + data := []byte(`{ + "sender":"test@test.com", + "receivers": "test@test.com, test2@test.com", + "subject": "test", + "content": "test" + }`) + + n, err := f.Write(data) + require.NoError(t, err) + require.NotEmpty(t, n) + + mail, err := FromJSON(f.Name()) + require.NoError(t, err) + + assert.Equal(t, "test@test.com", mail.Sender) + }) + + t.Run("bad sender", func(t *testing.T) { + f, err := os.CreateTemp("", "temptest-") + require.NoError(t, err) + + defer f.Close() + defer os.Remove(f.Name()) + + data := []byte(`{ + "sender":"test", + "receivers": "test@test.com, test2@test.com", + "subject": "test", + "content": "test" + }`) + + n, err := f.Write(data) + require.NoError(t, err) + require.NotEmpty(t, n) + + _, err = FromJSON(f.Name()) + require.Error(t, err) + + assert.Contains(t, err.Error(), "validation for 'Sender'") + }) + +}