From 4ce90286ee221c62e4f632f3084ae02991630bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sat, 9 Jun 2018 22:45:02 +0100 Subject: [PATCH] remove jar signature verification skeleton code It never did anything, and it doesn't look like it ever will. Remove it. We can always fetch it from the git history if we need it again. --- jar.go | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/jar.go b/jar.go index 51968fd..9dc4c42 100644 --- a/jar.go +++ b/jar.go @@ -7,56 +7,30 @@ import ( "archive/zip" "errors" "io" - "regexp" ) const indexPath = "index-v1.json" -var ( - sigRegex = regexp.MustCompile(`^META-INF/.*\.(DSA|EC|RSA)$`) - - ErrNoIndex = errors.New("no json index found inside jar") - ErrNoSigs = errors.New("no jar signatures found") - ErrTooManySigs = errors.New("multiple jar signatures found") -) - -func verifySignature(pubkey []byte, sig io.Reader) error { - // TODO: Implement - return nil -} +var ErrNoIndex = errors.New("no json index found inside jar") func LoadIndexJar(r io.ReaderAt, size int64, pubkey []byte) (*Index, error) { reader, err := zip.NewReader(r, size) if err != nil { return nil, err } - var index, sig io.ReadCloser + var index io.ReadCloser for _, f := range reader.File { if f.Name == indexPath { index, err = f.Open() if err != nil { return nil, err } - } else if sigRegex.MatchString(f.Name) { - if sig != nil { - return nil, ErrTooManySigs - } - sig, err = f.Open() - if err != nil { - return nil, err - } + break } } if index == nil { return nil, ErrNoIndex } defer index.Close() - if sig == nil { - return nil, ErrNoSigs - } - defer sig.Close() - if err := verifySignature(pubkey, sig); err != nil { - return nil, err - } return LoadIndexJSON(index) }