Skip to content

Single connection #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
HarrisonPearl wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Single connection #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fde6a1
reimplements signRequest in load test to avoid redundant connection s…
HarrisonPearl Dec 22, 2022
09dda29
reduces timeout
HarrisonPearl Dec 22, 2022
b81086f
removed logging during signing
HarrisonPearl Dec 22, 2022
58e2d98
adds verifyRequestOverConnection
HarrisonPearl Dec 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 41 additions & 16 deletions cmd/load_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,33 @@ import (
"time"

"github.com/IABTechLab/adscert/pkg/adscert/api"
"github.com/IABTechLab/adscert/pkg/adscert/logger"
"gonum.org/v1/plot"
"gonum.org/v1/plot/plotter"
"gonum.org/v1/plot/plotutil"
"gonum.org/v1/plot/vg"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)

func DeactivatedTestLoadNoOp(t *testing.T) {
timeoutList := []time.Duration{10 * time.Millisecond, 100 * time.Millisecond, 1000 * time.Millisecond}
func TestLoadNoOp(t *testing.T) {
timeoutList := []time.Duration{1 * time.Millisecond, 10 * time.Millisecond}
for _, timeout := range timeoutList {
signBatchesAndPlot(timeout, true)
}

}

func DeactivatedTestLoadSigning(t *testing.T) {
timeoutList := []time.Duration{10 * time.Millisecond, 100 * time.Millisecond, 1000 * time.Millisecond}
func TestLoadSigning(t *testing.T) {
timeoutList := []time.Duration{1 * time.Millisecond, 10 * time.Millisecond}
for _, timeout := range timeoutList {
signBatchesAndPlot(timeout, false)
}

}

func DeactivatedTestLoadVerification(t *testing.T) {
timeoutList := []time.Duration{10 * time.Millisecond, 100 * time.Millisecond, 1000 * time.Millisecond}
func TestLoadVerification(t *testing.T) {
timeoutList := []time.Duration{1 * time.Millisecond, 10 * time.Millisecond}
for _, timeout := range timeoutList {
verifyBatchesAndPlot(timeout)
}
Expand Down Expand Up @@ -68,6 +71,17 @@ func signBatchesAndPlot(timeout time.Duration, isNoOp bool) {

testsPerTestSize := 10
c := make(chan api.SignatureOperationStatus)

// Establish the gRPC connection that the client will use to connect to the
// signatory server. This basic example uses unauthenticated connections
// which should not be used in a production environment.
opts := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}
conn, err := grpc.Dial(testsignParams.serverAddress, opts...)
if err != nil {
logger.Fatalf("Failed to dial: %v", err)
}
defer conn.Close()

iterationResults := map[int][]float64{}
lowestSuccessPercent := 1.00
numOfRequests := 1
Expand All @@ -81,7 +95,7 @@ func signBatchesAndPlot(timeout time.Duration, isNoOp bool) {
iterationResults[numOfRequests] = []float64{}
lowestSuccessPercent = 1.00
for i := 0; i < testsPerTestSize; i++ {
iterationResult := sendSignatureRequests(numOfRequests, testsignParams, c)
iterationResult := sendSignatureRequestsOverConnection(numOfRequests, testsignParams, c, conn)
iterationResultSuccessPercent := float64(iterationResult[1]) / float64(numOfRequests)
if lowestSuccessPercent > iterationResultSuccessPercent {
lowestSuccessPercent = iterationResultSuccessPercent
Expand All @@ -107,9 +121,9 @@ func signBatchesAndPlot(timeout time.Duration, isNoOp bool) {

}

func sendSignatureRequests(numOfRequests int, testsignParams *testsignParameters, c chan api.SignatureOperationStatus) []int {
func sendSignatureRequestsOverConnection(numOfRequests int, testsignParams *testsignParameters, c chan api.SignatureOperationStatus, conn *grpc.ClientConn) []int {
for i := 0; i < numOfRequests; i++ {
go signToChannel(testsignParams, c)
go signToChannelOverConnection(testsignParams, c, conn)
}

var res []api.SignatureOperationStatus
Expand All @@ -126,8 +140,8 @@ func sendSignatureRequests(numOfRequests int, testsignParams *testsignParameters
return iterationResult
}

func signToChannel(testsignParams *testsignParameters, c chan api.SignatureOperationStatus) {
signatureStatus := signRequest(testsignParams)
func signToChannelOverConnection(testsignParams *testsignParameters, c chan api.SignatureOperationStatus, conn *grpc.ClientConn) {
signatureStatus := signRequestOverConnection(testsignParams, conn)
c <- signatureStatus.GetSignatureOperationStatus() // send status to c
}

Expand All @@ -141,6 +155,17 @@ func verifyBatchesAndPlot(timeout time.Duration) {

testsPerTestSize := 10
c := make(chan api.SignatureDecodeStatus)

// Establish the gRPC connection that the client will use to connect to the
// signatory server. This basic example uses unauthenticated connections
// which should not be used in a production environment.
opts := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}
conn, err := grpc.Dial(testverifyParams.serverAddress, opts...)
if err != nil {
logger.Fatalf("Failed to dial: %v", err)
}
defer conn.Close()

iterationResults := map[int][]float64{}
lowestSuccessPercent := 1.00
numOfRequests := 1
Expand All @@ -154,7 +179,7 @@ func verifyBatchesAndPlot(timeout time.Duration) {
iterationResults[numOfRequests] = []float64{}
lowestSuccessPercent = 1.00
for i := 0; i < testsPerTestSize; i++ {
iterationResult := sendVerificationRequests(numOfRequests, testverifyParams, c)
iterationResult := sendVerificationRequestsOverConnection(numOfRequests, testverifyParams, c, conn)
iterationResultSuccessPercent := float64(iterationResult[1]) / float64(numOfRequests)
if lowestSuccessPercent > iterationResultSuccessPercent {
lowestSuccessPercent = iterationResultSuccessPercent
Expand All @@ -176,9 +201,9 @@ func verifyBatchesAndPlot(timeout time.Duration) {

}

func sendVerificationRequests(numOfRequests int, testverifyParams *testverifyParameters, c chan api.SignatureDecodeStatus) []int {
func sendVerificationRequestsOverConnection(numOfRequests int, testverifyParams *testverifyParameters, c chan api.SignatureDecodeStatus, conn *grpc.ClientConn) []int {
for i := 0; i < numOfRequests; i++ {
go verifyToChannel(testverifyParams, c)
go verifyToChannelOverConnection(testverifyParams, c, conn)
}

var res []api.SignatureDecodeStatus
Expand All @@ -195,8 +220,8 @@ func sendVerificationRequests(numOfRequests int, testverifyParams *testverifyPar
return iterationResult
}

func verifyToChannel(testverifyParams *testverifyParameters, c chan api.SignatureDecodeStatus) {
verificationResponse := verifyRequest(testverifyParams)
func verifyToChannelOverConnection(testverifyParams *testverifyParameters, c chan api.SignatureDecodeStatus, conn *grpc.ClientConn) {
verificationResponse := verifyRequestOverConnection(testverifyParams, conn)
if len(verificationResponse.GetVerificationInfo()) > 0 && len(verificationResponse.GetVerificationInfo()[0].GetSignatureDecodeStatus()) > 0 {
signatureStatus := verificationResponse.GetVerificationInfo()[0].GetSignatureDecodeStatus()[0]
c <- signatureStatus // send status to c
Expand Down
63 changes: 63 additions & 0 deletions cmd/test_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package cmd

import (
"strings"

"github.com/IABTechLab/adscert/pkg/adscert/api"
"github.com/IABTechLab/adscert/pkg/adscert/signatory"
"google.golang.org/grpc"
)

func signRequestOverConnection(testsignParams *testsignParameters, conn *grpc.ClientConn) *api.AuthenticatedConnectionSignatureResponse {
// Create a reusable Signatory Client that provides a lightweight wrapper
// around the RPC client stub. This code performs some basic request
// timeout and error handling logic.
clientOpts := &signatory.AuthenticatedConnectionsSignatoryClientOptions{Timeout: testsignParams.signingTimeout}
signatoryClient := signatory.NewAuthenticatedConnectionsSignatoryClient(conn, clientOpts)

// Rewrite an HTTP url as HTTPS if requested by command line flag.
var urlToSign string
if strings.HasPrefix(testsignParams.url, "http://") && testsignParams.signURLAsHTTPS {
urlToSign = "https://" + testsignParams.url[7:]
} else {
urlToSign = testsignParams.url
}

// The RequestInfo proto contains details about the individual ad request
// being signed. A SetRequestInfo helper function derives a hash of the
// destination URL and body, setting these value on the RequestInfo message.
reqInfo := &api.RequestInfo{}
signatory.SetRequestInfo(reqInfo, urlToSign, []byte(testsignParams.body))

// Request the signature.
signatureResponse, _ := signatoryClient.SignAuthenticatedConnection(
&api.AuthenticatedConnectionSignatureRequest{
RequestInfo: reqInfo,
})

return signatureResponse
}

func verifyRequestOverConnection(testverifyParams *testverifyParameters, conn *grpc.ClientConn) *api.AuthenticatedConnectionVerificationResponse {
// Create a reusable Signatory Client that provides a lightweight wrapper
// around the RPC client stub. This code performs some basic request
// timeout and error handling logic.
clientOpts := &signatory.AuthenticatedConnectionsSignatoryClientOptions{Timeout: testverifyParams.verifyingTimeout}
signatoryClient := signatory.NewAuthenticatedConnectionsSignatoryClient(conn, clientOpts)

// The RequestInfo proto contains details about the individual ad request
// being verified. A SetRequestInfo helper function derives a hash of the
// destination URL and body, and sets the hash and the signature message on the RequestInfo message.
signatureHeaders := []string{testverifyParams.signatureMessage}

reqInfo := &api.RequestInfo{}
signatory.SetRequestInfo(reqInfo, testverifyParams.destinationURL, []byte(testverifyParams.body))
signatory.SetRequestSignatures(reqInfo, signatureHeaders)

// Request the verification.
verificationResponse, _ := signatoryClient.VerifyAuthenticatedConnection(
&api.AuthenticatedConnectionVerificationRequest{
RequestInfo: []*api.RequestInfo{reqInfo},
})
return verificationResponse
}