mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-07-15 11:57:59 +00:00
New upstream version 1.4.0+ds1
This commit is contained in:
Sébastien Delafond
Binary file not shown.
+109
@@ -0,0 +1,109 @@
|
||||
Origin: Canonical
|
||||
Suite: xenial-updates
|
||||
Codename: xenial-updates/newton
|
||||
Date: Tue, 25 Sep 2018 21:45:15 UTC
|
||||
Architectures: i386 amd64 armhf ppc64el arm64 s390x
|
||||
Components: main
|
||||
Description: OpenStack Newton archive for Ubuntu 16.04 LTS
|
||||
MD5Sum:
|
||||
ed32606ac5a1ce86befae2715ebd5328 559539 main/binary-i386/Packages
|
||||
100b57acc19e7fc74994fa7f843a3fe6 120571 main/binary-i386/Packages.gz
|
||||
30687c5e34fd9eac9feb3e0ba4a0f94b 136 main/binary-i386/Release
|
||||
24e1b1243547d40ada70bb45343f4a56 560520 main/binary-amd64/Packages
|
||||
52aa3aab02dbf701572e02a43f0140b3 120716 main/binary-amd64/Packages.gz
|
||||
beca9426b77f6322e4b9793b30f42183 137 main/binary-amd64/Release
|
||||
3fca39e42300b53d02e7453e4fed96a2 497267 main/binary-armhf/Packages
|
||||
8bf44c480558f5e922263cbc2c1394a5 108076 main/binary-armhf/Packages.gz
|
||||
5c38f748178697764f9724828f0151ab 137 main/binary-armhf/Release
|
||||
51cdb3afb5b2fcb5fc7f6fce22085628 516159 main/binary-ppc64el/Packages
|
||||
8d3bd39c70b096496d7d01ba9a525851 112620 main/binary-ppc64el/Packages.gz
|
||||
51dda1f860edc7975a3852e7c4f9f69d 139 main/binary-ppc64el/Release
|
||||
23471ddea998006fbf82825dc2d22f4e 557502 main/binary-arm64/Packages
|
||||
52d0175877152059aeec77114265df7e 120123 main/binary-arm64/Packages.gz
|
||||
6a909d0126b1e910fcd2b3f58d53ef7b 137 main/binary-arm64/Release
|
||||
89171df2220477022ef91e74c236d74d 516061 main/binary-s390x/Packages
|
||||
bbfea425a605c53e59c440adc7d491c0 112610 main/binary-s390x/Packages.gz
|
||||
eaa188bf3d6e821f73b7c29f9085973f 137 main/binary-s390x/Release
|
||||
9b21f7c2c0d89f08cd54d21526b2b7f7 417889 main/source/Sources
|
||||
8113c5d6484daf4f632cacd048aa81a7 81794 main/source/Sources.gz
|
||||
36c2b37c73e51cb58ec2769baaa237f2 138 main/source/Release
|
||||
cce4a93beb7346dfcfc401343c1a07e7 5194695 Contents-i386
|
||||
099e00a2232232f0b891ab2924796cd4 321384 Contents-i386.gz
|
||||
148c884428ab15f5c16d4a8df0358f41 5195719 Contents-amd64
|
||||
b7e9f1fad4d5e63f9ccaaf826dba4af5 321473 Contents-amd64.gz
|
||||
82f8be9e623dc1ac2191f04db01b2080 5121293 Contents-armhf
|
||||
933cb600a7d31d87ee2f862464ca0a71 313824 Contents-armhf.gz
|
||||
5d5dc264638d1b585499267e07793d57 5157787 Contents-ppc64el
|
||||
da5b35ec8d94e9f7db3d6a76f36fa099 317603 Contents-ppc64el.gz
|
||||
7d2ad5ec50c13c92d7690567b3fc674a 5194665 Contents-arm64
|
||||
bf3c7c2cd0d8ae68b670e85bf4c0a55f 321315 Contents-arm64.gz
|
||||
6fe4eb1eb6bc4ea36f393b43b30957d4 5157667 Contents-s390x
|
||||
c69b1e4ca2d8ef58355f422bf282c173 317598 Contents-s390x.gz
|
||||
SHA1:
|
||||
7830f7d6f20f591dd8d268a4be4c7683c9fcbaf1 559539 main/binary-i386/Packages
|
||||
eafced4e96ccf644cde26a7e16606c3f4079e252 120571 main/binary-i386/Packages.gz
|
||||
9aee52218b3cfa1df5f326ed2c2e562de255cb68 136 main/binary-i386/Release
|
||||
a2ec30f4af65fffc8e3c57e0b3aa7771c2148f7b 560520 main/binary-amd64/Packages
|
||||
2d6afc82b4afe15a72e7bc79ff8b4096ea7f852d 120716 main/binary-amd64/Packages.gz
|
||||
b8ee5a9cc3b3b73cd0844591eb7108d233e67991 137 main/binary-amd64/Release
|
||||
37edbb5717e48dd5ef4410e2cdaafad010dfb3f5 497267 main/binary-armhf/Packages
|
||||
166cc92eba00d6c7e8a73869fb0b4682ed401402 108076 main/binary-armhf/Packages.gz
|
||||
1e9009c47ba57153c77b58dc85fa80c6b7736c71 137 main/binary-armhf/Release
|
||||
3fed2e76b941dcc7177f858794ef5c26e6054ae5 516159 main/binary-ppc64el/Packages
|
||||
9b447bdbe3c8872a85e79c42cedd367dd78c1c22 112620 main/binary-ppc64el/Packages.gz
|
||||
2ff8e4116672ef13f0488240ffbe9893ef72d251 139 main/binary-ppc64el/Release
|
||||
175b7d0f77ec52b43769133f8a7c2568c573604a 557502 main/binary-arm64/Packages
|
||||
31dbc9776ec0f09902e403ab397e23abf8a27c6f 120123 main/binary-arm64/Packages.gz
|
||||
1d86c1ffd8bbaff5da76f9fd6e66df0b09885f69 137 main/binary-arm64/Release
|
||||
b66894b8555a564d48808c757069d89d5e25749f 516061 main/binary-s390x/Packages
|
||||
d76c22241faada5571975f3d7c1689e35456d1fd 112610 main/binary-s390x/Packages.gz
|
||||
927c8b132b4f41440c3342ff6dafa889b8debbf1 137 main/binary-s390x/Release
|
||||
0fa2981518816d511b8719c3ee28d309480cc97e 417889 main/source/Sources
|
||||
1de78aa62f50854c87b1ea56ee0fd1dd0485f9d7 81794 main/source/Sources.gz
|
||||
8dcbec8bfd3a98b8d9106f0a86e8583403d78458 138 main/source/Release
|
||||
de31496319ebb8a06e843e2a855323ee996b11a8 5194695 Contents-i386
|
||||
a85e1fb48738be3702bb2e0a7bfaec5ddda4a36e 321384 Contents-i386.gz
|
||||
4af01067070fe5206a5212a482ed221c0ab58553 5195719 Contents-amd64
|
||||
fac22f57752875f95dce9ae9bce4f5919732b522 321473 Contents-amd64.gz
|
||||
7408f28ea1e5ef995b5545a9c5d31f5a06f1deed 5121293 Contents-armhf
|
||||
dfdf1eee9652d079d7f00d102c6a9d69f76d2134 313824 Contents-armhf.gz
|
||||
c348534f065afc7bf171eeb64da87417fb8ff3b1 5157787 Contents-ppc64el
|
||||
a843a8b2f7a7c453c1c8aaa349bf5f95c4391692 317603 Contents-ppc64el.gz
|
||||
ac080e8fb26c2726ce14b2b89e847c3a46953276 5194665 Contents-arm64
|
||||
0d94c3e512eb46891799a922f4db41dbd8f7a677 321315 Contents-arm64.gz
|
||||
5dbb522f499ee5d316346cf135e1d0eaba0a8ee2 5157667 Contents-s390x
|
||||
1039320511a46c2232b53113c88eb47f19fc49db 317598 Contents-s390x.gz
|
||||
SHA256:
|
||||
2ae20b2535fdb2a8f2e4b51a139c45ad5effc1601db5910074030d1b240bf6d8 559539 main/binary-i386/Packages
|
||||
e297fe58c023868db53045d3743c879189d31bf756320bedbe9aeed46d2a9b18 120571 main/binary-i386/Packages.gz
|
||||
d225d69dc14ad076639111f91c52d2a3dd69bb1a92c3bedc60c82486f6199634 136 main/binary-i386/Release
|
||||
1a00ac12805e0def30228d5483373e24ffe1b5b77543624c75652ebeb25f9945 560520 main/binary-amd64/Packages
|
||||
a622da857847f178dc554909597c522f5cdd7f953f2067a1493a806f3e43b134 120716 main/binary-amd64/Packages.gz
|
||||
cd1a07c3615a54e20f47d7ccd8e73ceaa5a371571a699dd5e8ae11d9066f9929 137 main/binary-amd64/Release
|
||||
25be54171d77d9732aa234ed1505f82fce44ab90fc223440708f6e86696d8a45 497267 main/binary-armhf/Packages
|
||||
9dc79733217cbf28b9b92684c9d37ca5011fae6b20fddc67b2117d7551915faa 108076 main/binary-armhf/Packages.gz
|
||||
d86d50eb4a75ce2817ce5a6a7d792e822e105a139c5fb279fbfadfd96c9d9fc1 137 main/binary-armhf/Release
|
||||
e5c488274bb806394f0a4a253a41609cfd888754e1dbc184e308fd8f56d50795 516159 main/binary-ppc64el/Packages
|
||||
4001d9cf9223c876a31cf8d7adc0c1144630a82d1e65e595cdd5bca9222559dd 112620 main/binary-ppc64el/Packages.gz
|
||||
5b2da9b67840f666a54164f2a6e8333e5977ddc362af188bda5e99eb96bb3fde 139 main/binary-ppc64el/Release
|
||||
332d7c702c4ef4b3aa8178852945383829db6cdfa4d7c5b4bebea3016244ce10 557502 main/binary-arm64/Packages
|
||||
cc25d0fc96f92d894ed765bf4ec25330c88b3d1f4395c107dfa720bf719a5f2b 120123 main/binary-arm64/Packages.gz
|
||||
3deb687a4f3c3ac0a24733e90578c0bcfb4f3cd5e692dce0c5d293d76bca073c 137 main/binary-arm64/Release
|
||||
cb01f4e6501350005260311d818444df6a8c8c76ef29d145b2bf7031fa808f1c 516061 main/binary-s390x/Packages
|
||||
95f7f94b492c83992efad814ea228c9cdd1b04347b4118532f0dd1b83cf66351 112610 main/binary-s390x/Packages.gz
|
||||
154ed5c2c7356d6ae63340ed5e8f73806f82af958510084ccb3e36c19fc39d0b 137 main/binary-s390x/Release
|
||||
68b03eed15470eaf8df0702abe623a6ec055a117851050eec50a203d44f6ff25 417889 main/source/Sources
|
||||
770e405fb223116b02a5b71df93b55db037703126044b45338b8d03c2ab5f9e6 81794 main/source/Sources.gz
|
||||
32aa4fbf5c619b3491df7dbfc98a752cf8235d770775c9207ebb6bfa0b236c16 138 main/source/Release
|
||||
f03799e6858a078dafaab8740acafc9184b7d1a070ec94ff2c0589771175a2bb 5194695 Contents-i386
|
||||
4e546e8e37208d2433dfcdfe8de707bb8062ddb0b80e92696d43169f81bb326d 321384 Contents-i386.gz
|
||||
5d155efdccd8258b493f039bf55d038630465bf064301e115198dcae52dd6065 5195719 Contents-amd64
|
||||
c66c2b872aca23d1595902b1091d697e7d116d9580d5e255838e99a439789845 321473 Contents-amd64.gz
|
||||
cc60e26e7fd2c2f9efc2060ce981b02a396941b5d028629a1d4ea85f768bb59d 5121293 Contents-armhf
|
||||
6f5a036d3f471bc9f9912ae2531641d69464174565eb7be0661eccf5cb023762 313824 Contents-armhf.gz
|
||||
d0c9b1ce2d5e0dbc3f83bf63edb8369d6c6958fd653999a00064ce7aa387540a 5157787 Contents-ppc64el
|
||||
235241b688107b2b40c55dbb883e051754bffaaa7eaccf9da762ffa6da429570 317603 Contents-ppc64el.gz
|
||||
74f39e2423ce5bb033b824e4e3b642ac19db472d5cc2a8faa4dad49932b97211 5194665 Contents-arm64
|
||||
3829445563cd1b75f79dd86756437efe7a6eb0a2601e9e423faf7bb8e9ad2aa7 321315 Contents-arm64.gz
|
||||
6280906ac14ccc3e9947e018a3296bfa1e4081df75a4fe2a78f92bb93418d706 5157667 Contents-s390x
|
||||
86180bba76cdbebe566f0075680a99b4e19c4308e302e16d5d95a2008b255d17 317598 Contents-s390x.gz
|
||||
+22
-57
@@ -3,6 +3,7 @@ package pgp
|
||||
import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
@@ -21,6 +22,7 @@ var (
|
||||
// GpgSigner is implementation of Signer interface using gpg as external program
|
||||
type GpgSigner struct {
|
||||
gpg string
|
||||
version GPGVersion
|
||||
keyRef string
|
||||
keyring, secretKeyring string
|
||||
passphrase, passphraseFile string
|
||||
@@ -52,7 +54,7 @@ func (g *GpgSigner) gpgArgs() []string {
|
||||
if g.keyring != "" {
|
||||
args = append(args, "--no-auto-check-trustdb", "--no-default-keyring", "--keyring", g.keyring)
|
||||
}
|
||||
if g.secretKeyring != "" {
|
||||
if g.secretKeyring != "" && g.version == GPG1x {
|
||||
args = append(args, "--secret-keyring", g.secretKeyring)
|
||||
}
|
||||
|
||||
@@ -61,7 +63,9 @@ func (g *GpgSigner) gpgArgs() []string {
|
||||
}
|
||||
|
||||
if g.passphrase != "" || g.passphraseFile != "" {
|
||||
args = append(args, "--no-use-agent")
|
||||
if g.version == GPG1x {
|
||||
args = append(args, "--no-use-agent")
|
||||
}
|
||||
}
|
||||
|
||||
if g.passphrase != "" {
|
||||
@@ -74,53 +78,21 @@ func (g *GpgSigner) gpgArgs() []string {
|
||||
|
||||
if g.batch {
|
||||
args = append(args, "--no-tty", "--batch")
|
||||
if g.version == GPG21xPlus {
|
||||
args = append(args, "--pinentry-mode", "loopback")
|
||||
}
|
||||
}
|
||||
|
||||
return args
|
||||
}
|
||||
|
||||
func cliVersionCheck(cmd string, marker string) bool {
|
||||
output, err := exec.Command(cmd, "--version").CombinedOutput()
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
return strings.Contains(string(output), marker)
|
||||
}
|
||||
|
||||
func findSuitableCLI(cmds []string, versionMarker string) string {
|
||||
for _, cmd := range cmds {
|
||||
if cliVersionCheck(cmd, versionMarker) {
|
||||
return cmd
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// We only support gpg1 at this time. Make sure we find a suitable binary.
|
||||
func findGPG1() (string, error) {
|
||||
cmd := findSuitableCLI([]string{"gpg", "gpg1"}, "gpg (GnuPG) 1.")
|
||||
if cmd != "" {
|
||||
return cmd, nil
|
||||
}
|
||||
return "", fmt.Errorf("Couldn't find a suitable gpg executable. Make sure gnupg1 is available as either gpg or gpg1 in $PATH")
|
||||
}
|
||||
|
||||
// We only support gpgv1 at this time. Make sure we find a suitable binary.
|
||||
func findGPGV1() (string, error) {
|
||||
cmd := findSuitableCLI([]string{"gpgv", "gpgv1"}, "gpgv (GnuPG) 1.")
|
||||
if cmd != "" {
|
||||
return cmd, nil
|
||||
}
|
||||
return "", fmt.Errorf("Couldn't find a suitable gpgv executable. Make sure gpgv1 is available as either gpgv or gpgv1 in $PATH")
|
||||
}
|
||||
|
||||
// NewGpgSigner creates a new gpg signer
|
||||
func NewGpgSigner() *GpgSigner {
|
||||
gpg, err := findGPG1()
|
||||
func NewGpgSigner(finder GPGFinder) *GpgSigner {
|
||||
gpg, version, err := finder.FindGPG()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return &GpgSigner{gpg: gpg}
|
||||
return &GpgSigner{gpg: gpg, version: version}
|
||||
}
|
||||
|
||||
// Init verifies availability of gpg & presence of keys
|
||||
@@ -168,38 +140,31 @@ func (g *GpgSigner) ClearSign(source string, destination string) error {
|
||||
type GpgVerifier struct {
|
||||
gpg string
|
||||
gpgv string
|
||||
version GPGVersion
|
||||
keyRings []string
|
||||
}
|
||||
|
||||
// NewGpgVerifier creates a new gpg signer
|
||||
func NewGpgVerifier() *GpgVerifier {
|
||||
gpg, err := findGPG1()
|
||||
// NewGpgVerifier creates a new gpg verifier
|
||||
func NewGpgVerifier(finder GPGFinder) *GpgVerifier {
|
||||
gpg, versionGPG, err := finder.FindGPG()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
gpgv, err := findGPGV1()
|
||||
gpgv, versionGPGV, err := finder.FindGPGV()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return &GpgVerifier{gpg: gpg, gpgv: gpgv}
|
||||
if versionGPG != versionGPGV {
|
||||
panic(errors.New("gpg and gpgv versions don't match"))
|
||||
}
|
||||
|
||||
return &GpgVerifier{gpg: gpg, gpgv: gpgv, version: versionGPG}
|
||||
}
|
||||
|
||||
// InitKeyring verifies that gpg is installed and some keys are trusted
|
||||
func (g *GpgVerifier) InitKeyring() error {
|
||||
cmd, err := findGPG1()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
g.gpg = cmd
|
||||
|
||||
cmd, err = findGPGV1()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
g.gpgv = cmd
|
||||
|
||||
if len(g.keyRings) == 0 {
|
||||
// using default keyring
|
||||
output, err := exec.Command(g.gpg, "--no-default-keyring", "--no-auto-check-trustdb", "--keyring", "trustedkeys.gpg", "--list-keys").Output()
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
package pgp
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"os/exec"
|
||||
"regexp"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// GPGVersion stores discovered GPG version
|
||||
type GPGVersion int
|
||||
|
||||
// GPG version as discovered
|
||||
const (
|
||||
GPG1x GPGVersion = 1
|
||||
GPG20x GPGVersion = 2
|
||||
GPG21xPlus GPGVersion = 3
|
||||
)
|
||||
|
||||
var gpgVersionRegex = regexp.MustCompile(`\(GnuPG\) (\d)\.(\d)`)
|
||||
|
||||
// GPGFinder implement search for gpg executables and returns version of discovered executables
|
||||
type GPGFinder interface {
|
||||
FindGPG() (gpg string, version GPGVersion, err error)
|
||||
FindGPGV() (gpgv string, version GPGVersion, err error)
|
||||
}
|
||||
|
||||
type pathGPGFinder struct {
|
||||
gpgNames []string
|
||||
gpgvNames []string
|
||||
errorMessage string
|
||||
|
||||
expectedVersionSubstring string
|
||||
}
|
||||
|
||||
type iteratingGPGFinder struct {
|
||||
finders []GPGFinder
|
||||
errorMessage string
|
||||
}
|
||||
|
||||
// GPGDefaultFinder looks for GPG1 first, but falls back to GPG2 if GPG1 is not available
|
||||
func GPGDefaultFinder() GPGFinder {
|
||||
return &iteratingGPGFinder{
|
||||
finders: []GPGFinder{GPG1Finder(), GPG2Finder()},
|
||||
errorMessage: "Couldn't find a suitable gpg executable. Make sure gnupg is installed",
|
||||
}
|
||||
}
|
||||
|
||||
// GPG1Finder looks for GnuPG1.x only
|
||||
func GPG1Finder() GPGFinder {
|
||||
return &pathGPGFinder{
|
||||
gpgNames: []string{"gpg", "gpg1"},
|
||||
gpgvNames: []string{"gpgv", "gpgv1"},
|
||||
expectedVersionSubstring: "(GnuPG) 1.",
|
||||
errorMessage: "Couldn't find a suitable gpg executable. Make sure gnupg1 is available as either gpg(v) or gpg(v)1 in $PATH",
|
||||
}
|
||||
}
|
||||
|
||||
// GPG2Finder looks for GnuPG2.x only
|
||||
func GPG2Finder() GPGFinder {
|
||||
return &pathGPGFinder{
|
||||
gpgNames: []string{"gpg", "gpg2"},
|
||||
gpgvNames: []string{"gpgv", "gpgv2"},
|
||||
expectedVersionSubstring: "(GnuPG) 2.",
|
||||
errorMessage: "Couldn't find a suitable gpg executable. Make sure gnupg2 is available as either gpg(v) or gpg(v)2 in $PATH",
|
||||
}
|
||||
}
|
||||
|
||||
func (pgf *pathGPGFinder) FindGPG() (gpg string, version GPGVersion, err error) {
|
||||
for _, cmd := range pgf.gpgNames {
|
||||
var result bool
|
||||
result, version = cliVersionCheck(cmd, pgf.expectedVersionSubstring)
|
||||
if result {
|
||||
gpg = cmd
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if gpg == "" {
|
||||
err = errors.New(pgf.errorMessage)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (pgf *pathGPGFinder) FindGPGV() (gpgv string, version GPGVersion, err error) {
|
||||
for _, cmd := range pgf.gpgvNames {
|
||||
var result bool
|
||||
result, version = cliVersionCheck(cmd, pgf.expectedVersionSubstring)
|
||||
if result {
|
||||
gpgv = cmd
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if gpgv == "" {
|
||||
err = errors.New(pgf.errorMessage)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (it *iteratingGPGFinder) FindGPG() (gpg string, version GPGVersion, err error) {
|
||||
for _, finder := range it.finders {
|
||||
gpg, version, err = finder.FindGPG()
|
||||
if err == nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
err = errors.New(it.errorMessage)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (it *iteratingGPGFinder) FindGPGV() (gpg string, version GPGVersion, err error) {
|
||||
for _, finder := range it.finders {
|
||||
gpg, version, err = finder.FindGPGV()
|
||||
if err == nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
err = errors.New(it.errorMessage)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func cliVersionCheck(cmd string, marker string) (result bool, version GPGVersion) {
|
||||
output, err := exec.Command(cmd, "--version").CombinedOutput()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
strOutput := string(output)
|
||||
result = strings.Contains(strOutput, marker)
|
||||
|
||||
version = GPG21xPlus
|
||||
matches := gpgVersionRegex.FindStringSubmatch(strOutput)
|
||||
if matches != nil {
|
||||
if matches[1] == "1" {
|
||||
version = GPG1x
|
||||
} else if matches[1] == "2" && matches[2] == "0" {
|
||||
version = GPG20x
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
+151
-8
@@ -2,6 +2,7 @@ package pgp
|
||||
|
||||
import (
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
|
||||
@@ -9,8 +10,7 @@ import (
|
||||
)
|
||||
|
||||
type GnupgSuite struct {
|
||||
verifier Verifier
|
||||
bins string
|
||||
bins string
|
||||
}
|
||||
|
||||
var _ = Suite(&GnupgSuite{})
|
||||
@@ -26,7 +26,7 @@ func (s *GnupgSuite) TestGPG1(c *C) {
|
||||
os.Setenv("PATH", filepath.Join(s.bins, "gpg1"))
|
||||
defer func() { os.Setenv("PATH", origPath) }()
|
||||
|
||||
signer := NewGpgSigner()
|
||||
signer := NewGpgSigner(GPG1Finder())
|
||||
c.Assert(signer.gpg, Equals, "gpg")
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ func (s *GnupgSuite) TestGPG1Not2(c *C) {
|
||||
os.Setenv("PATH", filepath.Join(s.bins, "gpg2-and-1"))
|
||||
defer func() { os.Setenv("PATH", origPath) }()
|
||||
|
||||
signer := NewGpgSigner()
|
||||
signer := NewGpgSigner(GPG1Finder())
|
||||
c.Assert(signer.gpg, Equals, "gpg1")
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ func (s *GnupgSuite) TestGPGNothing(c *C) {
|
||||
os.Setenv("PATH", filepath.Join(s.bins, "gpg2-only"))
|
||||
defer func() { os.Setenv("PATH", origPath) }()
|
||||
|
||||
c.Assert(func() { NewGpgSigner() }, PanicMatches, `Couldn't find a suitable gpg executable.+`)
|
||||
c.Assert(func() { NewGpgSigner(GPG1Finder()) }, PanicMatches, `Couldn't find a suitable gpg executable.+`)
|
||||
}
|
||||
|
||||
// If gpgv == gpgv1 = pick gpgv
|
||||
@@ -55,7 +55,7 @@ func (s *GnupgSuite) TestGPGV1(c *C) {
|
||||
os.Setenv("PATH", filepath.Join(s.bins, "gpgv1")+":"+filepath.Join(s.bins, "gpg1"))
|
||||
defer func() { os.Setenv("PATH", origPath) }()
|
||||
|
||||
verifier := NewGpgVerifier()
|
||||
verifier := NewGpgVerifier(GPG1Finder())
|
||||
c.Assert(verifier.gpgv, Equals, "gpgv")
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ func (s *GnupgSuite) TestGPGV1Not2(c *C) {
|
||||
os.Setenv("PATH", filepath.Join(s.bins, "gpgv2-and-1")+":"+filepath.Join(s.bins, "gpg1"))
|
||||
defer func() { os.Setenv("PATH", origPath) }()
|
||||
|
||||
verifier := NewGpgVerifier()
|
||||
verifier := NewGpgVerifier(GPG1Finder())
|
||||
c.Assert(verifier.gpgv, Equals, "gpgv1")
|
||||
}
|
||||
|
||||
@@ -75,5 +75,148 @@ func (s *GnupgSuite) TestGPGVNothing(c *C) {
|
||||
os.Setenv("PATH", filepath.Join(s.bins, "gpgv2-only")+":"+filepath.Join(s.bins, "gpg1"))
|
||||
defer func() { os.Setenv("PATH", origPath) }()
|
||||
|
||||
c.Assert(func() { NewGpgVerifier() }, PanicMatches, `Couldn't find a suitable gpgv executable.+`)
|
||||
c.Assert(func() { NewGpgVerifier(GPG1Finder()) }, PanicMatches, `Couldn't find a suitable gpg executable.+`)
|
||||
}
|
||||
|
||||
type Gnupg1VerifierSuite struct {
|
||||
VerifierSuite
|
||||
}
|
||||
|
||||
var _ = Suite(&Gnupg1VerifierSuite{})
|
||||
|
||||
func (s *Gnupg1VerifierSuite) SetUpTest(c *C) {
|
||||
finder := GPG1Finder()
|
||||
_, _, err := finder.FindGPG()
|
||||
if err != nil {
|
||||
c.Skip(err.Error())
|
||||
}
|
||||
|
||||
s.verifier = NewGpgVerifier(finder)
|
||||
s.verifier.AddKeyring("./trusted.gpg")
|
||||
|
||||
c.Assert(s.verifier.InitKeyring(), IsNil)
|
||||
}
|
||||
|
||||
type Gnupg1SignerSuite struct {
|
||||
SignerSuite
|
||||
}
|
||||
|
||||
var _ = Suite(&Gnupg1SignerSuite{})
|
||||
|
||||
func (s *Gnupg1SignerSuite) SetUpTest(c *C) {
|
||||
finder := GPG1Finder()
|
||||
_, _, err := finder.FindGPG()
|
||||
if err != nil {
|
||||
c.Skip(err.Error())
|
||||
}
|
||||
|
||||
s.keyringNoPassphrase = [2]string{"keyrings/aptly.pub", "keyrings/aptly.sec"}
|
||||
s.keyringPassphrase = [2]string{"keyrings/aptly_passphrase.pub", "keyrings/aptly_passphrase.sec"}
|
||||
s.passphraseKey = "F30E8CB9CDDE2AF8"
|
||||
s.noPassphraseKey = "21DBB89C16DB3E6D"
|
||||
|
||||
s.signer = NewGpgSigner(finder)
|
||||
s.signer.SetBatch(true)
|
||||
|
||||
s.verifier = &GoVerifier{}
|
||||
s.verifier.AddKeyring("./keyrings/aptly.pub")
|
||||
s.verifier.AddKeyring("./keyrings/aptly_passphrase.pub")
|
||||
|
||||
c.Assert(s.verifier.InitKeyring(), IsNil)
|
||||
|
||||
s.SignerSuite.SetUpTest(c)
|
||||
}
|
||||
|
||||
type Gnupg2VerifierSuite struct {
|
||||
VerifierSuite
|
||||
}
|
||||
|
||||
var _ = Suite(&Gnupg2VerifierSuite{})
|
||||
|
||||
func (s *Gnupg2VerifierSuite) SetUpTest(c *C) {
|
||||
finder := GPG2Finder()
|
||||
_, _, err := finder.FindGPG()
|
||||
if err != nil {
|
||||
c.Skip(err.Error())
|
||||
}
|
||||
|
||||
s.verifier = NewGpgVerifier(finder)
|
||||
s.verifier.AddKeyring("./trusted.gpg")
|
||||
|
||||
c.Assert(s.verifier.InitKeyring(), IsNil)
|
||||
}
|
||||
|
||||
type Gnupg2SignerSuite struct {
|
||||
SignerSuite
|
||||
}
|
||||
|
||||
var _ = Suite(&Gnupg2SignerSuite{})
|
||||
|
||||
func (s *Gnupg2SignerSuite) SetUpTest(c *C) {
|
||||
finder := GPG2Finder()
|
||||
gpg, ver, err := finder.FindGPG()
|
||||
if err != nil {
|
||||
c.Skip(err.Error())
|
||||
}
|
||||
|
||||
// import private keys into gpg2, they're stored outside of keyring files
|
||||
for _, item := range []struct {
|
||||
suffix string
|
||||
key string
|
||||
}{
|
||||
{"", "751DF85C2B220D45"},
|
||||
{"_passphrase", "6656CD181E92D2D5"},
|
||||
} {
|
||||
if _, err := exec.Command(gpg, "--list-secret-keys", item.key).CombinedOutput(); err == nil {
|
||||
// key already exists
|
||||
continue
|
||||
}
|
||||
|
||||
args := []string{"--import", "--no-default-keyring"}
|
||||
|
||||
if item.suffix == "_passprhase" {
|
||||
args = append(args, "--passphrase", "verysecret", "--no-tty", "--batch")
|
||||
if ver == GPG21xPlus {
|
||||
args = append(args, "--pinentry-mode", "loopback")
|
||||
}
|
||||
}
|
||||
args = append(args, "keyrings/aptly2"+item.suffix+".sec.armor")
|
||||
|
||||
output, err := exec.Command(gpg, args...).CombinedOutput()
|
||||
c.Log(string(output))
|
||||
c.Check(err, IsNil)
|
||||
}
|
||||
|
||||
// import public keys into gpg2
|
||||
// we can't use pre-built keyrings as gpg 2.0.x and 2.1+ have different keyring formats
|
||||
for _, suffix := range []string{"", "_passphrase"} {
|
||||
output, err := exec.Command(gpg, "--no-default-keyring", "--keyring", "./keyrings/aptly2"+suffix+".gpg",
|
||||
"--import", "keyrings/aptly2"+suffix+".pub.armor").CombinedOutput()
|
||||
c.Log(string(output))
|
||||
c.Check(err, IsNil)
|
||||
}
|
||||
|
||||
s.keyringNoPassphrase = [2]string{"./keyrings/aptly2.gpg", ""}
|
||||
s.keyringPassphrase = [2]string{"./keyrings/aptly2_passphrase.gpg", ""}
|
||||
s.noPassphraseKey = "751DF85C2B220D45"
|
||||
s.passphraseKey = "6656CD181E92D2D5"
|
||||
|
||||
s.signer = NewGpgSigner(finder)
|
||||
s.signer.SetBatch(true)
|
||||
|
||||
s.verifier = &GoVerifier{}
|
||||
s.verifier.AddKeyring("./keyrings/aptly2_trusted.pub")
|
||||
|
||||
c.Assert(s.verifier.InitKeyring(), IsNil)
|
||||
|
||||
s.skipDefaultKey = true
|
||||
|
||||
s.SignerSuite.SetUpTest(c)
|
||||
}
|
||||
|
||||
func (s *Gnupg2SignerSuite) TearDownTest(c *C) {
|
||||
s.SignerSuite.TearDownTest(c)
|
||||
|
||||
os.Remove("./keyrings/aptly2.gpg")
|
||||
os.Remove("./keyrings/aptly2_passphrase.gpg")
|
||||
}
|
||||
|
||||
+8
-1
@@ -367,7 +367,14 @@ func (g *GoVerifier) printLog(signers []signatureResult) {
|
||||
|
||||
// VerifyDetachedSignature verifies combination of signature and cleartext using gpgv
|
||||
func (g *GoVerifier) VerifyDetachedSignature(signature, cleartext io.Reader, showKeyTip bool) error {
|
||||
signers, missingKeys, err := checkArmoredDetachedSignature(g.trustedKeyring, cleartext, signature)
|
||||
var signatureBuf bytes.Buffer
|
||||
|
||||
signers, missingKeys, err := checkArmoredDetachedSignature(g.trustedKeyring, cleartext, io.TeeReader(signature, &signatureBuf))
|
||||
|
||||
if err == io.EOF {
|
||||
// most probably not armored signature
|
||||
signers, missingKeys, err = checkDetachedSignature(g.trustedKeyring, cleartext, &signatureBuf)
|
||||
}
|
||||
|
||||
g.printLog(signers)
|
||||
|
||||
|
||||
+19
-73
@@ -1,14 +1,11 @@
|
||||
package pgp
|
||||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"os"
|
||||
|
||||
. "gopkg.in/check.v1"
|
||||
)
|
||||
|
||||
type GoVerifierSuite struct {
|
||||
verifier Verifier
|
||||
VerifierSuite
|
||||
}
|
||||
|
||||
var _ = Suite(&GoVerifierSuite{})
|
||||
@@ -20,77 +17,26 @@ func (s *GoVerifierSuite) SetUpTest(c *C) {
|
||||
c.Assert(s.verifier.InitKeyring(), IsNil)
|
||||
}
|
||||
|
||||
func (s *GoVerifierSuite) TestVerifyDetached(c *C) {
|
||||
for _, test := range []struct {
|
||||
textName, signatureName string
|
||||
}{
|
||||
{"1.text", "1.signature"},
|
||||
{"2.text", "2.signature"},
|
||||
{"3.text", "3.signature"},
|
||||
} {
|
||||
cleartext, err := os.Open(test.textName)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
signature, err := os.Open(test.signatureName)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
err = s.verifier.VerifyDetachedSignature(signature, cleartext, false)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
signature.Close()
|
||||
cleartext.Close()
|
||||
}
|
||||
type GoSignerSuite struct {
|
||||
SignerSuite
|
||||
}
|
||||
|
||||
func (s *GoVerifierSuite) TestVerifyClearsigned(c *C) {
|
||||
for _, test := range []struct {
|
||||
clearSignedName string
|
||||
}{
|
||||
{"1.clearsigned"},
|
||||
} {
|
||||
clearsigned, err := os.Open(test.clearSignedName)
|
||||
c.Assert(err, IsNil)
|
||||
var _ = Suite(&GoSignerSuite{})
|
||||
|
||||
keyInfo, err := s.verifier.VerifyClearsigned(clearsigned, false)
|
||||
c.Assert(err, IsNil)
|
||||
c.Check(keyInfo.GoodKeys, DeepEquals, []Key{"8B48AD6246925553", "7638D0442B90D010"})
|
||||
c.Check(keyInfo.MissingKeys, DeepEquals, []Key(nil))
|
||||
func (s *GoSignerSuite) SetUpTest(c *C) {
|
||||
s.keyringNoPassphrase = [2]string{"keyrings/aptly.pub", "keyrings/aptly.sec"}
|
||||
s.keyringPassphrase = [2]string{"keyrings/aptly_passphrase.pub", "keyrings/aptly_passphrase.sec"}
|
||||
s.passphraseKey = "F30E8CB9CDDE2AF8"
|
||||
s.noPassphraseKey = "21DBB89C16DB3E6D"
|
||||
|
||||
clearsigned.Close()
|
||||
}
|
||||
}
|
||||
|
||||
func (s *GoVerifierSuite) TestExtractClearsigned(c *C) {
|
||||
for _, test := range []struct {
|
||||
clearSignedName, clearTextName string
|
||||
}{
|
||||
{"1.clearsigned", "1.cleartext"},
|
||||
} {
|
||||
clearsigned, err := os.Open(test.clearSignedName)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
cleartext, err := os.Open(test.clearTextName)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
is, err := s.verifier.IsClearSigned(clearsigned)
|
||||
c.Assert(err, IsNil)
|
||||
c.Check(is, Equals, true)
|
||||
|
||||
clearsigned.Seek(0, 0)
|
||||
|
||||
extractedF, err := s.verifier.ExtractClearsigned(clearsigned)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
expected, err := ioutil.ReadAll(cleartext)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
extracted, err := ioutil.ReadAll(extractedF)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
c.Check(expected, DeepEquals, extracted)
|
||||
|
||||
extractedF.Close()
|
||||
clearsigned.Close()
|
||||
cleartext.Close()
|
||||
}
|
||||
s.signer = &GoSigner{}
|
||||
s.signer.SetBatch(true)
|
||||
|
||||
s.verifier = &GoVerifier{}
|
||||
s.verifier.AddKeyring("./keyrings/aptly.pub")
|
||||
s.verifier.AddKeyring("./keyrings/aptly_passphrase.pub")
|
||||
|
||||
c.Assert(s.verifier.InitKeyring(), IsNil)
|
||||
|
||||
s.SignerSuite.SetUpTest(c)
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,30 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
mQENBFuAfvMBCACuElVMZctaYEMSIoYLAefC2ygH/MUWA41h/MT/kMakexK7B2N/
|
||||
noPUhA0Z7xWiqxnvJqaOGuT2Bp2SSOuw8hXD870VMNNAVuvg63Zvj5DGhWAjR8Sm
|
||||
zHaZ09+hkD+MB7+WJnyDJb0deGpJ7cFaUgS4fz1BlTWHpJX8wMBi3iqA2tulcoNn
|
||||
L/pUomusNGiD+4TuWkEeYb3/ygXvfocuE0Ji7UFrijU4Dcrh7T7L7qzHDMy8hyEr
|
||||
t3oZlFDlwRkr+1LrT1QBnndaddPRt1h3Av59WpasTUC8m/It0NvLpq9mqij3TNTx
|
||||
OyZNJLqHrUsz1/cg3boiT4puY8gm2jpQpNLXABEBAAG0HkFwdGx5IFRlc3RlciA8
|
||||
dGVzdEBhcHRseS5pbmZvPokBTgQTAQgAOBYhBOivfuFBYsLWPPwa1XUd+FwrIg1F
|
||||
BQJbgH7zAhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJEHUd+FwrIg1FWRwH
|
||||
/RmXNwgh6DEj7wN7hILL15iXOrOIjEJ2GH0cWvPdyzc/qbL552QovcaK3yb/r3V+
|
||||
+1wDJ2CuBtc/CoVFq1CN/i92wIDl+Cuozny5qcd8O6EjgdmLgeANRwqyMjiPiDz9
|
||||
cuabD3JPRHIqEv26PQ+qkmad42E5mipHmbA+iOE9OEWSvhDudAlYzNXECUWlNQ9+
|
||||
gWnLB6hONz5jnRDZHpcKeBcQ2aJ7r5L6qDzBIybAu3jiZfl5KlT6hArXi5vDi8DK
|
||||
B5is80nWPTAEb2+CfBiY80mLScNe5jG/sgOOrTqWL681RfjRtTnRe7DFKIm8guqp
|
||||
tbYrv4OzkFHJ/JbWAKsBruS5AQ0EW4B+8wEIANWaf4BWY2or9oyu001EmIdFiwu2
|
||||
cxGA2y8bZiqmerk+2BXDEZN4OaLu1a9RWpwo1Mc+KuXpeJNv60SG0zRFBLVrvPyg
|
||||
irhaue1p+SSuisxMdTOZrciYjWriTU4WKw+NOdiGHr5LJegE9hvW66ZYJHtYgkfB
|
||||
mBuIQQ90h6qnXKGtV4FK8Fo+hr04Wh7gDGZxTRFNo3MO0a18Y87uiU5j8i/VxyfI
|
||||
DSA2Uh92kPbItuEKtl23PhCSecZa4YkkWMILS7frMEbM9wDK/JFqPVPSUwQhV5jn
|
||||
wwq9hwQrUimrhZjJn1EImK2QVYeJ1CVxc3K7bdlxPd8fi6zfTQ8AfpALDWkAEQEA
|
||||
AYkBNgQYAQgAIBYhBOivfuFBYsLWPPwa1XUd+FwrIg1FBQJbgH7zAhsMAAoJEHUd
|
||||
+FwrIg1FzpEH/2xi/DCaYRgbC4RrICebeC8FBTwI2RyBuOQJr5CIPrpWaWV4+5Ds
|
||||
sIgPxU9E3QgNRjP9pzAzH2Z8WwJtRY0oYNWLFruNeg9Xl1Tf9pCK/0Csamyf/h3F
|
||||
6NKfDTwNBWTsD5ttNyRx2nfDPaU4j2BZqU3kOzdwiXnmtvtxEoH059EMgQFLv91W
|
||||
U7NydHYd8xcWlHIZx1uFB8HKRWB+AMXebkdLVXlUtJfZfxZr5Jb5eR77ojfsduYI
|
||||
YmbV4jkDxuidSkYogYyXMO2jY2PAhx29iaZrDsNdsCsg8OmwEjCPEGWdp7tFA1QI
|
||||
JrGSOnwXujoUwuqh53+n3bcVuuuKyPBW9b4=
|
||||
=Tu5z
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
@@ -0,0 +1,57 @@
|
||||
-----BEGIN PGP PRIVATE KEY BLOCK-----
|
||||
|
||||
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
|
||||
=vqFY
|
||||
-----END PGP PRIVATE KEY BLOCK-----
|
||||
@@ -0,0 +1,30 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
mQENBFuAgf0BCADhVDnKyR5G6RzgFb7QseLqOzjvGotmbYYTuYinwLC+GGgOBD54
|
||||
DTtzBk6PmU1/QW7x0yvffyeQWUXD+/zIuBLrkG2QXv9qRdADH6rCsVChtVsTRwHT
|
||||
ZgJJXgfcjsZ2UUDQ43Jkb4dMaAIJTS0dASXgyLIRaN/1h4SsdKZUZY16lMH9kSxb
|
||||
XI86qujCdC9WS7CWu8sLX7qKqmmAt8fTGTnTgyQCnIYtS1/je0ZfX4Z3ovzYyajJ
|
||||
LA/jtCD6L+3qj9Y7desj1AvNKRCGYB8nzayYYVqozNFvlubDePinFqJThrICviNS
|
||||
cNZuNmZjToPmSMF/B6zz1CkrR6Q0CIM5zkuxABEBAAG0HkFwdGx5IFRlc3RlciA8
|
||||
dGVzdEBhcHRseS5pbmZvPokBTgQTAQgAOBYhBAvV0vLk0JvPtsmaFGZWzRgektLV
|
||||
BQJbgIH9AhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJEGZWzRgektLVAHoH
|
||||
/jwdhMCDmgBR3vhS/i7ym5HFUx7o1cCv0cSoGQwgnRGLrTG4Ua4ds+FxAKjNAspC
|
||||
hgxGGfTCmD1cYB4lx85I0XcpfT4ZA0ZCQ1I9m5/AJ9WWYoy2FFZNxZ7fCd2d+sm1
|
||||
ydyJLCTRgJd0D2MD58vxF2+IWAkZTOridyyZP1qxfzcnSACTjbcrQFc1Bp7G1xJR
|
||||
T135mcxtBSD2JeXbvq/UkeOE+LCIF5EIHUlwOdanyyHTyO86R2rU7qO0bylNyLGi
|
||||
0SE3Y+j+qhg6Ns4I2SPo0JDBDrSVfPKcob1DYFF0K1yH6Cj3aGVUthsahNrP3K9S
|
||||
NOVRC1JUg5an0eWcayIPpte5AQ0EW4CB/QEIAMrLVpvc2Syuhtov6mBTuIB9SUHy
|
||||
9tyqK6WhyDAB7iQPC5Xrb4GXHM4z+2Vt7Pgabr630B6ySsmrKNfDB1EcUcY4aJ5Q
|
||||
LBIttR25CB8PkmvllycjKp49hLXOruwx6t23/J3REyapQXLKpXDhzmMTmoGpAPcu
|
||||
YTVMiiOFi0MNBI5ok9iQoG9Dbgf7F0Ie1MiLJzqfaf2dlRuh2JBayIMJ9VrtlThB
|
||||
5v2CsV73Mj7EgE7oetZgH2I9Tl/2vv70VYnoXn/YL2xgfghWWlTvDTvg9s7sRnDI
|
||||
4oor7SHaRZIWxqSuvVOchnlBjLADn902bFIPEanqBiAnPAHPwPOMKnBoR78AEQEA
|
||||
AYkBNgQYAQgAIBYhBAvV0vLk0JvPtsmaFGZWzRgektLVBQJbgIH9AhsMAAoJEGZW
|
||||
zRgektLVetQH/1QiJqu6JmEbJ4Z8mmwr25iqeC/9G1Llo6q4VAoLFygFU1EVW+wX
|
||||
tPwz5RZpqoZ5K4NVFJcgLH1ExqgKW9MflPK+6ltYqH3Kgg73I5gnP9SX12hJ3oMZ
|
||||
X15uGm8pN+na4fcu9rwvk87EBfXXmtP9oqdCPZ49DtkngyahTXFK/h5CbcgCx1Fw
|
||||
rm1QXyH/sB8O3f6GOVly40u7CV0hzWAB98KLgEP093OI3AJjmINxErCt6cigxQzO
|
||||
jgbiTMVgLKHidnpeOcKNXIlmIBFpBM4oaKFZ0qt5jiKz/QtmX7Uj+rTfCjaC1G7f
|
||||
fGE72fE3nL5TcbwRyD7g9zRV3ddU5uvCnlg=
|
||||
=075D
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
@@ -0,0 +1,59 @@
|
||||
-----BEGIN PGP PRIVATE KEY BLOCK-----
|
||||
|
||||
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
|
||||
bt98YTvZ8TecvlNxvBHIPuD3NFXd11Tm68KeWA==
|
||||
=YDL1
|
||||
-----END PGP PRIVATE KEY BLOCK-----
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,190 @@
|
||||
package pgp
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path"
|
||||
|
||||
. "gopkg.in/check.v1"
|
||||
)
|
||||
|
||||
// Common set of tests shared by internal & external GnuPG implementations
|
||||
type SignerSuite struct {
|
||||
signer Signer
|
||||
verifier Verifier
|
||||
|
||||
clearF *os.File
|
||||
signedF *os.File
|
||||
cleartext []byte
|
||||
|
||||
passwordFile string
|
||||
|
||||
skipDefaultKey bool
|
||||
|
||||
keyringNoPassphrase [2]string
|
||||
keyringPassphrase [2]string
|
||||
|
||||
noPassphraseKey Key
|
||||
passphraseKey Key
|
||||
}
|
||||
|
||||
func (s *SignerSuite) SetUpTest(c *C) {
|
||||
tempDir := c.MkDir()
|
||||
|
||||
var err error
|
||||
s.clearF, err = os.Create(path.Join(tempDir, "cleartext"))
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
s.cleartext = make([]byte, 0, 1024)
|
||||
_, err = rand.Read(s.cleartext)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
_, err = s.clearF.Write(s.cleartext)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
_, err = s.clearF.Seek(0, io.SeekStart)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
s.signedF, err = os.Create(path.Join(tempDir, "signed"))
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
s.passwordFile = path.Join(tempDir, "password")
|
||||
f, err := os.OpenFile(s.passwordFile, os.O_CREATE|os.O_WRONLY, 0600)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
_, err = f.Write([]byte("verysecret"))
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
f.Close()
|
||||
|
||||
s.signer.SetBatch(true)
|
||||
}
|
||||
|
||||
func (s *SignerSuite) TearDownTest(c *C) {
|
||||
s.clearF.Close()
|
||||
s.signedF.Close()
|
||||
}
|
||||
|
||||
func (s *SignerSuite) testSignDetached(c *C) {
|
||||
c.Assert(s.signer.Init(), IsNil)
|
||||
|
||||
err := s.signer.DetachedSign(s.clearF.Name(), s.signedF.Name())
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
err = s.verifier.VerifyDetachedSignature(s.signedF, s.clearF, false)
|
||||
c.Assert(err, IsNil)
|
||||
}
|
||||
|
||||
func (s *SignerSuite) TestSignDetachedNoPassphrase(c *C) {
|
||||
s.signer.SetKey(string(s.noPassphraseKey))
|
||||
s.signer.SetKeyRing(s.keyringNoPassphrase[0], s.keyringNoPassphrase[1])
|
||||
|
||||
s.testSignDetached(c)
|
||||
}
|
||||
|
||||
func (s *SignerSuite) TestSignDetachedNoPassphraseDefaultKey(c *C) {
|
||||
if s.skipDefaultKey {
|
||||
c.Skip("test for default key skipped")
|
||||
}
|
||||
|
||||
s.signer.SetKeyRing(s.keyringNoPassphrase[0], s.keyringNoPassphrase[1])
|
||||
|
||||
s.testSignDetached(c)
|
||||
}
|
||||
|
||||
func (s *SignerSuite) TestSignDetachedPassphrase(c *C) {
|
||||
s.signer.SetKey(string(s.passphraseKey))
|
||||
s.signer.SetKeyRing(s.keyringPassphrase[0], s.keyringPassphrase[1])
|
||||
s.signer.SetPassphrase("verysecret", "")
|
||||
|
||||
s.testSignDetached(c)
|
||||
}
|
||||
|
||||
func (s *SignerSuite) TestSignDetachedPassphraseDefaultKey(c *C) {
|
||||
if s.skipDefaultKey {
|
||||
c.Skip("test for default key skipped")
|
||||
}
|
||||
|
||||
s.signer.SetKeyRing(s.keyringPassphrase[0], s.keyringPassphrase[1])
|
||||
s.signer.SetPassphrase("verysecret", "")
|
||||
|
||||
s.testSignDetached(c)
|
||||
}
|
||||
|
||||
func (s *SignerSuite) TestSignDetachedPassphraseFile(c *C) {
|
||||
s.signer.SetKey(string(s.passphraseKey))
|
||||
s.signer.SetKeyRing(s.keyringPassphrase[0], s.keyringPassphrase[1])
|
||||
s.signer.SetPassphrase("", s.passwordFile)
|
||||
|
||||
s.testSignDetached(c)
|
||||
}
|
||||
|
||||
func (s *SignerSuite) testClearSign(c *C, expectedKey Key) {
|
||||
c.Assert(s.signer.Init(), IsNil)
|
||||
|
||||
err := s.signer.ClearSign(s.clearF.Name(), s.signedF.Name())
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
keyInfo, err := s.verifier.VerifyClearsigned(s.signedF, false)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
c.Assert(keyInfo.GoodKeys, DeepEquals, []Key{expectedKey})
|
||||
c.Assert(keyInfo.MissingKeys, DeepEquals, []Key(nil))
|
||||
|
||||
_, err = s.signedF.Seek(0, io.SeekStart)
|
||||
c.Assert(err, IsNil)
|
||||
extractedF, err := s.verifier.ExtractClearsigned(s.signedF)
|
||||
c.Assert(err, IsNil)
|
||||
defer extractedF.Close()
|
||||
|
||||
extracted, err := ioutil.ReadAll(extractedF)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
c.Assert(extracted, DeepEquals, s.cleartext)
|
||||
}
|
||||
|
||||
func (s *SignerSuite) TestClearSignNoPassphrase(c *C) {
|
||||
s.signer.SetKey(string(s.noPassphraseKey))
|
||||
s.signer.SetKeyRing(s.keyringNoPassphrase[0], s.keyringNoPassphrase[1])
|
||||
|
||||
s.testClearSign(c, s.noPassphraseKey)
|
||||
}
|
||||
|
||||
func (s *SignerSuite) TestClearSignNoPassphraseDefaultKey(c *C) {
|
||||
if s.skipDefaultKey {
|
||||
c.Skip("test for default key skipped")
|
||||
}
|
||||
|
||||
s.signer.SetKeyRing(s.keyringNoPassphrase[0], s.keyringNoPassphrase[1])
|
||||
|
||||
s.testClearSign(c, s.noPassphraseKey)
|
||||
}
|
||||
|
||||
func (s *SignerSuite) TestClearSignPassphrase(c *C) {
|
||||
s.signer.SetKey(string(s.passphraseKey))
|
||||
s.signer.SetKeyRing(s.keyringPassphrase[0], s.keyringPassphrase[1])
|
||||
s.signer.SetPassphrase("verysecret", "")
|
||||
|
||||
s.testClearSign(c, s.passphraseKey)
|
||||
}
|
||||
|
||||
func (s *SignerSuite) TestClearSignPassphraseDefaultKey(c *C) {
|
||||
if s.skipDefaultKey {
|
||||
c.Skip("test for default key skipped")
|
||||
}
|
||||
|
||||
s.signer.SetKeyRing(s.keyringPassphrase[0], s.keyringPassphrase[1])
|
||||
s.signer.SetPassphrase("verysecret", "")
|
||||
|
||||
s.testClearSign(c, s.passphraseKey)
|
||||
}
|
||||
|
||||
func (s *SignerSuite) TestClearSignPassphraseFile(c *C) {
|
||||
s.signer.SetKey(string(s.passphraseKey))
|
||||
s.signer.SetKeyRing(s.keyringPassphrase[0], s.keyringPassphrase[1])
|
||||
s.signer.SetPassphrase("", s.passwordFile)
|
||||
|
||||
s.testClearSign(c, s.passphraseKey)
|
||||
}
|
||||
Binary file not shown.
@@ -0,0 +1,94 @@
|
||||
package pgp
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
|
||||
. "gopkg.in/check.v1"
|
||||
)
|
||||
|
||||
// Common set of tests shared by internal & external GnuPG implementations
|
||||
type VerifierSuite struct {
|
||||
verifier Verifier
|
||||
}
|
||||
|
||||
func (s *VerifierSuite) TestVerifyDetached(c *C) {
|
||||
for _, test := range []struct {
|
||||
textName, signatureName string
|
||||
}{
|
||||
{"1.text", "1.signature"},
|
||||
{"2.text", "2.signature"},
|
||||
{"3.text", "3.signature"},
|
||||
{"4.text", "4.signature"},
|
||||
} {
|
||||
cleartext, err := os.Open(test.textName)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
signature, err := os.Open(test.signatureName)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
err = s.verifier.VerifyDetachedSignature(signature, cleartext, false)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
signature.Close()
|
||||
cleartext.Close()
|
||||
}
|
||||
}
|
||||
|
||||
func (s *VerifierSuite) TestVerifyClearsigned(c *C) {
|
||||
for _, test := range []struct {
|
||||
clearSignedName string
|
||||
}{
|
||||
{"1.clearsigned"},
|
||||
} {
|
||||
clearsigned, err := os.Open(test.clearSignedName)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
keyInfo, err := s.verifier.VerifyClearsigned(clearsigned, false)
|
||||
c.Assert(err, IsNil)
|
||||
c.Check(keyInfo.GoodKeys, DeepEquals, []Key{"8B48AD6246925553", "7638D0442B90D010"})
|
||||
c.Check(keyInfo.MissingKeys, DeepEquals, []Key(nil))
|
||||
|
||||
clearsigned.Close()
|
||||
}
|
||||
}
|
||||
|
||||
func (s *VerifierSuite) TestExtractClearsigned(c *C) {
|
||||
for _, test := range []struct {
|
||||
clearSignedName, clearTextName string
|
||||
}{
|
||||
{"1.clearsigned", "1.cleartext"},
|
||||
} {
|
||||
clearsigned, err := os.Open(test.clearSignedName)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
cleartext, err := os.Open(test.clearTextName)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
is, err := s.verifier.IsClearSigned(clearsigned)
|
||||
c.Assert(err, IsNil)
|
||||
c.Check(is, Equals, true)
|
||||
|
||||
clearsigned.Seek(0, 0)
|
||||
|
||||
extractedF, err := s.verifier.ExtractClearsigned(clearsigned)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
expected, err := ioutil.ReadAll(cleartext)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
extracted, err := ioutil.ReadAll(extractedF)
|
||||
c.Assert(err, IsNil)
|
||||
|
||||
// normalize newlines
|
||||
extracted = bytes.TrimRight(bytes.Replace(extracted, []byte("\r\n"), []byte("\n"), -1), "\n")
|
||||
expected = bytes.Replace(expected, []byte("\r\n"), []byte("\n"), -1)
|
||||
|
||||
c.Check(extracted, DeepEquals, expected)
|
||||
|
||||
extractedF.Close()
|
||||
clearsigned.Close()
|
||||
cleartext.Close()
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user