Skip to content
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

Add threshold checking #37

Merged
merged 3 commits into from
Nov 11, 2024
Merged

Add threshold checking #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
137ba1d
Add threshold checking
juanli16 Nov 8, 2024
b387749
don't write any files on error
juanli16 Nov 11, 2024
38d6e6b
add comments
juanli16 Nov 11, 2024
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
32 changes: 28 additions & 4 deletions pkg/cmd/cli/pair.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func NewPAIRConfig(ctx context.Context, token string, threads int, key string) (
}, nil
}

func (c *pairConfig) hashEncryt(ctx context.Context, input string) error {
func (c *pairConfig) hashEncryt(ctx context.Context, input string) (err error) {
logger := zerolog.Ctx(ctx)
logger.Info().Msg("Step 1: Hash and encrypt the advertiser data.")

Expand All @@ -85,6 +85,12 @@ func (c *pairConfig) hashEncryt(ctx context.Context, input string) error {
return fmt.Errorf("bucket.NewBucketCompleter: %w", err)
}
defer func() {
// don't complete the bucket if there was an error to prevent writing
// unwanted files.
if err != nil {
return
}

if err := bucketCompleter.Complete(ctx); err != nil {
logger.Error().Err(err).Msg("failed to write .Completed file to bucket")
return
Expand All @@ -96,6 +102,12 @@ func (c *pairConfig) hashEncryt(ctx context.Context, input string) error {
return fmt.Errorf("bucket.NewBucket: %w", err)
}
defer func() {
// don't close the bucket if there was an error to prevent writing
// unwanted files.
if err != nil {
return
}

if err := b.Close(); err != nil {
logger.Error().Err(err).Msg("failed to close bucket")
return
Expand All @@ -117,10 +129,10 @@ func (c *pairConfig) hashEncryt(ctx context.Context, input string) error {

logger.Info().Msg("Step 1: Hash and encrypt the advertiser data completed.")

return nil
return
}

func (c *pairConfig) reEncrypt(ctx context.Context, publisherPAIRIDsPath string) error {
func (c *pairConfig) reEncrypt(ctx context.Context, publisherPAIRIDsPath string) (err error) {
logger := zerolog.Ctx(ctx)
logger.Info().Msg("Step 2: Re-encrypt the publisher's hashed and encrypted PAIR IDs.")

Expand All @@ -130,6 +142,12 @@ func (c *pairConfig) reEncrypt(ctx context.Context, publisherPAIRIDsPath string)
return fmt.Errorf("bucket.NewBucketCompleter: %w", err)
}
defer func() {
// don't complete the bucket if there was an error to prevent writing
// unwanted files.
if err != nil {
return
}

if err := bucketCompleter.Complete(ctx); err != nil {
logger.Error().Err(err).Msg("failed to write .Completed file to bucket")
return
Expand All @@ -141,6 +159,12 @@ func (c *pairConfig) reEncrypt(ctx context.Context, publisherPAIRIDsPath string)
return fmt.Errorf("bucket.NewBucket: %w", err)
}
defer func() {
// don't close the bucket if there was an error to prevent writing
// unwanted files.
if err != nil {
return
}

if err := b.Close(); err != nil {
logger.Error().Err(err).Msg("failed to close bucket")
return
Expand Down Expand Up @@ -177,7 +201,7 @@ func (c *pairConfig) reEncrypt(ctx context.Context, publisherPAIRIDsPath string)

logger.Info().Msg("Step 2: Re-encrypt the publisher's hashed and encrypted PAIR IDs completed.")

return nil
return
}

func (c *pairConfig) match(ctx context.Context, outputPath string, publisherPAIRIDsPath string) error {
Expand Down
11 changes: 10 additions & 1 deletion pkg/pair/pair.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,16 @@ import (
)

const (
batchSize = 1024
batchSize = 1024
minimumIDCount = 1000

maxOperationRunTime = 4 * time.Hour
)

var (
ErrInputBelowThreshold = errors.New("not enough identifiers for a secure PAIR ID match")
)

type (
pairIDReadWriter struct {
reader *pairIDReader
Expand Down Expand Up @@ -215,6 +220,10 @@ func runPAIROperation(ctx context.Context, p *pairIDReadWriter, numWorkers int,
}
close(done)

if p.reader.read.Load() < minimumIDCount {
return ErrInputBelowThreshold
}

logger.Debug().Msgf("%s: read %d IDs, written %d PAIR IDs in %s", op, p.reader.read.Load(), p.written.Load(), time.Since(startTime))
return nil
case <-ctx.Done():
Expand Down