vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-04 05:10:40 +00:00
Code Issues Projects Releases Wiki Activity

Refactor GPG clearsigned verification into extract + verification.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-02-23 13:44:03 +04:00
parent a44742f6b8
commit 1fe8a8b703
3 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/remote.go
Vendored
+8 -1
View File
@@ -181,7 +181,14 @@ func (repo *RemoteRepo) Fetch(d aptly.Downloader, verifier utils.Verifier) error
}
defer inrelease.Close()
release, err = verifier.VerifyClearsigned(inrelease)
err = verifier.VerifyClearsigned(inrelease)
if err != nil {
goto splitsignature
}
inrelease.Seek(0, 0)
release, err = verifier.ExtractClearsigned(inrelease)
if err != nil {
goto splitsignature
}
debian/remote_test.go
Vendored
+5 -1
View File
@@ -28,7 +28,11 @@ func (n *NullVerifier) VerifyDetachedSignature(signature, cleartext io.Reader) e
return nil
}
func (n *NullVerifier) VerifyClearsigned(clearsigned io.Reader) (text *os.File, err error) {
func (n *NullVerifier) VerifyClearsigned(clearsigned io.Reader) error {
return nil
}
func (n *NullVerifier) ExtractClearsigned(clearsigned io.Reader) (text *os.File, err error) {
text, _ = ioutil.TempFile("", "aptly-test")
io.Copy(text, clearsigned)
text.Seek(0, 0)