Expose BastionID via witnessctl (#251)

transparency-dev · May 24, 2024 · bdd4b0b · bdd4b0b
1 parent be79295
commit bdd4b0b
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 31 deletions.
diff --git a/api/api.go b/api/api.go
@@ -103,10 +103,13 @@ func (p *Status) Print() string {
 	if p.Witness != nil {
 		status.WriteString(fmt.Sprintf("Witness/Identity ...........: %v\n", p.Witness.Identity))
 		status.WriteString(fmt.Sprintf("Witness/IP .................: %v\n", p.Witness.IP))
-		status.WriteString(fmt.Sprintf("Witness/AttestationKey .....: %v", p.Witness.IDAttestPublicKey))
+		status.WriteString(fmt.Sprintf("Witness/AttestationKey .....: %v\n", p.Witness.IDAttestPublicKey))
+		status.WriteString(fmt.Sprintf("Witness/AttestedIdentity ...: [below]\n\n%v\n", p.Witness.AttestedID))
+		status.WriteString(fmt.Sprintf("Witness/AttestedBastionID ..: [below]\n\n%v\n", p.Witness.AttestedBastionID))
 	} else {
-		status.WriteString(fmt.Sprint("Witness ....................: <no status>"))
+		status.WriteString(fmt.Sprint("Witness ....................: <no status>\n"))
 	}
+	status.WriteString("----------------------------------------------------------- Trusted OS ----")
 
 	return status.String()
 }
diff --git a/api/api.pb.go b/api/api.pb.go
diff --git a/api/api.proto b/api/api.proto
@@ -67,6 +67,13 @@ message WitnessStatus {
 	//   <Witness identity counter in decimal>
 	//   <Witness identity as a note verifier string>
   string AttestedID = 4;
+  // AttestedBastionID is a note-formatted signed attestation for the witness' BastionID.
+  // This attestation note contains:
+	//   "ArmoredWitness BastionID attestation v1"
+	//   <Device serial>
+	//   <Bastion identity counter in decimal>
+	//   <Bastion ID as ASCII hex>
+  string AttestedBastionID = 5;
 }
 
 /*

diff --git a/api/rpc/rpc.go b/api/rpc/rpc.go
@@ -53,6 +53,8 @@ type WitnessStatus struct {
 	IDAttestPublicKey string
 	// AttestedID is a note formatted attestation for the current witness ID.
 	AttestedID string
+	// AttestedBastionID is a note formatted attestation for the current Bastion ID.
+	AttestedBastionID string
 }
 
 // FirmwareUpdate represents a firmware update.

diff --git a/trusted_os/ctl.go b/trusted_os/ctl.go
@@ -78,6 +78,7 @@ func getStatus() (s *api.Status) {
 			IP:                witnessStatus.IP,
 			IDAttestPublicKey: witnessStatus.IDAttestPublicKey,
 			AttestedID:        witnessStatus.AttestedID,
+			AttestedBastionID: witnessStatus.AttestedBastionID,
 		}
 	}