rocky-linux/peridot
4
0
Fork 0
mirror of https://github.com/rocky-linux/peridot.git synced 2024-11-21 12:41:27 +00:00
Code Issues Projects Releases Activity

Merge pull request #187 from mstg/support-v3-headers

Browse Source 
Add support for V3 signature headers
This commit is contained in:
resf-prow[bot] 2024-07-10 14:32:46 +00:00 committed by GitHub
commit 68e2db8af0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
peridot/builder/v1/workflow/yumrepofs.go
View File

@ -66,6 +66,7 @@ import (
yumrepofspb "peridot.resf.org/peridot/yumrepofs/pb" yumrepofspb "peridot.resf.org/peridot/yumrepofs/pb"
"peridot.resf.org/utils" "peridot.resf.org/utils"
"regexp" "regexp"
"strconv"
"strings" "strings"
"time" "time"
) )
@ -1400,6 +1401,9 @@ func (c *Controller) makeRepoChanges(tx peridotdb.Access, req *UpdateRepoRequest
pkgPrimary.Packages[0].Location.Href = fmt.Sprintf("Packages/%s", newObjectKey) pkgPrimary.Packages[0].Location.Href = fmt.Sprintf("Packages/%s", newObjectKey)
pkgPrimary.Packages[0].Checksum.Value = signedArtifact.HashSha256 pkgPrimary.Packages[0].Checksum.Value = signedArtifact.HashSha256
if signedArtifact.SignedSize > 0 {
pkgPrimary.Packages[0].Size.Package = strconv.FormatInt(signedArtifact.SignedSize, 10)
}
for _, pkg := range pkgFilelists.Packages { for _, pkg := range pkgFilelists.Packages {
pkg.PkgId = signedArtifact.HashSha256 pkg.PkgId = signedArtifact.HashSha256

7
peridot/keykeeper/v1/sign.go
View File

@ -246,9 +246,16 @@ func (s *Server) SignArtifactActivity(ctx context.Context, artifactId string, ke
return nil, fmt.Errorf("failed to create task artifact signature: %v", err) return nil, fmt.Errorf("failed to create task artifact signature: %v", err)
} }
// Get the size of the file
fi, err := f.Stat()
if err != nil {
return nil, err
}
return &keykeeperpb.SignedArtifact{ return &keykeeperpb.SignedArtifact{
Path: newObjectKey, Path: newObjectKey,
HashSha256: hash, HashSha256: hash,
SignedSize: fi.Size(),
}, nil }, nil
} }
verifySig := func() error { verifySig := func() error {

1
peridot/proto/v1/keykeeper/keykeeper.proto
View File

@ -86,6 +86,7 @@ message ImportKeyResponse {}
message SignedArtifact { message SignedArtifact {
string path = 1; string path = 1;
string hash_sha256 = 2; string hash_sha256 = 2;
int64 signed_size = 3;
} }
message SignArtifactsRequest { message SignArtifactsRequest {