[backend] also put anonymous containers in the digest file

We want to generate signatures for them as well in the future.
openSUSE · Jan 18, 2022 · 4624669 · 4624669
1 parent 66cafe1
commit 4624669
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/backend/bs_notar b/src/backend/bs_notar
@@ -200,6 +200,7 @@ if ($digestfile) {
   while(<DIG>) {
     chomp;
     next if /^#/ || /^\s*$/;
+    next if /^([a-z0-9]+):([a-f0-9]+) (\d+)\s*$/;	# ignore anonymous images
     die("bad line in digest file\n") unless /^([a-z0-9]+):([a-f0-9]+) (\d+) (.+?)\s*$/;
     $manifests->{$4} = {
       'hashes' => { $1 => MIME::Base64::encode_base64(pack('H*', $2), '') },

diff --git a/src/backend/bs_regpush b/src/backend/bs_regpush
@@ -220,7 +220,7 @@ sub manifest_upload {
 sub manifest_append {
   my ($manifest, $tag) = @_;
   my $maniid = 'sha256:'.Digest::SHA::sha256_hex($manifest);
-  my $str = "$maniid ".length($manifest)." $tag\n";
+  my $str = "$maniid ".length($manifest).(defined($tag) ? " $tag" : '')."\n";
   if ($digestfile ne '-') {
     BSUtil::appendstr($digestfile, $str);
   } else {
@@ -230,7 +230,11 @@ sub manifest_append {
 
 sub manifest_upload_tags {
   my ($manifest, $tags, $content_type) = @_;
-  return manifest_upload($manifest, undef, $content_type) unless @{$tags || []};
+  if (!@{$tags || []}) {
+    manifest_upload($manifest, undef, $content_type);
+    manifest_append($manifest, undef) if defined $digestfile;
+    return;
+  }
   for my $tag (BSUtil::unify(@$tags)) {
     manifest_upload($manifest, $tag, $content_type);
     manifest_append($manifest, $tag) if defined $digestfile;
@@ -358,6 +362,7 @@ sub tags_from_digestfile {
   while (<DIG>) {
     chomp;
     next if /^#/ || /^\s*$/;
+    next if /^([a-z0-9]+):([a-f0-9]+) (\d+)\s*$/;	# ignore anonymous images
     die("bad line in digest file\n") unless /^([a-z0-9]+):([a-f0-9]+) (\d+) (.+?)\s*$/;
     push @ret, $4;
   }
@@ -646,7 +651,7 @@ for my $tarfile (@tarfiles) {
   my $mani_json = BSContar::create_dist_manifest($mani);
 
   if ($multiarch) {
-    manifest_upload($mani_json, undef, $mediaType);	# upload anonymous image
+    manifest_upload_tags($mani_json, undef, $mediaType);	# upload anonymous image
     my $multimani = {
       'mediaType' => $mediaType,
       'size' => length($mani_json),