mirror of
https://github.com/binwiederhier/ntfy.git
synced 2024-12-22 17:52:30 +01:00
Merge pull request #693 from binwiederhier/html-emails
WIP: HTML emails
This commit is contained in:
Philipp C. Heckel
GitHub
commit
d0c2b00fbf
5 changed files with 881 additions and 24 deletions
|
|
@ -1287,6 +1287,7 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
|
|||
|
||||
**Bug fixes + maintenance:**
|
||||
|
||||
* Support for HTML-only emails ([#690](https://github.com/binwiederhier/ntfy/issues/690)/[#693](https://github.com/binwiederhier/ntfy/pull/693), thanks to [@teastrainer](https://github.com/teastrainer) and [@CrazyWolf13](https://github.com/CrazyWolf13) for reporting)
|
||||
* Fix ACL issue with topic patterns containing underscores ([#840](https://github.com/binwiederhier/ntfy/issues/840), thanks to [@Joe-0237](https://github.com/Joe-0237) for reporting)
|
||||
* Re-add `tzdata` to Docker images for amd64 image ([#894](https://github.com/binwiederhier/ntfy/issues/894), [#307](https://github.com/binwiederhier/ntfy/pull/307))
|
||||
* Add special logic to ignore `Priority` header if it resembled a RFC 9218 value ([#851](https://github.com/binwiederhier/ntfy/pull/851)/[#895](https://github.com/binwiederhier/ntfy/pull/895), thanks to [@gusdleon](https://github.com/gusdleon), see also [#351](https://github.com/binwiederhier/ntfy/issues/351), [#353](https://github.com/binwiederhier/ntfy/issues/353), [#461](https://github.com/binwiederhier/ntfy/issues/461))
|
||||
|
|
|
|||
29
go.mod
29
go.mod
|
|
@ -1,10 +1,12 @@
|
|||
module heckel.io/ntfy
|
||||
|
||||
go 1.18
|
||||
go 1.21
|
||||
|
||||
toolchain go1.21.3
|
||||
|
||||
require (
|
||||
cloud.google.com/go/firestore v1.14.0 // indirect
|
||||
cloud.google.com/go/storage v1.34.1 // indirect
|
||||
cloud.google.com/go/storage v1.35.1 // indirect
|
||||
github.com/BurntSushi/toml v1.3.2 // indirect
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
|
||||
github.com/emersion/go-smtp v0.18.0
|
||||
|
|
@ -12,14 +14,14 @@ require (
|
|||
github.com/gorilla/websocket v1.5.1
|
||||
github.com/mattn/go-sqlite3 v1.14.18
|
||||
github.com/olebedev/when v1.0.0
|
||||
github.com/stretchr/testify v1.8.1
|
||||
github.com/stretchr/testify v1.8.4
|
||||
github.com/urfave/cli/v2 v2.25.7
|
||||
golang.org/x/crypto v0.14.0
|
||||
golang.org/x/oauth2 v0.13.0 // indirect
|
||||
golang.org/x/crypto v0.15.0
|
||||
golang.org/x/oauth2 v0.14.0 // indirect
|
||||
golang.org/x/sync v0.5.0
|
||||
golang.org/x/term v0.13.0
|
||||
golang.org/x/term v0.14.0
|
||||
golang.org/x/time v0.4.0
|
||||
google.golang.org/api v0.149.0
|
||||
google.golang.org/api v0.150.0
|
||||
gopkg.in/yaml.v2 v2.4.0
|
||||
)
|
||||
|
||||
|
|
@ -30,6 +32,7 @@ require github.com/pkg/errors v0.9.1 // indirect
|
|||
require (
|
||||
firebase.google.com/go/v4 v4.12.1
|
||||
github.com/SherClockHolmes/webpush-go v1.3.0
|
||||
github.com/microcosm-cc/bluemonday v1.0.26
|
||||
github.com/prometheus/client_golang v1.17.0
|
||||
github.com/stripe/stripe-go/v74 v74.30.0
|
||||
)
|
||||
|
|
@ -42,10 +45,11 @@ require (
|
|||
cloud.google.com/go/longrunning v0.5.4 // indirect
|
||||
github.com/AlekSi/pointer v1.2.0 // indirect
|
||||
github.com/MicahParks/keyfunc v1.9.0 // indirect
|
||||
github.com/aymerick/douceur v0.2.0 // indirect
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead // indirect
|
||||
github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43 // indirect
|
||||
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
|
||||
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
|
||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
||||
|
|
@ -54,6 +58,7 @@ require (
|
|||
github.com/google/uuid v1.4.0 // indirect
|
||||
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
|
||||
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
|
||||
github.com/gorilla/css v1.0.1 // indirect
|
||||
github.com/kr/text v0.2.0 // indirect
|
||||
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
|
|
@ -64,15 +69,15 @@ require (
|
|||
github.com/stretchr/objx v0.5.0 // indirect
|
||||
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
|
||||
go.opencensus.io v0.24.0 // indirect
|
||||
golang.org/x/net v0.17.0 // indirect
|
||||
golang.org/x/net v0.18.0 // indirect
|
||||
golang.org/x/sys v0.14.0 // indirect
|
||||
golang.org/x/text v0.14.0 // indirect
|
||||
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
|
||||
google.golang.org/appengine v1.6.8 // indirect
|
||||
google.golang.org/appengine/v2 v2.0.5 // indirect
|
||||
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
|
||||
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
|
||||
google.golang.org/grpc v1.59.0 // indirect
|
||||
google.golang.org/protobuf v1.31.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
|
|
|
|||
31
go.sum
31
go.sum
|
|
@ -13,6 +13,8 @@ cloud.google.com/go/longrunning v0.5.4 h1:w8xEcbZodnA2BbW6sVirkkoC+1gP8wS57EUUgG
|
|||
cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI=
|
||||
cloud.google.com/go/storage v1.34.1 h1:H2Af2dU5J0PF7A5B+ECFIce+RqxVnrVilO+cu0TS3MI=
|
||||
cloud.google.com/go/storage v1.34.1/go.mod h1:VN1ElqqvR9adg1k9xlkUJ55cMOP1/QjnNNuT5xQL6dY=
|
||||
cloud.google.com/go/storage v1.35.1 h1:B59ahL//eDfx2IIKFBeT5Atm9wnNmj3+8xG/W4WB//w=
|
||||
cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8=
|
||||
firebase.google.com/go/v4 v4.12.1 h1:tDNvobifGsx/1HSFLnM0fmNfx/CDZSgsTO2KhZtgpcs=
|
||||
firebase.google.com/go/v4 v4.12.1/go.mod h1:60c36dWLK4+j05Vw5XMllek3b3PCynU3BfI46OSwsUE=
|
||||
github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w=
|
||||
|
|
@ -24,6 +26,8 @@ github.com/MicahParks/keyfunc v1.9.0 h1:lhKd5xrFHLNOWrDc4Tyb/Q1AJ4LCzQ48GVJyVIID
|
|||
github.com/MicahParks/keyfunc v1.9.0/go.mod h1:IdnCilugA0O/99dW+/MkvlyrsX8+L8+x95xuVNtM5jw=
|
||||
github.com/SherClockHolmes/webpush-go v1.3.0 h1:CAu3FvEE9QS4drc3iKNgpBWFfGqNthKlZhp5QpYnu6k=
|
||||
github.com/SherClockHolmes/webpush-go v1.3.0/go.mod h1:AxRHmJuYwKGG1PVgYzToik1lphQvDnqFYDqimHvwhIw=
|
||||
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
|
||||
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
|
||||
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
||||
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||
|
|
@ -40,6 +44,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
|
|||
github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
|
||||
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y=
|
||||
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
|
||||
github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43 h1:hH4PQfOndHDlpzYfLAAfl63E8Le6F2+EL/cdhlkyRJY=
|
||||
github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
|
||||
github.com/emersion/go-smtp v0.17.0 h1:tq90evlrcyqRfE6DSXaWVH54oX6OuZOQECEmhWBMEtI=
|
||||
github.com/emersion/go-smtp v0.17.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
|
||||
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
|
|
@ -89,6 +95,10 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF
|
|||
github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
|
||||
github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
|
||||
github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
|
||||
github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
|
||||
github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
|
||||
github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
|
||||
github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
|
||||
github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
|
||||
github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
|
||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
|
|
@ -96,8 +106,11 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
|||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||
github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI=
|
||||
github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
|
||||
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
|
||||
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
|
||||
github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
|
||||
github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs=
|
||||
github.com/olebedev/when v1.0.0 h1:T2DZCj8HxUhOVxcqaLOmzuTr+iZLtMHsZEim7mjIA2w=
|
||||
github.com/olebedev/when v1.0.0/go.mod h1:T0THb4kP9D3NNqlvCwIG4GyUioTAzEhB4RNVzig/43E=
|
||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
|
|
@ -125,6 +138,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
|
|||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
|
||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
github.com/stripe/stripe-go/v74 v74.30.0 h1:0Kf0KkeFnY7iRhOwvTerX0Ia1BRw+eV1CVJ51mGYAUY=
|
||||
github.com/stripe/stripe-go/v74 v74.30.0/go.mod h1:f9L6LvaXa35ja7eyvP6GQswoaIPaBRvGAimAO+udbBw=
|
||||
github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
|
||||
|
|
@ -140,6 +155,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
|
|||
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
|
||||
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
|
||||
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
|
||||
golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
|
||||
golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
|
||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
||||
|
|
@ -160,9 +177,13 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
|||
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
|
||||
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
|
||||
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
|
||||
golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
|
||||
golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
|
||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||
golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
|
||||
golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
|
||||
golang.org/x/oauth2 v0.14.0 h1:P0Vrf/2538nmC0H+pEQ3MNFRRnVR7RlqyVw+bvm26z0=
|
||||
golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM=
|
||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
|
|
@ -189,6 +210,8 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
|||
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
|
||||
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
|
||||
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
|
||||
golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=
|
||||
golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
|
|
@ -214,6 +237,8 @@ golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSm
|
|||
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
|
||||
google.golang.org/api v0.149.0 h1:b2CqT6kG+zqJIVKRQ3ELJVLN1PwHZ6DJ3dW8yl82rgY=
|
||||
google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI=
|
||||
google.golang.org/api v0.150.0 h1:Z9k22qD289SZ8gCJrk4DrWXkNjtfvKAUo/l1ma8eBYE=
|
||||
google.golang.org/api v0.150.0/go.mod h1:ccy+MJ6nrYFgE3WgRx/AMXOxOmU8Q4hSa+jjibzhxcg=
|
||||
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
|
||||
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
||||
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
|
||||
|
|
@ -225,10 +250,16 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
|
|||
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
|
||||
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U=
|
||||
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4=
|
||||
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ=
|
||||
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405 h1:HJMDndgxest5n2y77fnErkM62iUsptE/H8p0dC2Huo4=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405/go.mod h1:oT32Z4o8Zv2xPQTg0pbVaPr0MPOH6f14RgXt7zfIpwg=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA=
|
||||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
||||
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
||||
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import (
|
|||
"errors"
|
||||
"fmt"
|
||||
"github.com/emersion/go-smtp"
|
||||
"github.com/microcosm-cc/bluemonday"
|
||||
"io"
|
||||
"mime"
|
||||
"mime/multipart"
|
||||
|
|
@ -14,6 +15,7 @@ import (
|
|||
"net/http"
|
||||
"net/http/httptest"
|
||||
"net/mail"
|
||||
"regexp"
|
||||
"strings"
|
||||
"sync"
|
||||
)
|
||||
|
|
@ -27,6 +29,11 @@ var (
|
|||
errUnsupportedContentType = errors.New("unsupported content type")
|
||||
)
|
||||
|
||||
var (
|
||||
onlySpacesRegex = regexp.MustCompile(`(?m)^\s+$`)
|
||||
consecutiveNewLinesRegex = regexp.MustCompile(`\n{3,}`)
|
||||
)
|
||||
|
||||
const (
|
||||
maxMultipartDepth = 2
|
||||
)
|
||||
|
|
@ -232,37 +239,66 @@ func readMailBody(body io.Reader, header mail.Header) (string, error) {
|
|||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
if strings.ToLower(contentType) == "text/plain" {
|
||||
return readPlainTextMailBody(body, header.Get("Content-Transfer-Encoding"))
|
||||
} else if strings.HasPrefix(strings.ToLower(contentType), "multipart/") {
|
||||
return readMultipartMailBody(body, params, 0)
|
||||
canonicalContentType := strings.ToLower(contentType)
|
||||
if canonicalContentType == "text/plain" || canonicalContentType == "text/html" {
|
||||
return readTextMailBody(body, canonicalContentType, header.Get("Content-Transfer-Encoding"))
|
||||
} else if strings.HasPrefix(canonicalContentType, "multipart/") {
|
||||
return readMultipartMailBody(body, params)
|
||||
}
|
||||
return "", errUnsupportedContentType
|
||||
}
|
||||
|
||||
func readMultipartMailBody(body io.Reader, params map[string]string, depth int) (string, error) {
|
||||
func readMultipartMailBody(body io.Reader, params map[string]string) (string, error) {
|
||||
parts := make(map[string]string)
|
||||
if err := readMultipartMailBodyParts(body, params, 0, parts); err != nil && err != io.EOF {
|
||||
return "", err
|
||||
} else if s, ok := parts["text/plain"]; ok {
|
||||
return s, nil
|
||||
} else if s, ok := parts["text/html"]; ok {
|
||||
return s, nil
|
||||
}
|
||||
return "", io.EOF
|
||||
}
|
||||
|
||||
func readMultipartMailBodyParts(body io.Reader, params map[string]string, depth int, parts map[string]string) error {
|
||||
if depth >= maxMultipartDepth {
|
||||
return "", errMultipartNestedTooDeep
|
||||
return errMultipartNestedTooDeep
|
||||
}
|
||||
mr := multipart.NewReader(body, params["boundary"])
|
||||
for {
|
||||
part, err := mr.NextPart()
|
||||
if err != nil { // may be io.EOF
|
||||
return "", err
|
||||
return err
|
||||
}
|
||||
partContentType, partParams, err := mime.ParseMediaType(part.Header.Get("Content-Type"))
|
||||
if err != nil {
|
||||
return "", err
|
||||
return err
|
||||
}
|
||||
if strings.ToLower(partContentType) == "text/plain" {
|
||||
return readPlainTextMailBody(part, part.Header.Get("Content-Transfer-Encoding"))
|
||||
canonicalPartContentType := strings.ToLower(partContentType)
|
||||
if canonicalPartContentType == "text/plain" || canonicalPartContentType == "text/html" {
|
||||
s, err := readTextMailBody(part, canonicalPartContentType, part.Header.Get("Content-Transfer-Encoding"))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
parts[canonicalPartContentType] = s
|
||||
} else if strings.HasPrefix(strings.ToLower(partContentType), "multipart/") {
|
||||
return readMultipartMailBody(part, partParams, depth+1)
|
||||
if err := readMultipartMailBodyParts(part, partParams, depth+1, parts); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
// Continue with next part
|
||||
}
|
||||
}
|
||||
|
||||
func readTextMailBody(reader io.Reader, contentType, transferEncoding string) (string, error) {
|
||||
if contentType == "text/plain" {
|
||||
return readPlainTextMailBody(reader, transferEncoding)
|
||||
} else if contentType == "text/html" {
|
||||
return readHTMLMailBody(reader, transferEncoding)
|
||||
}
|
||||
return "", fmt.Errorf("unsupported content type: %s", contentType)
|
||||
}
|
||||
|
||||
func readPlainTextMailBody(reader io.Reader, transferEncoding string) (string, error) {
|
||||
if strings.ToLower(transferEncoding) == "base64" {
|
||||
reader = base64.NewDecoder(base64.StdEncoding, reader)
|
||||
|
|
@ -275,3 +311,21 @@ func readPlainTextMailBody(reader io.Reader, transferEncoding string) (string, e
|
|||
}
|
||||
return string(body), nil
|
||||
}
|
||||
|
||||
func readHTMLMailBody(reader io.Reader, transferEncoding string) (string, error) {
|
||||
body, err := readPlainTextMailBody(reader, transferEncoding)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
stripped := bluemonday.
|
||||
StrictPolicy().
|
||||
AddSpaceWhenStrippingTag(true).
|
||||
Sanitize(body)
|
||||
return removeExtraEmptyLines(stripped), nil
|
||||
}
|
||||
|
||||
func removeExtraEmptyLines(s string) string {
|
||||
s = onlySpacesRegex.ReplaceAllString(s, "")
|
||||
s = consecutiveNewLinesRegex.ReplaceAllString(s, "\n\n")
|
||||
return s
|
||||
}
|
||||
|
|
|
|||
|
|
@ -568,6 +568,773 @@ L0VOIj4KClRoaXMgaXMgYSB0ZXN0IG1lc3NhZ2UgZnJvbSBUcnVlTkFTIENPUkUuCg==
|
|||
writeAndReadUntilLine(t, email, c, scanner, "554 5.0.0 Error: transaction failed, blame it on the weather: multipart message nested too deep")
|
||||
}
|
||||
|
||||
func TestSmtpBackend_HTMLEmail(t *testing.T) {
|
||||
email := `EHLO example.com
|
||||
MAIL FROM: test@mydomain.me
|
||||
RCPT TO: ntfy-mytopic@ntfy.sh
|
||||
DATA
|
||||
Message-Id: <51610934ss4.mmailer@fritz.box>
|
||||
From: <email@email.com>
|
||||
To: <email@email.com>,
|
||||
<ntfy-subjectatntfy@ntfy.sh>
|
||||
Date: Thu, 30 Mar 2023 02:56:53 +0000
|
||||
Subject: A HTML email
|
||||
Mime-Version: 1.0
|
||||
Content-Type: text/html;
|
||||
charset="utf-8"
|
||||
Content-Transfer-Encoding: quoted-printable
|
||||
|
||||
<=21DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Alerttitle</title>
|
||||
<meta http-equiv=3D"content-type" content=3D"text/html;charset=3Dutf-8"/>
|
||||
</head>
|
||||
<body style=3D"color: =23000000; background-color: =23f0eee6;">
|
||||
<table width=3D"100%" align=3D"center" style=3D"border:solid 2px =23eeeeee=
|
||||
; border-collapse: collapse;">
|
||||
<tr>
|
||||
<td>
|
||||
<table style=3D"border-collapse: collapse;">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<tr>
|
||||
<td style=3D"background: =23FFFFFF;">
|
||||
<table style=3D"color: =23FFFFFF; background-color: =23006EC0; border-coll=
|
||||
apse: collapse;">
|
||||
<tr>
|
||||
<td style=3D"width: 1000px; text-align: center; font-size: 18pt; font-fami=
|
||||
ly: Arial, Helvetica, sans-serif; padding: 10px;">
|
||||
|
||||
|
||||
headertext of table
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<tr>
|
||||
<td style=3D"padding: 10px 20px; background: =23FFFFFF;">
|
||||
<table style=3D"border-collapse: collapse;">
|
||||
<tr>
|
||||
<td style=3D"width: 940px; font-size: 13pt; font-family: Arial, Helvetica,=
|
||||
sans-serif; text-align: left;">
|
||||
" Very important information about a change in your
|
||||
home automation setup
|
||||
|
||||
Now the light is on
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
|
||||
<tr>
|
||||
<td style=3D"padding: 10px 20px; background: =23FFFFFF;">
|
||||
<table>
|
||||
<tr>
|
||||
<td style=3D"width: 960px; font-size: 10pt; font-family: Arial, Helvetica,=
|
||||
sans-serif; text-align: left;">
|
||||
<hr />
|
||||
If you don't want to receive this message anymore, stop the push
|
||||
services in your <a href=3D"https:fritzbox" target=3D"_=
|
||||
blank">FRITZ=21Box</a>=2E<br />
|
||||
Here you can see the active push services: "System > Push Service"=2E
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<table style=3D"color: =23FFFFFF; background-color: =23006EC0;">
|
||||
<tr>
|
||||
<td style=3D"width: 1000px; font-size: 10pt; font-family: Arial, Helvetica=
|
||||
, sans-serif; text-align: center; padding: 10px;">
|
||||
This mail has ben sent by your <a style=3D"color: =23FFFFFF;" href=3D"https:=
|
||||
//fritzbox" target=3D"_blank">FRITZ=21Box</a=
|
||||
> automatically=2E
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</body>
|
||||
</html>
|
||||
.
|
||||
`
|
||||
|
||||
s, c, _, scanner := newTestSMTPServer(t, func(w http.ResponseWriter, r *http.Request) {
|
||||
require.Equal(t, "/mytopic", r.URL.Path)
|
||||
require.Equal(t, "A HTML email", r.Header.Get("Title"))
|
||||
expected := `headertext of table
|
||||
|
||||
" Very important information about a change in your
|
||||
home automation setup
|
||||
|
||||
Now the light is on
|
||||
|
||||
If you don't want to receive this message anymore, stop the push
|
||||
services in your FRITZ!Box .
|
||||
Here you can see the active push services: "System > Push Service".
|
||||
|
||||
This mail has ben sent by your FRITZ!Box automatically.`
|
||||
require.Equal(t, expected, readAll(t, r.Body))
|
||||
})
|
||||
defer s.Close()
|
||||
defer c.Close()
|
||||
writeAndReadUntilLine(t, email, c, scanner, "250 2.0.0 OK: queued")
|
||||
}
|
||||
|
||||
const spamEmail = `
|
||||
EHLO example.com
|
||||
MAIL FROM: test@mydomain.me
|
||||
RCPT TO: ntfy-mytopic@ntfy.sh
|
||||
DATA
|
||||
Delivered-To: somebody@gmail.com
|
||||
Received: by 2002:a05:651c:1248:b0:2bf:c263:285 with SMTP id h8csp1096496ljh;
|
||||
Mon, 30 Oct 2023 06:23:08 -0700 (PDT)
|
||||
X-Google-Smtp-Source: AGHT+IFsB3WqbwbeefbeefbeefbeefbeefiXRNDHnIy2xBeaYHZCM3EC8DfPv55qDtgq9djTeBCF
|
||||
X-Received: by 2002:a05:6808:147:b0:3af:66e5:5d3c with SMTP id h7-20020a056808014700b003af66e55d3cmr11662458oie.26.1698672188132;
|
||||
Mon, 30 Oct 2023 06:23:08 -0700 (PDT)
|
||||
ARC-Seal: i=1; a=rsa-sha256; t=1698672188; cv=none;
|
||||
d=google.com; s=arc-20160816;
|
||||
b=XM96KvnTbr4h6bqrTPTuuDNXmFCr9Be/HvVhu+UsSQjP9RxPk0wDTPUPZ/HWIJs52y
|
||||
beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef
|
||||
BUmQ==
|
||||
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
|
||||
h=list-unsubscribe-post:list-unsubscribe:mime-version:subject:to
|
||||
:reply-to:from:date:message-id:dkim-signature:dkim-signature;
|
||||
bh=BERwBIp6fBgrZePFKQjyNMmgPkcnq1Zy1jPO8M0T4Ok=;
|
||||
fh=+kTCcNpX22TOI/SVSLygnrDqWeUt4zW7QKiv0TOVSGs=;
|
||||
b=lyIBRuOxPOTY2s36OqP7M7awlBKd4t5PX9mJOEJB0eTnTZqML+cplrXUIg2ZTlAAi9
|
||||
beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef
|
||||
tgVQ==
|
||||
ARC-Authentication-Results: i=1; mx.google.com;
|
||||
dkim=pass header.i=@spamspam.com header.s=2020294246 header.b=G8y6xmtK;
|
||||
dkim=pass header.i=@auth.ccsend.com header.s=1000073432 header.b=ht8IksVK;
|
||||
spf=pass (google.com: domain of aigxeklyirlg+dvwkrmsgua==_1133104752381_suqcukvbeeynm/owplvdba==@in.constantcontact.com designates 208.75.123.226 as permitted sender) smtp.mailfrom="AigXeKlyIRLG+DvWkRMsGUA==_1133104752381_sUQcUKVBEeynm/oWPlvDBA==@in.constantcontact.com";
|
||||
dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=spamspam.com
|
||||
Return-Path: <AigXeKlyIRLG+DvWkRMsGUA==_1133104752381_sUQcUKVBEeynm/oWPlvDBA==@in.constantcontact.com>
|
||||
Received: from ccm30.constantcontact.com (ccm30.constantcontact.com. [208.75.123.226])
|
||||
by mx.google.com with ESMTPS id h2-20020a05620a21c200b0076eeed38118si5450962qka.131.2023.10.30.06.23.07
|
||||
for <somebody@gmail.com>
|
||||
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
|
||||
Mon, 30 Oct 2023 06:23:08 -0700 (PDT)
|
||||
Received-SPF: pass (google.com: domain of aigxeklyirlg+dvwkrmsgua==_1133104752381_suqcukvbeeynm/owplvdba==@in.constantcontact.com designates 208.75.123.226 as permitted sender) client-ip=208.75.123.226;
|
||||
Authentication-Results: mx.google.com;
|
||||
dkim=pass header.i=@spamspam.com header.s=2020294246 header.b=G8y6xmtK;
|
||||
dkim=pass header.i=@auth.ccsend.com header.s=1000073432 header.b=ht8IksVK;
|
||||
spf=pass (google.com: domain of aigxeklyirlg+dvwkrmsgua==_1133104752381_suqcukvbeeynm/owplvdba==@in.constantcontact.com designates 208.75.123.226 as permitted sender) smtp.mailfrom="AigXeKlyIRLG+DvWkRMsGUA==_1133104752381_sUQcUKVBEeynm/oWPlvDBA==@in.constantcontact.com";
|
||||
dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=spamspam.com
|
||||
Return-Path: <AigXeKlyIRLG+DvWkRMsGUA==_1133104752381_sUQcUKVBEeynm/oWPlvDBA==@in.constantcontact.com>
|
||||
Received: from [10.252.0.3] ([10.252.0.3:53254] helo=p2-jbemailsyndicator12.ctct.net) by 10.249.225.20 (envelope-from <AigXeKlyIRLG+DvWkRMsGUA==_1133104752381_sUQcUKVBEeynm/oWPlvDBA==@in.constantcontact.com>) (ecelerity 4.3.1.999 r(:)) with ESMTP id A4/82-60517-B3EAF356; Mon, 30 Oct 2023 09:23:07 -0400
|
||||
DKIM-Signature: v=1; q=dns/txt; a=rsa-sha256; c=relaxed/relaxed; s=2020294246; d=spamspam.com; h=date:mime-version:subject:X-Feedback-ID:X-250ok-CID:message-id:from:reply-to:list-unsubscribe:list-unsubscribe-post:to; bh=BERwBIp6fBgrZePFKQjyNMmgPkcnq1Zy1jPO8M0T4Ok=; b=G8y6xmtKv8asfEXA9o8dP+6foQjclo6j5sFREYVIJBbj5YJ5tqoiv5B04/qoRkoTBFDhmjt+BUua7AqDgPSnwbP2iPSA4fTJehnHhut1PyVUp/9vqSYlhxQehfdhma8tPg8ArKfYIKmfKJwKRaQBU0JHCaB1m+5LNQQX3UjkxAg=
|
||||
DKIM-Signature: v=1; q=dns/txt; a=rsa-sha256; c=relaxed/relaxed; s=1000073432; d=auth.ccsend.com; h=date:mime-version:subject:X-Feedback-ID:X-250ok-CID:message-id:from:reply-to:list-unsubscribe:list-unsubscribe-post:to; bh=BERwBIp6fBgrZePFKQjyNMmgPkcnq1Zy1jPO8M0T4Ok=; b=ht8IksVKYY/Kb3dUERWoeW4eVdYjKL6F4PEoIZOhfFXor6XAIbPnd3A/CPmbmoqFZjnKh5OdcUy1N5qEoj8w1Q3TmN8/ySQkqrlrmSDSZIHZMY7Qp9/TJrqUe4RMFOO1KKIN6Y0vGP1+dWe98msMAHwvi2qMjG9aEKLfFr2JUTQ=
|
||||
Message-ID: <1140728754828.1133104752381.1941549819.0.260913JL.2002@synd.ccsend.com>
|
||||
Date: Mon, 30 Oct 2023 09:23:07 -0400 (EDT)
|
||||
From: spamspam Loan Servicing <marklake@spamspam.com>
|
||||
Reply-To: marklake@spamspam.com
|
||||
To: somebody@gmail.com
|
||||
Subject: Buying a home? You deserve the confidence of Pre-Approval
|
||||
MIME-Version: 1.0
|
||||
Content-Type: multipart/alternative; boundary="----=_Part_75055660_144854819.1698672187348"
|
||||
List-Unsubscribe: <https://visitor.constantcontact.com/do?p=un&m=beefbeefbeef>
|
||||
List-Unsubscribe-Post: List-Unsubscribe=One-Click
|
||||
X-Campaign-Activity-ID: 8a05de2a-5c88-44b1-be0e-f5a444cb0650
|
||||
X-250ok-CID: 8a05de2a-5c88-44b1-be0e-f5a444cb0650
|
||||
X-Channel-ID: b1441c50-a541-11ec-a79b-fa163e5bc304
|
||||
X-Return-Path-Hint: AbeefbeefbeefbeefbeefUA==_1133104752381_sUQcUKVBEeynm/oWPlvDBA==@in.constantcontact.com
|
||||
X-Roving-Campaignid: 1140728754811
|
||||
X-Roving-Id: 1133104752381.1111111111
|
||||
X-Feedback-ID: b1441c50-a541-11ec-beef-beefbeefbeefbeef5de2a-5c88-44b1-be0e-f5a444cb0650:1133104752381:CTCT
|
||||
X-CTCT-ID: b13a9586-a541-11ec-beef-beefbeefbeef
|
||||
|
||||
------=_Part_75055660_144854819.1698672187348
|
||||
Content-Type: text/plain; charset=utf-8
|
||||
Content-Transfer-Encoding: quoted-printable
|
||||
|
||||
When you're buying a home, Pre-Approval gives you confidence you're in the =
|
||||
right price range and shows sellers you mean business. xxxxxxxxx SELLING or=
|
||||
BUYING? Call: 844-590-2275 Get Your Homebuying PRE-APPROVAL IN 24-HOURS* G=
|
||||
et Pre-Approved When you're buying a home, Pre-Approval gives you confidenc=
|
||||
e you're in the right price range and shows sellers you mean business. xxx=
|
||||
xxxxxxGet Pre-Approved today! Click or Call to Get Pre-Approved 844-590-227=
|
||||
5 Get Pre-Approved nmlsconsumeraccess.org/ *The 24 hour timeframe is for mo=
|
||||
st approvals, however if additional information is needed or a request is o=
|
||||
n a holiday, the time for preapproval may be greater than 24 hours. This em=
|
||||
ail is for informational purposes only and is not an offer, loan approval o=
|
||||
r loan commitment. Mortgage rates are subject to change without notice. Som=
|
||||
e terms and restrictions may apply to certain loan programs. Refinancing ex=
|
||||
isting loans may result in total finance charges being higher over the life=
|
||||
of the loan, reduction in payments may partially reflect a longer loan ter=
|
||||
m. This information is provided as guidance and illustrative purposes only =
|
||||
and does not constitute legal or financial advice. We are not liable or bou=
|
||||
nd legally for any answers provided to any user for our process or position=
|
||||
on an issue. This information may change from time to time and at any time=
|
||||
without notification. The most current information will be updated periodi=
|
||||
cally and posted in the online forum. spamspam Loan Servicing, LLC. NMLS#39=
|
||||
1521. nmlsconsumeraccess.org. You are receiving this information as a curre=
|
||||
nt loan customer with spamspam Loan Servicing, LLC. Not licensed for lendin=
|
||||
g activities in any of the U.S. territories. Not authorized to originate lo=
|
||||
ans in the State of New York. Licensed by the Dept. of Financial Protection=
|
||||
and Innovation under the California Residential Mortgage .Lending Act #413=
|
||||
1216. This email was sent to somebody@gmail.com Version 103023PCHPrAp=
|
||||
9 xxxxxxxxx spamspam Loan Servicing | 4425 Ponce de Leon Blvd 5-251, Coral =
|
||||
Gables, FL 33146-1837 Unsubscribe somebody@gmail.com Update Profile |=
|
||||
Our Privacy Policy | Constant Contact Data Notice Sent by marklake@spamspa=
|
||||
m.com
|
||||
------=_Part_75055660_144854819.1698672187348
|
||||
Content-Type: text/html; charset=utf-8
|
||||
Content-Transfer-Encoding: quoted-printable
|
||||
|
||||
<!DOCTYPE HTML>
|
||||
<html lang=3D"en-US"> <head> <meta http-equiv=3D"Content-Type" content=3D"=
|
||||
text/html; charset=3Dutf-8"> <meta name=3D"viewport" content=3D"width=3Ddev=
|
||||
ice-width, initial-scale=3D1, maximum-scale=3D1"> <style type=3D"text/css=
|
||||
" data-premailer=3D"ignore">=20
|
||||
@media only screen and (max-width:480px) { .footer-main-width { width: 100%=
|
||||
!important; } .footer-mobile-hidden { display: none !important; } .foote=
|
||||
r-mobile-hidden { display: none !important; } .footer-column { display: bl=
|
||||
ock !important; } .footer-mobile-stack { display: block !important; } .fo=
|
||||
oter-mobile-stack-padding { padding-top: 3px; } }=20
|
||||
/* IE: correctly scale images with w/h attbs */ img { -ms-interpolation-mod=
|
||||
e: bicubic; }=20
|
||||
.layout { min-width: 100%; }=20
|
||||
table { table-layout: fixed; } .shell_outer-row { table-layout: auto; }=20
|
||||
/* Gmail/Web viewport fix */ u + .body .shell_outer-row { width: 620px; }=
|
||||
=20
|
||||
/* LIST AND p STYLE OVERRIDES */ .text .text_content-cell p { margin: 0; pa=
|
||||
dding: 0; margin-bottom: 0; } .text .text_content-cell ul, .text .text_cont=
|
||||
ent-cell ol { padding: 0; margin: 0 0 0 40px; } .text .text_content-cell li=
|
||||
{ padding: 0; margin: 0; /* line-height: 1.2; Remove after testing */ } /*=
|
||||
Text Link Style Reset */ a { text-decoration: underline; } /* iOS: Autolin=
|
||||
k styles inherited */ a[x-apple-data-detectors] { text-decoration: underlin=
|
||||
e !important; font-size: inherit !important; font-family: inherit !importan=
|
||||
t; font-weight: inherit !important; line-height: inherit !important; color:=
|
||||
inherit !important; } /* FF/Chrome: Smooth font rendering */ .text .text_c=
|
||||
ontent-cell { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing:=
|
||||
grayscale; }=20
|
||||
</style> <!--[if gte mso 9]> <style id=3D"ol-styles">=20
|
||||
/* OUTLOOK-SPECIFIC STYLES */ li { text-indent: -1em; padding: 0; margin: 0=
|
||||
; /* line-height: 1.2; Remove after testing */ } ul, ol { padding: 0; margi=
|
||||
n: 0 0 0 40px; } p { margin: 0; padding: 0; margin-bottom: 0; }=20
|
||||
</style> <![endif]--> <style>@media only screen and (max-width:480px) {
|
||||
.button_content-cell {
|
||||
padding-top: 10px !important; padding-right: 20px !important; padding-botto=
|
||||
m: 10px !important; padding-left: 20px !important;
|
||||
}
|
||||
.button_border-row .button_content-cell {
|
||||
padding-top: 10px !important; padding-right: 20px !important; padding-botto=
|
||||
m: 10px !important; padding-left: 20px !important;
|
||||
}
|
||||
.column .content-padding-horizontal {
|
||||
padding-left: 20px !important; padding-right: 20px !important;
|
||||
}
|
||||
.layout .column .content-padding-horizontal .content-padding-horizontal {
|
||||
padding-left: 0px !important; padding-right: 0px !important;
|
||||
}
|
||||
.layout .column .content-padding-horizontal .block-wrapper_border-row .cont=
|
||||
ent-padding-horizontal {
|
||||
padding-left: 20px !important; padding-right: 20px !important;
|
||||
}
|
||||
.dataTable {
|
||||
overflow: auto !important;
|
||||
}
|
||||
.dataTable .dataTable_content {
|
||||
width: auto !important;
|
||||
}
|
||||
.image--mobile-scale .image_container img {
|
||||
width: auto !important;
|
||||
}
|
||||
.image--mobile-center .image_container img {
|
||||
margin-left: auto !important; margin-right: auto !important;
|
||||
}
|
||||
.layout-margin .layout-margin_cell {
|
||||
padding: 0px 20px !important;
|
||||
}
|
||||
.layout-margin--uniform .layout-margin_cell {
|
||||
padding: 20px 20px !important;
|
||||
}
|
||||
.scale {
|
||||
width: 100% !important;
|
||||
}
|
||||
.stack {
|
||||
display: block !important; box-sizing: border-box;
|
||||
}
|
||||
.hide {
|
||||
display: none !important;
|
||||
}
|
||||
u + .body .shell_outer-row {
|
||||
width: 100% !important;
|
||||
}
|
||||
.socialFollow_container {
|
||||
text-align: center !important;
|
||||
}
|
||||
.text .text_content-cell {
|
||||
font-size: 16px !important;
|
||||
}
|
||||
.text .text_content-cell h1 {
|
||||
font-size: 24px !important;
|
||||
}
|
||||
.text .text_content-cell h2 {
|
||||
font-size: 20px !important;
|
||||
}
|
||||
.text .text_content-cell h3 {
|
||||
font-size: 20px !important;
|
||||
}
|
||||
.text--sectionHeading .text_content-cell {
|
||||
font-size: 26px !important;
|
||||
}
|
||||
.text--heading .text_content-cell {
|
||||
font-size: 26px !important;
|
||||
}
|
||||
.text--feature .text_content-cell h2 {
|
||||
font-size: 20px !important;
|
||||
}
|
||||
.text--articleHeading .text_content-cell {
|
||||
font-size: 20px !important;
|
||||
}
|
||||
.text--article .text_content-cell h3 {
|
||||
font-size: 20px !important;
|
||||
}
|
||||
.text--featureHeading .text_content-cell {
|
||||
font-size: 20px !important;
|
||||
}
|
||||
.text--feature .text_content-cell h3 {
|
||||
font-size: 20px !important;
|
||||
}
|
||||
.text--dataTable .text_content-cell .dataTable .dataTable_content-cell {
|
||||
font-size: 12px !important;
|
||||
}
|
||||
.text--dataTable .text_content-cell .dataTable th.dataTable_content-cell {
|
||||
font-size: px !important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</head> <body class=3D"body template template--en-US" data-template-version=
|
||||
=3D"1.38.0" data-canonical-name=3D"CPE10001" lang=3D"en-US" align=3D"center=
|
||||
" style=3D"-ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; min-=
|
||||
width: 100%; width: 100%; margin: 0px; padding: 0px;"> <div id=3D"preheader=
|
||||
" style=3D"color: transparent; display: none; font-size: 1px; line-height: =
|
||||
1px; max-height: 0px; max-width: 0px; opacity: 0; overflow: hidden;"><span =
|
||||
data-entity-ref=3D"preheader">When you're buying a home, Pre-Approval =
|
||||
gives you confidence you're in the right price range and shows sellers=
|
||||
you mean business. </span></div> <div id=3D"tracking-image" style=3D"color=
|
||||
: transparent; display: none; font-size: 1px; line-height: 1px; max-height:=
|
||||
0px; max-width: 0px; opacity: 0; overflow: hidden;"><img src=3D"https://r2=
|
||||
0.rs6.net/on.jsp?ca=beefbeefbe-beef-44b1-be0e-f5a444cb0650&a=3D113310475238=
|
||||
1&c=3Db13a9586-a541-11ec-a79b-fa163e5bc304&ch=3Db1441c50-a541-11ec-a79b-fa1=
|
||||
63e5bc304" / alt=3D""></div> <div class=3D"shell" lang=3D"en-US" style=3D"b=
|
||||
ackground-color: #015288;"> <table class=3D"shell_panel-row" width=3D"100%=
|
||||
" border=3D"0" cellpadding=3D"0" cellspacing=3D"0" style=3D"background-colo=
|
||||
r: #015288;" bgcolor=3D"#015288"> <tr class=3D""> <td class=3D"shell_panel-=
|
||||
cell" style=3D"" align=3D"center" valign=3D"top"> <table class=3D"shell_wid=
|
||||
th-row scale" style=3D"width: 620px;" align=3D"center" border=3D"0" cellpad=
|
||||
ding=3D"0" cellspacing=3D"0"> <tr> <td class=3D"shell_width-cell" style=3D"=
|
||||
padding: 15px 10px;" align=3D"center" valign=3D"top"> <table class=3D"shell=
|
||||
_content-row" width=3D"100%" align=3D"center" border=3D"0" cellpadding=3D"0=
|
||||
" cellspacing=3D"0"> <tr> <td class=3D"shell_content-cell" style=3D"border-=
|
||||
radius: 0px; background-color: #FFFFFF; padding: 0; border: 0px solid #0096=
|
||||
d6;" align=3D"center" valign=3D"top" bgcolor=3D"#FFFFFF"> <table class=3D"l=
|
||||
ayout layout--1-column" style=3D"table-layout: fixed;" width=3D"100%" borde=
|
||||
r=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <tr> <td class=3D"column colum=
|
||||
n--1 scale stack" style=3D"width: 100%;" align=3D"center" valign=3D"top">
|
||||
<table class=3D"divider" width=3D"100%" cellpadding=3D"0" cellspacing=3D"0"=
|
||||
border=3D"0"> <tr> <td class=3D"divider_container" style=3D"padding-top: 0=
|
||||
px; padding-bottom: 10px;" width=3D"100%" align=3D"center" valign=3D"top"> =
|
||||
<table class=3D"divider_content-row" style=3D"width: 100%; height: 1px;" ce=
|
||||
llpadding=3D"0" cellspacing=3D"0" border=3D"0"> <tr> <td class=3D"divider_c=
|
||||
ontent-cell" style=3D"padding-bottom: 5px; height: 1px; line-height: 1px; b=
|
||||
ackground-color: #0096D6; border-bottom-width: 0px;" height=3D"1" align=3D"=
|
||||
center" bgcolor=3D"#0096D6"> <img alt=3D"" width=3D"5" height=3D"1" border=
|
||||
=3D"0" hspace=3D"0" vspace=3D"0" src=3D"https://imgssl.constantcontact.com/=
|
||||
letters/images/1101116784221/S.gif" style=3D"display: block; height: 1px; w=
|
||||
idth: 5px;"> </td> </tr> </table> </td> </tr> </table> </td> </tr> </table>=
|
||||
<table class=3D"layout layout--1-column" style=3D"table-layout: fixed;" wi=
|
||||
dth=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <tr> <td cla=
|
||||
ss=3D"column column--1 scale stack" style=3D"width: 100%;" align=3D"center"=
|
||||
valign=3D"top"><div class=3D"spacer" style=3D"line-height: 10px; height: 1=
|
||||
0px;"> </div></td> </tr> </table> <table class=3D"layout layout--1-c=
|
||||
olumn" style=3D"table-layout: fixed;" width=3D"100%" border=3D"0" cellpaddi=
|
||||
ng=3D"0" cellspacing=3D"0"> <tr> <td class=3D"column column--1 scale stack"=
|
||||
style=3D"width: 100%;" align=3D"center" valign=3D"top">
|
||||
<table class=3D"image image--padding-vertical image--mobile-scale image--mo=
|
||||
bile-center" width=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0=
|
||||
"> <tr> <td class=3D"image_container" align=3D"center" valign=3D"top" style=
|
||||
=3D"padding-top: 10px; padding-bottom: 10px;"> <a href=3D"https://r20.rs6.n=
|
||||
et/tn.jsp?f=3D001YKO1VR2jLW0SuSLZLfN7qCP9AwEGO0v-Vy-0SCUlMWvTEiCsv-QEMhmJe9=
|
||||
ch=3DHu9wLy0fth6D8jxFBWPA_NhdnWcZZPivk0KUTgRJoVIo_si10jiydw=3D=3D" data-tra=
|
||||
ckable=3D"true"><img data-image-content class=3D"image_content" width=3D"26=
|
||||
2" src=3D"https://files.constantcontact.com/beefbeefbee/057bff2a-bdba-4165-=
|
||||
b108-a7baa91c42c6.jpg" alt=3D"" style=3D"display: block; height: auto; max-=
|
||||
width: 100%;"></a> </td> </tr> </table> </td> </tr> </table> <table class=
|
||||
=3D"layout layout--heading layout--1-column" style=3D"background-color: #00=
|
||||
527e; table-layout: fixed;" width=3D"100%" border=3D"0" cellpadding=3D"0" c=
|
||||
ellspacing=3D"0" bgcolor=3D"#00527e"> <tr> <td class=3D"column column--1 sc=
|
||||
ale stack" style=3D"width: 100%;" align=3D"center" valign=3D"top">
|
||||
<table class=3D"text text--padding-vertical" width=3D"100%" border=3D"0" ce=
|
||||
llpadding=3D"0" cellspacing=3D"0" style=3D"table-layout: fixed;"> <tr> <td =
|
||||
class=3D"text_content-cell content-padding-horizontal" style=3D"text-align:=
|
||||
center; font-family: Arial,Verdana,Helvetica,sans-serif; color: #000000; f=
|
||||
ont-size: 14px; line-height: 1.2; display: block; word-wrap: break-word; pa=
|
||||
dding: 10px 20px;" align=3D"center" valign=3D"top">
|
||||
<h1 style=3D"font-family: Arial,Verdana,Helvetica,sans-serif; color: #606d7=
|
||||
8; font-size: 26px; font-weight: bold; margin: 0;"><span style=3D"color: rg=
|
||||
b(0, 150, 214);">SELLING or BUYING?</span></h1>
|
||||
<p style=3D"margin: 0;"><span style=3D"font-size: 16px; color: rgb(255, 255=
|
||||
, 255); font-weight: bold;">Call: 844-590-2275</span></p>
|
||||
</td> </tr> </table> </td> </tr> </table> <table class=3D"layout layout--ar=
|
||||
ticle layout--1-column" style=3D"table-layout: fixed;" width=3D"100%" borde=
|
||||
r=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <tr> <td class=3D"column colum=
|
||||
n--1 scale stack" style=3D"width: 100%;" align=3D"center" valign=3D"top">
|
||||
<table class=3D"text text--heading text--padding-vertical" width=3D"100%" b=
|
||||
order=3D"0" cellpadding=3D"0" cellspacing=3D"0" style=3D"table-layout: fixe=
|
||||
d;"> <tr> <td class=3D"text_content-cell content-padding-horizontal" style=
|
||||
=3D"text-align: center; font-family: Arial,Verdana,Helvetica,sans-serif; co=
|
||||
lor: #606d78; font-size: 26px; line-height: 1.2; display: block; word-wrap:=
|
||||
break-word; font-weight: bold; padding: 10px 20px;" align=3D"center" valig=
|
||||
n=3D"top">
|
||||
<p style=3D"margin: 0;"><span style=3D"font-size: 30px; color: rgb(0, 150, =
|
||||
214);">Get Your Homebuying</span></p>
|
||||
<p style=3D"margin: 0;"><span style=3D"font-size: 30px; color: rgb(0, 82, 1=
|
||||
26);">PRE-APPROVAL IN 24-HOURS</span><span style=3D"font-size: 30px; color:=
|
||||
rgb(0, 82, 126); font-weight: normal;">*</span></p>
|
||||
</td> </tr> </table> <table class=3D"image image--padding-vertical image--m=
|
||||
obile-scale image--mobile-center" width=3D"100%" border=3D"0" cellpadding=
|
||||
=3D"0" cellspacing=3D"0"> <tr> <td class=3D"image_container content-padding=
|
||||
-horizontal" align=3D"center" valign=3D"top" style=3D"padding: 10px 20px;">=
|
||||
<img data-image-content class=3D"image_content" width=3D"548" src=3D"https=
|
||||
://files.constantcontact.com/df66e42d701/2092a2d7-0bda-4289-910b-bf50a2398d=
|
||||
60.jpg" alt=3D"" style=3D"display: block; height: auto; max-width: 100%;"> =
|
||||
</td> </tr> </table> <table class=3D"button button--padding-vertical" widt=
|
||||
h=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0" style=3D"table-=
|
||||
layout: fixed;"> <tr> <td class=3D"button_container content-padding-horizon=
|
||||
tal" align=3D"center" style=3D"padding: 10px 20px;"> <table class=3D"but=
|
||||
ton_content-row" style=3D"width: inherit; border-radius: 3px; border-spacin=
|
||||
g: 0; background-color: #0096D6; border: none;" border=3D"0" cellpadding=3D=
|
||||
"0" cellspacing=3D"0" bgcolor=3D"#0096D6"> <tr> <td class=3D"button_content=
|
||||
-cell" style=3D"padding: 10px 40px;" align=3D"center"> <a class=3D"button_l=
|
||||
ink" href=3D"https://r20.rs6.net/tn.jsp?f=3D001YKO1VR2jLW0SuSLZLfN7qCP9AwEG=
|
||||
O0v-Vy-0SCUlMWvTEiCsv-QEMuu9ZVVi6WGHhCias4f7-QkeggQvxIvbs-6TTaZHHhXLKf88NID=
|
||||
dci4Ge7aYN-QihEgqblie1-DQ2Fa1BKLbT3AM8rtrgeYQgVxJ6cG8POsvFzv7JstrGkCkg3a3AE=
|
||||
633LfQpAddyVLFkTv6oyS4T2j_YjYIPKDOZktqK_5rOR-Fh8cWGtUD8YPpPNnZ037z6_t9Nkemu=
|
||||
hxG&c=3DA65qX-dQJPS0J4afCS7H0Je5N-_6Q8Nh2fNHkb5-5biUYd5B9SY3zA=3D=3D&ch=3DH=
|
||||
u9wLy0fth6D8jxFBWPA_NhdnWcZZPivk0KUTgRJoVIo_si10jiydw=3D=3D" data-trackable=
|
||||
=3D"true" style=3D"font-size: 16px; font-weight: bold; color: #FFFFFF; font=
|
||||
-family: Helvetica,Arial,sans-serif; word-wrap: break-word; text-decoration=
|
||||
: none;">Get Pre-Approved</a> </td> </tr> </table> </td> </tr> </table> =
|
||||
<table class=3D"text text--padding-vertical" width=3D"100%" border=3D"0" =
|
||||
cellpadding=3D"0" cellspacing=3D"0" style=3D"table-layout: fixed;"> <tr> <t=
|
||||
d class=3D"text_content-cell content-padding-horizontal" style=3D"line-heig=
|
||||
ht: 1; text-align: center; font-family: Arial,Verdana,Helvetica,sans-serif;=
|
||||
color: #000000; font-size: 14px; display: block; word-wrap: break-word; pa=
|
||||
dding: 10px 20px;" align=3D"center" valign=3D"top">
|
||||
<p style=3D"text-align: left; margin: 0;" align=3D"left"><br></p>
|
||||
<p style=3D"margin: 0;"><span style=3D"font-size: 19px;">When you're buying=
|
||||
a home, Pre-Approval gives you confidence you're in the right price range =
|
||||
and shows sellers you mean business. </span></p>
|
||||
<p style=3D"margin: 0;"><span style=3D"font-size: 19px;">Get Pre-Ap=
|
||||
proved today!</span></p>
|
||||
</td> </tr> </table> </td> </tr> </table> <table class=3D"layout layout--1-=
|
||||
column" style=3D"table-layout: fixed;" width=3D"100%" border=3D"0" cellpadd=
|
||||
ing=3D"0" cellspacing=3D"0"> <tr> <td class=3D"column column--1 scale stack=
|
||||
" style=3D"width: 100%;" align=3D"center" valign=3D"top">
|
||||
<table class=3D"text text--padding-vertical" width=3D"100%" border=3D"0" ce=
|
||||
llpadding=3D"0" cellspacing=3D"0" style=3D"table-layout: fixed;"> <tr> <td =
|
||||
class=3D"text_content-cell content-padding-horizontal" style=3D"text-align:=
|
||||
left; font-family: Arial,Verdana,Helvetica,sans-serif; color: #000000; fon=
|
||||
t-size: 14px; line-height: 1.2; display: block; word-wrap: break-word; padd=
|
||||
ing: 10px 20px;" align=3D"left" valign=3D"top">
|
||||
<p style=3D"text-align: center; margin: 0;" align=3D"center"><br></p>
|
||||
<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
|
||||
"font-size: 23px; color: rgb(0, 82, 126); font-weight: bold; font-family: A=
|
||||
rial, Verdana, Helvetica, sans-serif;">Click or Call to Get Pre-Approved </=
|
||||
span></p>
|
||||
<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
|
||||
"font-size: 28px; color: rgb(0, 150, 214); font-weight: bold;">844-590-2275=
|
||||
</span></p>
|
||||
</td> </tr> </table> </td> </tr> </table> <table class=3D"layout layout--1-=
|
||||
column" style=3D"table-layout: fixed;" width=3D"100%" border=3D"0" cellpadd=
|
||||
ing=3D"0" cellspacing=3D"0"> <tr> <td class=3D"column column--1 scale stack=
|
||||
" style=3D"width: 100%;" align=3D"center" valign=3D"top"> <table class=3D"b=
|
||||
utton button--padding-vertical" width=3D"100%" border=3D"0" cellpadding=3D"=
|
||||
0" cellspacing=3D"0" style=3D"table-layout: fixed;"> <tr> <td class=3D"butt=
|
||||
on_container content-padding-horizontal" align=3D"center" style=3D"padding:=
|
||||
10px 20px;"> <table class=3D"button_content-row" style=3D"background-co=
|
||||
lor: #0096D6; width: inherit; border-radius: 3px; border-spacing: 0; border=
|
||||
: none;" border=3D"0" cellpadding=3D"0" cellspacing=3D"0" bgcolor=3D"#0096D=
|
||||
6"> <tr> <td class=3D"button_content-cell" style=3D"padding: 10px 40px;" al=
|
||||
ign=3D"center"> <a class=3D"button_link" href=3D"https://r20.rs6.net/tn.jsp=
|
||||
?f=3D001thisisfakethisisfakethisisfakev-Vy-0SCUlMWvTEiCsv-QEMuu9ZVVi6WGHhCi=
|
||||
oVIo_si10jiydw=3D=3D" data-trackable=3D"true" style=3D"font-size: 16px; fon=
|
||||
t-weight: bold; color: #FFFFFF; font-family: Helvetica,Arial,sans-serif; wo=
|
||||
rd-wrap: break-word; text-decoration: none;">Get Pre-Approved</a> </td> </t=
|
||||
r> </table> </td> </tr> </table> </td> </tr> </table> <table class=3D"=
|
||||
layout layout--1-column" style=3D"table-layout: fixed;" width=3D"100%" bord=
|
||||
er=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <tr> <td class=3D"column colu=
|
||||
mn--1 scale stack" style=3D"width: 100%;" align=3D"center" valign=3D"top">
|
||||
<table class=3D"image image--padding-vertical image--mobile-scale image--mo=
|
||||
bile-center" width=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0=
|
||||
"> <tr> <td class=3D"image_container" align=3D"center" valign=3D"top" style=
|
||||
=3D"padding-top: 10px; padding-bottom: 10px;"> <img data-image-content clas=
|
||||
s=3D"image_content" width=3D"87" src=3D"https://files.constantcontact.com/d=
|
||||
f66e42d701/beefbeef-beef-beef-9a13-2779ab497b8d.png" alt=3D"" style=3D"disp=
|
||||
lay: block; height: auto; max-width: 100%;"> </td> </tr> </table> </td> </t=
|
||||
r> </table> <table class=3D"layout layout--1-column" style=3D"table-layout:=
|
||||
fixed;" width=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <=
|
||||
tr> <td class=3D"column column--1 scale stack" style=3D"width: 100%;" align=
|
||||
=3D"center" valign=3D"top">
|
||||
<table class=3D"text text--padding-vertical" width=3D"100%" border=3D"0" ce=
|
||||
llpadding=3D"0" cellspacing=3D"0" style=3D"table-layout: fixed;"> <tr> <td =
|
||||
class=3D"text_content-cell content-padding-horizontal" style=3D"text-align:=
|
||||
left; font-family: Arial,Verdana,Helvetica,sans-serif; color: #000000; fon=
|
||||
t-size: 14px; line-height: 1.2; display: block; word-wrap: break-word; padd=
|
||||
ing: 10px 20px;" align=3D"left" valign=3D"top">
|
||||
<p style=3D"text-align: center; margin: 0;" align=3D"center"><br></p>
|
||||
<p style=3D"text-align: center; margin: 0;" align=3D"center"><a href=3D"htt=
|
||||
ps://r20.rs6.net/tn.jsp?f=3D001YKO1VR2jLW0SuSLZLfN7qCP9AwEGO0v-Vy-0SCUlMWvT=
|
||||
EiCsv-QEMgYju54LKeEV1_a2OCyOAfG7VhZpxtOW89WM-s6S5iiXcmnbK-Z6XDc9LL569h6DE4L=
|
||||
IRMWiBWHOlFB9TZWQVuX6Ycz3505y1keCrca4QArp&c=3DA65qX-dQJPS0J4afCS7H0Je5N-_6Q=
|
||||
8Nh2fNHkb5-5biUYd5B9SY3zA=3D=3D&ch=3DHu9wLy0fth6D8jxFBWPA_NhdnWcZZPivk0KUTg=
|
||||
RJoVIo_si10jiydw=3D=3D" target=3D"_blank" style=3D"font-size: 11px; color: =
|
||||
rgb(153, 153, 153); text-decoration: underline; font-weight: normal; font-s=
|
||||
tyle: normal;">nmlsconsumeraccess.org/</a></p>
|
||||
<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
|
||||
"font-size: 11px; color: rgb(153, 153, 153);">*The 24 hour timeframe is for=
|
||||
most approvals, however if additional information is needed or a request i=
|
||||
s on a holiday, the time for preapproval may be greater than 24 hours.</spa=
|
||||
n></p>
|
||||
<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
|
||||
"font-size: 11px; color: rgb(153, 153, 153); background-color: rgb(255, 255=
|
||||
, 255);">This email is for informational purposes only and is not an offer,=
|
||||
loan approval or loan commitment. Mortgage rates are subject to change wit=
|
||||
hout notice. Some terms and restrictions may apply to certain loan programs=
|
||||
. Refinancing existing loans may result in total finance charges being high=
|
||||
er over the life of the loan, reduction in payments may partially reflect a=
|
||||
longer loan term. This information is provided as guidance and illustrativ=
|
||||
e purposes only and does not constitute legal or financial advice. We are n=
|
||||
ot liable or bound legally for any answers provided to any user for our pro=
|
||||
cess or position on an issue. This information may change from time to time=
|
||||
and at any time without notification. The most current information will be=
|
||||
updated periodically and posted in the online forum.</span></p>
|
||||
<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
|
||||
"font-size: 11px; color: rgb(153, 153, 153); background-color: rgb(255, 255=
|
||||
, 255);">spamspam Loan Servicing, LLC. NMLS#391521. nmlsconsumeraccess.org.=
|
||||
You are receiving this information as a current loan customer with spamspa=
|
||||
m Loan Servicing, LLC. Not licensed for lending activities in any of the U.=
|
||||
S. territories. Not authorized to originate loans in the State of New York.=
|
||||
Licensed by the Dept. of Financial Protection and Innovation under the Cal=
|
||||
ifornia Residential Mortgage .Lending Act #4131216.</span></p>
|
||||
<p style=3D"text-align: center; margin: 0;" align=3D"center"><br></p>
|
||||
<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
|
||||
"font-size: 11px; color: rgb(153, 153, 153);">This email was sent to <span =
|
||||
data-id=3D"emailAddress">somebody@gmail.com</span></span></p>
|
||||
<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
|
||||
"font-size: 11px; color: rgb(153, 153, 153);">Version 103023PCHPrAp9 </span=
|
||||
></p>
|
||||
<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
|
||||
"font-size: 11px; color: rgb(162, 162, 162);"></span></p>
|
||||
</td> </tr> </table> </td> </tr> </table> <table class=3D"layout layout--1-=
|
||||
column" style=3D"table-layout: fixed;" width=3D"100%" border=3D"0" cellpadd=
|
||||
ing=3D"0" cellspacing=3D"0"> <tr> <td class=3D"column column--1 scale stack=
|
||||
" style=3D"width: 100%;" align=3D"center" valign=3D"top">
|
||||
<table class=3D"divider" width=3D"100%" cellpadding=3D"0" cellspacing=3D"0"=
|
||||
border=3D"0"> <tr> <td class=3D"divider_container" style=3D"padding-top: 1=
|
||||
0px; padding-bottom: 0px;" width=3D"100%" align=3D"center" valign=3D"top"> =
|
||||
<table class=3D"divider_content-row" style=3D"width: 100%; height: 1px;" ce=
|
||||
llpadding=3D"0" cellspacing=3D"0" border=3D"0"> <tr> <td class=3D"divider_c=
|
||||
ontent-cell" style=3D"padding-bottom: 2px; height: 1px; line-height: 1px; b=
|
||||
ackground-color: #0096D6; border-bottom-width: 0px;" height=3D"1" align=3D"=
|
||||
center" bgcolor=3D"#0096D6"> <img alt=3D"" width=3D"5" height=3D"1" border=
|
||||
=3D"0" hspace=3D"0" vspace=3D"0" src=3D"https://imgssl.constantcontact.com/=
|
||||
letters/images/1111111111111/S.gif" style=3D"display: block; height: 1px; w=
|
||||
idth: 5px;"> </td> </tr> </table> </td> </tr> </table> </td> </tr> </table>=
|
||||
</td> </tr> </table> </td> </tr> </table> </td> </tr> <tr> <td class=3D"s=
|
||||
hell_panel-cell shell_panel-cell--systemFooter" style=3D"" align=3D"center"=
|
||||
valign=3D"top"> <table class=3D"shell_width-row scale" style=3D"width: 100=
|
||||
%;" align=3D"center" border=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <tr>=
|
||||
<td class=3D"shell_width-cell" style=3D"padding: 0px;" align=3D"center" va=
|
||||
lign=3D"top"> <table class=3D"shell_content-row" width=3D"100%" align=3D"ce=
|
||||
nter" border=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <tr> <td class=3D"s=
|
||||
hell_content-cell" style=3D"background-color: #FFFFFF; padding: 0; border: =
|
||||
0 solid #0096d6;" align=3D"center" valign=3D"top" bgcolor=3D"#FFFFFF"> <tab=
|
||||
le class=3D"layout layout--1-column" style=3D"table-layout: fixed;" width=
|
||||
=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <tr> <td class=
|
||||
=3D"column column--1 scale stack" style=3D"width: 100%;" align=3D"center" v=
|
||||
align=3D"top"> <table class=3D"footer" width=3D"100%" border=3D"0" cellpadd=
|
||||
ing=3D"0" cellspacing=3D"0" style=3D"font-family: Verdana,Geneva,sans-serif=
|
||||
; color: #5d5d5d; font-size: 12px;"> <tr> <td class=3D"footer_container" al=
|
||||
ign=3D"center"> <table class=3D"footer-container" width=3D"100%" cellpaddin=
|
||||
g=3D"0" cellspacing=3D"0" border=3D"0" style=3D"background-color: #ffffff; =
|
||||
margin-left: auto; margin-right: auto; table-layout: auto !important;" bgco=
|
||||
lor=3D"#ffffff">
|
||||
<tr>
|
||||
<td width=3D"100%" align=3D"center" valign=3D"top" style=3D"width: 100%;">
|
||||
<div class=3D"footer-max-main-width" align=3D"center" style=3D"margin-left:=
|
||||
auto; margin-right: auto; max-width: 100%;">
|
||||
<table width=3D"100%" cellpadding=3D"0" cellspacing=3D"0" border=3D"0">
|
||||
<tr>
|
||||
<td class=3D"footer-layout" align=3D"center" valign=3D"top" style=3D"paddin=
|
||||
g: 16px 0px;">
|
||||
<table class=3D"footer-main-width" style=3D"width: 580px;" border=3D"0" cel=
|
||||
lpadding=3D"0" cellspacing=3D"0">
|
||||
<tr>
|
||||
<td class=3D"footer-text" align=3D"center" valign=3D"top" style=3D"color: #=
|
||||
5d5d5d; font-family: Verdana,Geneva,sans-serif; font-size: 12px; padding: 4=
|
||||
px 0px;">
|
||||
<span class=3D"footer-column">spamspam Loan Servicing<span class=3D"footer-=
|
||||
mobile-hidden"> | </span></span><span class=3D"footer-column">4425 Ponce de=
|
||||
Leon Blvd 5-251<span class=3D"footer-mobile-hidden">, </span></span><span =
|
||||
class=3D"footer-column"></span><span class=3D"footer-column"></span><span c=
|
||||
lass=3D"footer-column">Coral Gables, FL 33146-1837</span><span class=3D"foo=
|
||||
ter-column"></span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=3D"footer-row" align=3D"center" valign=3D"top" style=3D"padding: =
|
||||
10px 0px;">
|
||||
<table cellpadding=3D"0" cellspacing=3D"0" border=3D"0">
|
||||
<tr>
|
||||
<td class=3D"footer-text" align=3D"center" valign=3D"top" style=3D"color: #=
|
||||
5d5d5d; font-family: Verdana,Geneva,sans-serif; font-size: 12px; padding: 4=
|
||||
px 0px;">
|
||||
<a href=3D"https://visitor.constantcontact.com/do?p=3Dun&m=3D001g3dtlqhzM3v=
|
||||
-44b1-be0e-f5a444cb0650" data-track=3D"false" style=3D"color: #5d5d5d;">Uns=
|
||||
ubscribe somebody@gmail.com<span class=3D"partnerOptOut"></span></a>
|
||||
<span class=3D"partnerOptOut"></span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=3D"footer-text" align=3D"center" valign=3D"top" style=3D"color: #=
|
||||
5d5d5d; font-family: Verdana,Geneva,sans-serif; font-size: 12px; padding: 4=
|
||||
px 0px;">
|
||||
<a href=3D"https://visitor.constantcontact.com/do?p=3Doo&m=3D001g3dtlqhzM3v=
|
||||
-44b1-be0e-f5a444cb0650" data-track=3D"false" style=3D"color: #5d5d5d;">Upd=
|
||||
ate Profile</a> |
|
||||
<a href=3D"https://spamspam.com/privacy-notice/" data-track=3D"false" style=
|
||||
=3D"color: #5d5d5d;">Our Privacy Policy</a><span class=3D"footer-mobile-hid=
|
||||
den"> |</span>
|
||||
<a class=3D"footer-about-provider footer-mobile-stack footer-mobile-stack-p=
|
||||
adding" href=3D"http://www.constantcontact.com/legal/about-constant-contact=
|
||||
" data-track=3D"false" style=3D"color: #5d5d5d;">Constant Contact Data Noti=
|
||||
ce</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=3D"footer-text" align=3D"center" valign=3D"top" style=3D"color: #=
|
||||
5d5d5d; font-family: Verdana,Geneva,sans-serif; font-size: 12px; padding: 4=
|
||||
px 0px;">
|
||||
Sent by
|
||||
<a href=3D"mailto:marklake@spamspam.com" style=3D"color: #5d5d5d; text-deco=
|
||||
ration: none;">marklake@spamspam.com</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class=3D"footer-text" align=3D"center" valign=3D"top" style=3D"color: #=
|
||||
5d5d5d; font-family: Verdana,Geneva,sans-serif; font-size: 12px; padding: 4=
|
||||
px 0px;">
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table> </td> </tr> </table> </td> </tr> </table> </td> </tr> </table> =
|
||||
</td> </tr> </table> </td> </tr> </table> </div> </body> </html>
|
||||
|
||||
------=_Part_75055660_144854819.1698672187348--
|
||||
.
|
||||
`
|
||||
|
||||
func TestSmtpBackend_Spam_Text(t *testing.T) {
|
||||
email := spamEmail
|
||||
s, c, _, scanner := newTestSMTPServer(t, func(w http.ResponseWriter, r *http.Request) {
|
||||
require.Equal(t, "/mytopic", r.URL.Path)
|
||||
require.Equal(t, "Buying a home? You deserve the confidence of Pre-Approval", r.Header.Get("Title"))
|
||||
actual := readAll(t, r.Body)
|
||||
expected := "When you're buying a home, Pre-Approval gives you confidence you're in the right price range and shows sellers you mean business. xxxxxxxxx SELLING or BUYING? Call: 844-590-2275 Get Your Homebuying PRE-APPROVAL IN 24-HOURS* Get Pre-Approved When you're buying a home, Pre-Approval gives you confidence you're in the right price range and shows sellers you mean business. xxxxxxxxxGet Pre-Approved today! Click or Call to Get Pre-Approved 844-590-2275 Get Pre-Approved nmlsconsumeraccess.org/ *The 24 hour timeframe is for most approvals, however if additional information is needed or a request is on a holiday, the time for preapproval may be greater than 24 hours. This email is for informational purposes only and is not an offer, loan approval or loan commitment. Mortgage rates are subject to change without notice. Some terms and restrictions may apply to certain loan programs. Refinancing existing loans may result in total finance charges being higher over the life of the loan, reduction in payments may partially reflect a longer loan term. This information is provided as guidance and illustrative purposes only and does not constitute legal or financial advice. We are not liable or bound legally for any answers provided to any user for our process or position on an issue. This information may change from time to time and at any time without notification. The most current information will be updated periodically and posted in the online forum. spamspam Loan Servicing, LLC. NMLS#391521. nmlsconsumeraccess.org. You are receiving this information as a current loan customer with spamspam Loan Servicing, LLC. Not licensed for lending activities in any of the U.S. territories. Not authorized to originate loans in the State of New York. Licensed by the Dept. of Financial Protection and Innovation under the California Residential Mortgage .Lending Act #4131216. This email was sent to somebody@gmail.com Version 103023PCHPrAp9 xxxxxxxxx spamspam Loan Servicing | 4425 Ponce de Leon Blvd 5-251, Coral Gables, FL 33146-1837 Unsubscribe somebody@gmail.com Update Profile | Our Privacy Policy | Constant Contact Data Notice Sent by marklake@spamspam.com"
|
||||
require.Equal(t, expected, actual)
|
||||
})
|
||||
defer s.Close()
|
||||
defer c.Close()
|
||||
writeAndReadUntilLine(t, email, c, scanner, "250 2.0.0 OK: queued")
|
||||
}
|
||||
|
||||
func TestSmtpBackend_Spam_HTML(t *testing.T) {
|
||||
email := strings.ReplaceAll(spamEmail, "text/plain", "text/not-plain-anymore") // We artificially force HTML parsing here
|
||||
s, c, _, scanner := newTestSMTPServer(t, func(w http.ResponseWriter, r *http.Request) {
|
||||
require.Equal(t, "/mytopic", r.URL.Path)
|
||||
require.Equal(t, "Buying a home? You deserve the confidence of Pre-Approval", r.Header.Get("Title"))
|
||||
actual := readAll(t, r.Body)
|
||||
expected := `When you're buying a home, Pre-Approval gives you confidence you're in the right price range and shows sellers you mean business.
|
||||
` + "\u200a" + `
|
||||
|
||||
SELLING or BUYING?
|
||||
Call: 844-590-2275
|
||||
|
||||
Get Your Homebuying
|
||||
PRE-APPROVAL IN 24-HOURS *
|
||||
Get Pre-Approved
|
||||
|
||||
When you're buying a home, Pre-Approval gives you confidence you're in the right price range and shows sellers you mean business.
|
||||
` + "\ufeff" + `Get Pre-Approved today!
|
||||
|
||||
Click or Call to Get Pre-Approved
|
||||
844-590-2275
|
||||
Get Pre-Approved
|
||||
|
||||
nmlsconsumeraccess.org/
|
||||
*The 24 hour timeframe is for most approvals, however if additional information is needed or a request is on a holiday, the time for preapproval may be greater than 24 hours.
|
||||
This email is for informational purposes only and is not an offer, loan approval or loan commitment. Mortgage rates are subject to change without notice. Some terms and restrictions may apply to certain loan programs Refinancing existing loans may result in total finance charges being higher over the life of the loan, reduction in payments may partially reflect a longer loan term. This information is provided as guidance and illustrative purposes only and does not constitute legal or financial advice. We are not liable or bound legally for any answers provided to any user for our process or position on an issue. This information may change from time to time and at any time without notification. The most current information will be updated periodically and posted in the online forum.
|
||||
spamspam Loan Servicing, LLC. NMLS#391521. nmlsconsumeraccess.org. You are receiving this information as a current loan customer with spamspam Loan Servicing, LLC. Not licensed for lending activities in any of the U.S. territories. Not authorized to originate loans in the State of New York. Licensed by the Dept. of Financial Protection and Innovation under the California Residential Mortgage .Lending Act #4131216.
|
||||
|
||||
This email was sent to somebody@gmail.com
|
||||
Version 103023PCHPrAp9
|
||||
` + "\ufeff" + `
|
||||
|
||||
spamspam Loan Servicing | 4425 Ponce de Leon Blvd 5-251 , Coral Gables, FL 33146-1837
|
||||
|
||||
Unsubscribe somebody@gmail.com
|
||||
|
||||
Update Profile |
|
||||
Our Privacy Policy |
|
||||
Constant Contact Data Notice
|
||||
|
||||
Sent by
|
||||
marklake@spamspam.com`
|
||||
require.Equal(t, expected, actual)
|
||||
})
|
||||
defer s.Close()
|
||||
defer c.Close()
|
||||
writeAndReadUntilLine(t, email, c, scanner, "250 2.0.0 OK: queued")
|
||||
}
|
||||
|
||||
func TestSmtpBackend_PlaintextWithToken(t *testing.T) {
|
||||
email := `EHLO example.com
|
||||
MAIL FROM: phil@example.com
|
||||
|
|
@ -639,7 +1406,6 @@ func readUntilLine(t *testing.T, conn net.Conn, scanner *bufio.Scanner, expected
|
|||
return
|
||||
}
|
||||
output += text + "\n"
|
||||
//fmt.Println(text)
|
||||
}
|
||||
t.Fatalf("Expected line '%s' not found in output:\n%s", expectedLine, output)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue