use bundle builder function in sigstore-utils (#643)

Signed-off-by: Brian DeHamer <[email protected]>
sigstore · Jul 27, 2023 · e44f05c · e44f05c
1 parent 94bd313
commit e44f05c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/.changeset/smooth-suits-drum.md b/.changeset/smooth-suits-drum.md
@@ -0,0 +1,5 @@
+---
+'sigstore': minor
+---
+
+Use bundle construction helpers from `@sigstore/bundle` package
diff --git a/packages/client/src/__tests__/sigstore-utils.test.ts b/packages/client/src/__tests__/sigstore-utils.test.ts
@@ -103,7 +103,7 @@ describe('createRekorEntry', () => {
     );
 
     expect(
-      bundle.verificationMaterial.timestampVerificationData
-    ).toBeUndefined();
+      bundle.verificationMaterial.timestampVerificationData?.rfc3161Timestamps
+    ).toHaveLength(0);
   });
 });
diff --git a/packages/client/src/sigstore-utils.ts b/packages/client/src/sigstore-utils.ts
@@ -14,15 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import {
-  BUNDLE_V01_MEDIA_TYPE,
-  Bundle,
   SerializedBundle,
   SerializedEnvelope,
   bundleToJSON,
   envelopeFromJSON,
   envelopeToJSON,
+  toDSSEBundle,
 } from '@sigstore/bundle';
-import { RekorWitness, SignatureBundle } from '@sigstore/sign';
+import { RekorWitness } from '@sigstore/sign';
 import {
   DEFAULT_REKOR_URL,
   DEFAULT_RETRY,
@@ -56,10 +55,12 @@ export async function createRekorEntry(
   options: SignOptions = {}
 ): Promise<SerializedBundle> {
   const envelope = envelopeFromJSON(dsseEnvelope);
-  const content: SignatureBundle = {
-    $case: 'dsseEnvelope',
-    dsseEnvelope: envelope,
-  };
+  const bundle = toDSSEBundle({
+    artifact: envelope.payload,
+    artifactType: envelope.payloadType,
+    signature: envelope.signatures[0].sig,
+    keyHint: envelope.signatures[0].keyid,
+  });
 
   const tlog = new RekorWitness({
     rekorBaseURL:
@@ -69,20 +70,11 @@ export async function createRekorEntry(
     timeout: options.timeout ?? DEFAULT_TIMEOUT,
   });
 
-  const vm = await tlog.testify(content, publicKey);
+  // Add entry to transparency log
+  const vm = await tlog.testify(bundle.content, publicKey);
 
-  const bundle: Bundle = {
-    mediaType: BUNDLE_V01_MEDIA_TYPE,
-    content,
-    verificationMaterial: {
-      content: {
-        $case: 'publicKey',
-        publicKey: { hint: dsseEnvelope.signatures[0].keyid },
-      },
-      timestampVerificationData: undefined,
-      tlogEntries: [...vm.tlogEntries],
-    },
-  };
+  // Add transparency log entries to bundle
+  bundle.verificationMaterial.tlogEntries = [...vm.tlogEntries];
 
   return bundleToJSON(bundle);
 }