Skip to content

Commit

Permalink
attestedtls: Removed attestedtls error
Browse files Browse the repository at this point in the history 
Attestation results can be collected via
WithResult(), so the custom error is not
required anymore.

Signed-off-by: Simon Ott <[email protected]>
  • Loading branch information
@smo4201
smo4201 committed Dec 6, 2023
1 parent e67b2a6 commit caa09d3
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 123 deletions.
48 changes: 0 additions & 48 deletions attestedtls/attestederror.go
View file

This file was deleted.

10 changes: 5 additions & 5 deletions attestedtls/coap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func (a CoapApi) obtainAR(cc cmcConfig, chbindings []byte) ([]byte, error) {
log.Tracef("Contacting cmcd via coap on %v", cc.cmcAddr)
conn, err := udp.Dial(cc.cmcAddr)
if err != nil {
return nil, fmt.Errorf("Error dialing: %w", err)
return nil, fmt.Errorf("error dialing: %w", err)
}
ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()
Expand Down Expand Up @@ -99,7 +99,7 @@ func (a CoapApi) verifyAR(chbindings, report []byte, cc cmcConfig) error {
log.Tracef("Contacting cmcd via coap on %v", cc.cmcAddr)
conn, err := udp.Dial(cc.cmcAddr)
if err != nil {
return fmt.Errorf("Error dialing: %w", err)
return fmt.Errorf("error dialing: %w", err)
}
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
Expand Down Expand Up @@ -144,7 +144,7 @@ func (a CoapApi) verifyAR(chbindings, report []byte, cc cmcConfig) error {

// check results
if !cc.result.Success {
return NewAttestedError(*cc.result, errors.New("verification failed"))
return errors.New("attestation report verification failed")
}

return nil
Expand All @@ -158,7 +158,7 @@ func (a CoapApi) fetchSignature(cc cmcConfig, digest []byte, opts crypto.SignerO
log.Tracef("Contacting cmcd via coap on %v", cc.cmcAddr)
conn, err := udp.Dial(cc.cmcAddr)
if err != nil {
return nil, fmt.Errorf("Error dialing: %w", err)
return nil, fmt.Errorf("error dialing: %w", err)
}
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
Expand Down Expand Up @@ -212,7 +212,7 @@ func (a CoapApi) fetchCerts(cc cmcConfig) ([][]byte, error) {
log.Tracef("Contacting cmcd via coap on %v", cc.cmcAddr)
conn, err := udp.Dial(cc.cmcAddr)
if err != nil {
return nil, fmt.Errorf("Error dialing: %w", err)
return nil, fmt.Errorf("error dialing: %w", err)
}
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
Expand Down
2 changes: 1 addition & 1 deletion attestedtls/grpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func (a GrpcApi) verifyAR(chbindings, report []byte, cc cmcConfig) error {

// check results
if !cc.result.Success {
return NewAttestedError(*cc.result, errors.New("verification failed"))
return errors.New("attestation report verification failed")
}
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion attestedtls/libapi.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func (a LibApi) verifyAR(chbindings, report []byte, cc cmcConfig) error {
}

if !result.Success {
return NewAttestedError(result, errors.New("verification failed"))
return errors.New("attestation report verification failed")
}
return nil
}
Expand Down
10 changes: 5 additions & 5 deletions attestedtls/socket.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func (a SocketApi) obtainAR(cc cmcConfig, chbindings []byte) ([]byte, error) {
log.Tracef("Contacting cmcd via %v on %v", cc.network, cc.cmcAddr)
conn, err := net.Dial(cc.network, cc.cmcAddr)
if err != nil {
return nil, fmt.Errorf("Error dialing: %w", err)
return nil, fmt.Errorf("error dialing: %w", err)
}

req := &api.AttestationRequest{
Expand Down Expand Up @@ -88,7 +88,7 @@ func (a SocketApi) verifyAR(chbindings, report []byte, cc cmcConfig) error {
log.Tracef("Contacting cmcd via %v on %v", cc.network, cc.cmcAddr)
conn, err := net.Dial(cc.network, cc.cmcAddr)
if err != nil {
return fmt.Errorf("Error dialing: %w", err)
return fmt.Errorf("error dialing: %w", err)
}

// Create Verification request
Expand Down Expand Up @@ -133,7 +133,7 @@ func (a SocketApi) verifyAR(chbindings, report []byte, cc cmcConfig) error {

// Check results
if !cc.result.Success {
return NewAttestedError(*cc.result, errors.New("verification failed"))
return errors.New("attestation report verification failed")
}
return nil
}
Expand All @@ -144,7 +144,7 @@ func (a SocketApi) fetchSignature(cc cmcConfig, digest []byte, opts crypto.Signe
log.Tracef("Contacting cmcd via %v on %v", cc.network, cc.cmcAddr)
conn, err := net.Dial(cc.network, cc.cmcAddr)
if err != nil {
return nil, fmt.Errorf("Error dialing: %w", err)
return nil, fmt.Errorf("error dialing: %w", err)
}

hash, err := api.SignerOptsToHash(opts)
Expand Down Expand Up @@ -196,7 +196,7 @@ func (a SocketApi) fetchCerts(cc cmcConfig) ([][]byte, error) {
log.Tracef("Contacting cmcd via %v on %v", cc.network, cc.cmcAddr)
conn, err := net.Dial(cc.network, cc.cmcAddr)
if err != nil {
return nil, fmt.Errorf("Error dialing: %w", err)
return nil, fmt.Errorf("error dialing: %w", err)
}

// Create TLS certificate request
Expand Down
100 changes: 37 additions & 63 deletions testtool/internal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@ import (
"crypto/tls"
"crypto/x509"
"encoding/json"
"errors"
"fmt"
"io"
"net"
"net/http"
"os"
"strconv"
"sync"
"time"

// local modules
Expand All @@ -54,41 +53,18 @@ func dialInternalAddr(c *config, api atls.CmcApiSelect, addr string, tlsConf *tl
atls.WithCmcNetwork(c.Network),
atls.WithResult(verificationResult),
atls.WithCmc(cmc))
// Publish the attestation result asynchronously if publishing address was specified and
// the result is present
wg := new(sync.WaitGroup)
wg.Add(1)
defer wg.Wait()
go publishResultAsync(c.Publish, verificationResult, wg)
if err != nil {
var attestedErr atls.AttestedError
if errors.As(err, &attestedErr) {
arresult := attestedErr.GetVerificationResult()
result, err := json.Marshal(arresult)
if err != nil {
return fmt.Errorf("internal error: failed to marshal verification result: %v",
err)
}
r, err := strconv.Unquote(string(result))
if err != nil {
r = string(result)
}

// Publish the attestation result if publishing address was specified
err = publishResult(c.Publish, &arresult)
if err != nil {
log.Warnf("failed to publish result: %v", err)
}

return fmt.Errorf(
"verification Result: %v. Cannot establish connection: remote attestation failed",
r)
}
return fmt.Errorf("failed to dial server: %v", err)
}
defer conn.Close()
_ = conn.SetReadDeadline(time.Now().Add(timeoutSec * time.Second))

// Publish the attestation result if publishing address was specified
err = publishResult(c.Publish, verificationResult)
if err != nil {
log.Warnf("failed to publish result: %v", err)
}

// Testing: write a hello string
msg := "hello\n"
log.Infof("Sending to peer: %v", msg)
Expand Down Expand Up @@ -154,13 +130,13 @@ func dialInternal(c *config, api atls.CmcApiSelect, cmc *cmc.Cmc) {
log.Infof("Starting monitoring with interval %v", c.interval)

for {
<-ticker.C
for _, addr := range c.Addr {
err := dialInternalAddr(c, api, addr, tlsConf, cmc)
if err != nil {
log.Warnf(err.Error())
}
}
<-ticker.C
}
} else {
for _, addr := range c.Addr {
Expand Down Expand Up @@ -233,32 +209,14 @@ func listenInternal(c *config, api atls.CmcApiSelect, cmc *cmc.Cmc) {

for {
log.Infof("serving under %v", addr)
// Finish TLS connection establishment with Remote Attestation
// Accept connection and perform remote attestation
conn, err := ln.Accept()
if err != nil {
var attestedErr atls.AttestedError
if errors.As(err, &attestedErr) {
arresult := attestedErr.GetVerificationResult()
result, err := json.Marshal(arresult)
if err != nil {
log.Errorf("Internal error: failed to marshal verification result: %v", err)
} else {
r, err := strconv.Unquote(string(result))
if err != nil {
r = string(result)
}

// Publish the attestation result if publishing address was specified
err = publishResult(c.Publish, &arresult)
if err != nil {
log.Warnf("failed to publish result: %v", err)
}

log.Errorf("Verification Result: %v\n"+
"Cannot establish connection: Remote attestation Failed.", r)
}
} else {
log.Errorf("Failed to establish connection: %v", err)
log.Errorf("Failed to establish connection: %v", err)
if c.Mtls {
// Publish the attestation result if publishing address was specified
// and result is not empty
go publishResult(c.Publish, verificationResult)
}
continue
}
Expand All @@ -268,10 +226,8 @@ func listenInternal(c *config, api atls.CmcApiSelect, cmc *cmc.Cmc) {

if c.Mtls {
// Publish the attestation result if publishing address was specified
err = publishResult(c.Publish, verificationResult)
if err != nil {
log.Warnf("failed to publish result: %v", err)
}
// and result is not empty
go publishResult(c.Publish, verificationResult)
}
}
}
Expand Down Expand Up @@ -317,13 +273,31 @@ func handleConnection(conn net.Conn) {
}
}

func publishResult(addr string, result *ar.VerificationResult) error {
func publishResultAsync(addr string, result *ar.VerificationResult, wg *sync.WaitGroup) {
defer wg.Done()
publishResult(addr, result)
}

func publishResult(addr string, result *ar.VerificationResult) {

log.Tracef("Publishing result to %v", addr)

if result.Prover == "" {
log.Trace("Will not publish result: prover is empty (this happens if connection could not be established)")
return
}

data, err := json.Marshal(*result)
if err != nil {
return fmt.Errorf("failed to marshal result: %w", err)
log.Tracef("Failed to marshal result: %v", err)
return
}

return publish(addr, data)
err = publish(addr, data)
if err != nil {
log.Tracef("Failed to publish: %v", err)
return
}
}

func publish(addr string, result []byte) error {
Expand Down

0 comments on commit caa09d3

Please sign in to comment.