Upload .dsc file and handle signed case

Author: zombiezen

go.mod

@@ -24,4 +24,5 @@ require (
 	github.com/spf13/cobra v1.0.0
 	github.com/ulikunitz/xz v0.5.8
 	gocloud.dev v0.20.0
+	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
 )

go.sum

@@ -296,7 +296,10 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=

upload.go

@@ -36,6 +36,7 @@ import (
 	"strings"
 
 	"gocloud.dev/blob"
+	"golang.org/x/crypto/openpgp/clearsign"
 	"zombiezen.com/go/aptblob/internal/deb"
 )
 
@@ -196,7 +197,7 @@ func uploadSourcePackage(ctx context.Context, bucket *blob.Bucket, dscPath strin
 	if err != nil {
 		return nil, fmt.Errorf("upload source package %s: %w", packageName, err)
 	}
-	p := deb.NewParser(bytes.NewReader(dsc))
+	p := deb.NewParser(bytes.NewReader(maybeClearSigned(dsc)))
 	p.Fields = deb.SourceControlFields
 	if !p.Single() {
 		if err := p.Err(); err != nil {
@@ -211,6 +212,11 @@ func uploadSourcePackage(ctx context.Context, bucket *blob.Bucket, dscPath strin
 	if err != nil {
 		return nil, fmt.Errorf("upload source package %s: files: %w", packageName, err)
 	}
+
+	_, err = upload(ctx, bucket, dir+"/"+filepath.Base(dscPath), "text/plain; charset=utf-8", "immutable", bytes.NewReader(dsc))
+	if err != nil {
+		return nil, fmt.Errorf("upload source package %s: %s: %w", packageName, filepath.Base(dscPath), err)
+	}
 	for _, sig := range files {
 		fname := sig.Filename
 		contentType := mime.TypeByExtension(slashpath.Ext(fname))
@@ -230,6 +236,16 @@ func uploadSourcePackage(ctx context.Context, bucket *blob.Bucket, dscPath strin
 	return pkg, nil
 }
 
+// maybeClearSigned returns the plaintext of a file that may or may not be
+// wrapped in GPG clear-signed armor.
+func maybeClearSigned(data []byte) []byte {
+	block, _ := clearsign.Decode(data)
+	if block == nil {
+		return data
+	}
+	return block.Plaintext
+}
+
 // promotePackageField ensures the Package field is the first in the paragraph.
 // It modifies the paragraph in-place.
 //