Skip to content
This repository was archived by the owner on Feb 4, 2021. It is now read-only.

Commit 2e58a6b

Browse files
committed
Fix tls
1 parent 52f4305 commit 2e58a6b

File tree

2 files changed

+25
-16
lines changed

2 files changed

+25
-16
lines changed

app/config/config.go

+17-16
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,24 @@ import (
88

99
// Config represents app config
1010
type Config struct {
11-
DataBaseURL string `envconfig:"database_url" required:"true"`
12-
TestDataBaseURL string `envconfig:"test_database_url" required:"true"`
13-
RedisAddr string `envconfig:"redis_addr" required:"true"`
14-
DebugLog bool `envconfig:"debug_log"`
15-
JobIntervalSec int `envconfig:"job_interval_sec" required:"true"`
16-
HydraAdminURL string `envconfig:"hydra_admin_url" required:"true"`
17-
MinioPublicURL string `envconfig:"minio_public_url" required:"true"`
18-
MinioEndpoint string `envconfig:"minio_endpoint" required:"true"`
19-
MinioAccessKey string `envconfig:"minio_access_key" required:"true"`
20-
MinioSecretKey string `envconfig:"minio_secret_key" required:"true"`
21-
MinioBucketName string `envconfig:"minio_bucket_name" required:"true"`
22-
ClientRegistrationURL string `envconfig:"client_registration_url" required:"true"`
23-
ClientConfirmationURL string `envconfig:"client_confirmation_url" required:"true"`
11+
DataBaseURL string `envconfig:"database_url" required:"true"`
12+
TestDataBaseURL string `envconfig:"test_database_url" required:"true"`
13+
RedisAddr string `envconfig:"redis_addr" required:"true"`
14+
DebugLog bool `envconfig:"debug_log"`
15+
JobIntervalSec int `envconfig:"job_interval_sec" required:"true"`
16+
HydraAdminURL string `envconfig:"hydra_admin_url" required:"true"`
17+
MinioPublicURL string `envconfig:"minio_public_url" required:"true"`
18+
MinioEndpoint string `envconfig:"minio_endpoint" required:"true"`
19+
MinioAccessKey string `envconfig:"minio_access_key" required:"true"`
20+
MinioSecretKey string `envconfig:"minio_secret_key" required:"true"`
21+
MinioBucketName string `envconfig:"minio_bucket_name" required:"true"`
22+
ClientRegistrationURL string `envconfig:"client_registration_url" required:"true"`
23+
ClientConfirmationURL string `envconfig:"client_confirmation_url" required:"true"`
2424
ClientPasswordResetURL string `envconfig:"client_password_reset_url" required:"true"`
25-
SMTPAddr string `envconfig:"smtp_addr" required:"true"`
26-
EmailFrom string `envconfig:"email_from" required:"true"`
27-
GitHubAccessToken string `envconfig:"github_access_token" required:"true"`
25+
SMTPAddr string `envconfig:"smtp_addr" required:"true"`
26+
SMTPInsecureSkipVerify bool `envconfig:"smtp_insecure_skip_verify" required:"false"`
27+
EmailFrom string `envconfig:"email_from" required:"true"`
28+
GitHubAccessToken string `envconfig:"github_access_token" required:"true"`
2829
}
2930

3031
// LoadConfig loads config

infra/email/email.go

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package email
33
import (
44
"bytes"
55
"context"
6+
"crypto/tls"
67
"net/url"
78

89
"github.com/jordan-wright/email"
@@ -126,6 +127,13 @@ func (s *senderImpl) send(to, subject, tmplName string, d interface{}) error {
126127
e.To = []string{to}
127128
e.Subject = subjectPrefix + subject
128129
e.Text = buf.Bytes()
130+
if s.cfg.SMTPInsecureSkipVerify {
131+
t := &tls.Config{
132+
InsecureSkipVerify: true,
133+
}
134+
err = e.SendWithTLS(s.cfg.SMTPAddr, nil, t)
135+
return errors.WithStack(err)
136+
}
129137
err = e.Send(s.cfg.SMTPAddr, nil)
130138
return errors.WithStack(err)
131139
}

0 commit comments

Comments
 (0)