kotovalexarian-likes-gitlab
/
hagrid-keyserver--hagrid
mirror of https://gitlab.com/hagrid-keyserver/hagrid.git
1
0
Fork 0
Code Releases Activity

use lettre from master (fix build failures)

This commit is contained in:
Vincent Breitmoser 2019-06-03 17:46:36 +02:00
parent b89db028cc
commit b447499d2b
No known key found for this signature in database
GPG Key ID: 7BD18320DEADFA11
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Cargo.lock generated
View File

@ -527,8 +527,8 @@ dependencies = [
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"hagrid-database 0.1.0",
"handlebars 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lettre 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lettre_email 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lettre 0.9.1 (git+https://github.com/lettre/lettre)",
"lettre_email 0.9.1 (git+https://github.com/lettre/lettre)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"multipart 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -766,10 +766,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "lettre"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "git+https://github.com/lettre/lettre#0ead3cde09a02918e3976aa442329fe247f05c55"
dependencies = [
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"fast_chemail 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
@ -780,13 +778,11 @@ dependencies = [
[[package]]
name = "lettre_email"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "git+https://github.com/lettre/lettre#0ead3cde09a02918e3976aa442329fe247f05c55"
dependencies = [
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
"email 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"lettre 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lettre 0.9.1 (git+https://github.com/lettre/lettre)",
"mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2088,8 +2084,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
"checksum lettre 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "646aee0a55545eaffdf0df1ac19b500b51adb3095ec4dfdc704134e56ea23531"
"checksum lettre_email 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae1b3d43e4bb7beb9974a359cbb3ea4f93dfba6c1c0c6e9c9f82e538e0f9ab9f"
"checksum lettre 0.9.1 (git+https://github.com/lettre/lettre)" = "<none>"
"checksum lettre_email 0.9.1 (git+https://github.com/lettre/lettre)" = "<none>"
"checksum libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "42914d39aad277d9e176efbdad68acb1d5443ab65afe0e0e4f0d49352a950880"
"checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2"
"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"

3
Cargo.toml
View File

@ -27,7 +27,7 @@ time = "0.1"
tempfile = "3.0"
structopt = "0.2"
url = "1.6"
lettre_email = "0.9"
lettre_email = { version = "0.9", git = "https://github.com/lettre/lettre" }
handlebars = "1.1.0"
num_cpus = "1.0"
ring = "0.13"
@ -38,6 +38,7 @@ version = "0.9"
default-features = false
# smtp-transport doesn't build (openssl problem)
features = ["file-transport", "sendmail-transport"]
git = "https://github.com/lettre/lettre"
[dependencies.rocket_contrib]
version = "0"

23
dist/templates/about/about.html.hbs vendored
View File

@ -96,18 +96,18 @@
<center><h3>Non-Goals</h3></center>
<ul>
<li><b>Do not distribute spam</b>
<p>Unlike traditional keyservers, <tt>keys.openpgp.org</tt> will
never distribute key material that isn't cryptographically
verified. This protects keys from unwanted spam, and helps
protect the service itself against "denial of service" attacks.
<li><b>Do not distribute unverified or malicious data</b>
<p>Unlike traditional keyservers, <tt>keys.openpgp.org</tt> does not
distribute key material that isn't cryptographically verified.
This protects keys from unwanted spam, and helps protect the
service itself against "denial of service" attacks.
</p>
<p>We also do not distribute "third-party" signatures on keys. These
kinds of signatures were typically used to "sign" the keys of
others, in order to support a "Web of Trust" trust model. This
model as implemented proved ineffective in practice for various
reasons, in particular it allowed attaching arbitrary spam to
any key.
model meant that third parties could attach arbitrary spam to
any key, but didn't prove itself as a very effective trust model
in practice.
</p>
<p>We are open to alternative approaches that might be implemented
in the future, that avoid this issue.
@ -117,8 +117,8 @@
<p>The federation model of the SKS pool led to various problems in
practice, which are incompatible with the goals stated above.
</p>
<p>We are not opposed to exploring other options for federation in
the future, but it is not a high priority goal for now.
<p>We plan to explore options for federation in the future, to allow
users to choose between different service operators again.
</p>
</li>
<li><b>Not a de-facto certification authority</b>
@ -128,7 +128,8 @@
</p>
<p>Basic validation of e-mail addresses is used to ensure keys are
searchable by e-mail address only with consent of its owner. We
do not sign keys, or perform any other kind of certification.
do not sign keys, or perform any other kind of certification
service.
</p>
<p>That said, we will do what we can to make sure this service is as
reliable and as trustworthy as possible.