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

hkp: more informative /pks/add response

This commit is contained in:
Vincent Breitmoser 2019-06-20 18:15:16 +02:00
parent e6611228a7
commit 84451500ec
No known key found for this signature in database
GPG Key ID: 7BD18320DEADFA11
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/templates/about/usage.html.hbs vendored
View File

@ -53,7 +53,7 @@
</li> </li>
</ul> </ul>
<h3>Uploading your key</h3> <h3 id="gnupg-upload">Uploading your key</h3>
<p> <p>
Keys can be uploaded with GnuPG's <tt>--send-keys</tt> command, but Keys can be uploaded with GnuPG's <tt>--send-keys</tt> command, but
identity information can't be verified that way to make the key identity information can't be verified that way to make the key

6
src/web/hkp.rs
View File

@ -128,13 +128,17 @@ pub fn pks_add_form_data(
#[post("/pks/add", format = "application/x-www-form-urlencoded", data = "<data>")] #[post("/pks/add", format = "application/x-www-form-urlencoded", data = "<data>")]
pub fn pks_add_form( pub fn pks_add_form(
state: rocket::State<HagridState>,
db: rocket::State<KeyDatabase>, db: rocket::State<KeyDatabase>,
tokens_stateless: rocket::State<tokens::Service>, tokens_stateless: rocket::State<tokens::Service>,
rate_limiter: rocket::State<RateLimiter>, rate_limiter: rocket::State<RateLimiter>,
data: Data, data: Data,
) -> MyResponse { ) -> MyResponse {
match vks_web::upload_post_form(db, tokens_stateless, rate_limiter, data) { match vks_web::upload_post_form(db, tokens_stateless, rate_limiter, data) {
Ok(_) => MyResponse::plain("Ok".into()), Ok(_) => {
let msg = format!("Upload successful. Note that identity information will only be published with verification! see {}/about/usage#gnupg-upload", state.base_uri);
MyResponse::plain(msg)
}
Err(err) => MyResponse::ise(err), Err(err) => MyResponse::ise(err),
} }
} }