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

fix fs database lookup by email addresses

This commit is contained in:
Vincent Breitmoser 2019-04-15 17:41:02 +02:00
parent a03f7eb887
commit a42a8c8f5e
No known key found for this signature in database
GPG Key ID: 7BD18320DEADFA11
1 changed files with 10 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
database/src/fs.rs
View File

@ -642,27 +642,11 @@ impl Database for Filesystem {
use std::fs;
let path = self.email_to_path(&email);
fs::canonicalize(path)
.ok()
.and_then(
|p| {
if p.starts_with(&self.base) {
Some(p)
} else {
None
}
},
)
.and_then(|p| File::open(p).ok())
.and_then(|mut fd| {
let mut buf = String::new();
if fd.read_to_string(&mut buf).is_ok() {
Some(buf)
} else {
None
}
})
if path.exists() {
fs::read_to_string(path).ok()
} else {
None
}
}
// XXX: slow
@ -670,27 +654,11 @@ impl Database for Filesystem {
use std::fs;
let path = self.keyid_to_path(kid);
fs::canonicalize(path)
.ok()
.and_then(
|p| {
if p.starts_with(&self.base) {
Some(p)
} else {
None
}
},
)
.and_then(|p| File::open(p).ok())
.and_then(|mut fd| {
let mut buf = String::new();
if fd.read_to_string(&mut buf).is_ok() {
Some(buf)
} else {
None
}
})
if path.exists() {
fs::read_to_string(path).ok()
} else {
None
}
}
}