Skip to content

Tests | Data Races eliminated #91

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

Merged
Foxboron merged 3 commits into from
Apr 2, 2025
Merged

Tests | Data Races eliminated #91

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
b217a15
keyring tests: data races eliminated
derwesx Mar 30, 2025
637552d
main tests: data races eliminated
derwesx Mar 31, 2025
c5dc305
keyring tests: duplicate checks removed, PascalCase for functions.
derwesx Mar 31, 2025
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
4 changes: 2 additions & 2 deletions cmd/ssh-tpm-agent/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,10 @@ func runSSHAuth(t *testing.T, keytype tpm2.TPMAlgID, bits int, pin []byte, keyfn
}
defer session.Close()

session.Shell()

var b bytes.Buffer
session.Stdout = &b
session.Shell()
session.Wait()

<-msgSent
if b.String() != "connected" {
Expand Down
4 changes: 2 additions & 2 deletions internal/keyring/keyring_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
)

func TestSaveandGetData(t *testing.T) {
func TestSaveAndGetData(t *testing.T) {
keyring, err := SessionKeyring.CreateKeyring()
if err != nil {
t.Fatalf("failed getting keyring: %v", err)
Expand All @@ -27,7 +27,7 @@ func TestSaveandGetData(t *testing.T) {
}
}

func TestNokey(t *testing.T) {
func TestNoKey(t *testing.T) {
keyring, err := SessionKeyring.CreateKeyring()
if err != nil {
t.Fatalf("failed getting keyring: %v", err)
Expand Down
11 changes: 11 additions & 0 deletions internal/keyring/threadkeyring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,19 @@ func NewThreadKeyring(ctx context.Context, keyring *Keyring) (*ThreadKeyring, er
tk.removekey = make(chan *removekeyMsg)
tk.readkey = make(chan *readkeyMsg)

// Channel for initialization to prevent Data Race
errCh := make(chan error, 1)

tk.wg.Add(1)
go func() {
var ak *Keyring
runtime.LockOSThread()
ak, err = keyring.CreateKeyring()
if err != nil {
errCh <- err
return
}
errCh <- nil
for {
select {
case msg := <-tk.addkey:
Expand All @@ -91,5 +96,11 @@ func NewThreadKeyring(ctx context.Context, keyring *Keyring) (*ThreadKeyring, er
}
}
}()

// Wait for initialization to complete
if err := <-errCh; err != nil {
return nil, err
}

return &tk, err
}
10 changes: 2 additions & 8 deletions internal/keyring/threadkeyring_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var (
ctx = context.Background()
)

func TestSaveandGetDataThreaded(t *testing.T) {
func TestSaveAndGetDataThreaded(t *testing.T) {
keyring, err := NewThreadKeyring(ctx, SessionKeyring)
if err != nil {
t.Fatalf("failed getting keyring: %v", err)
Expand All @@ -32,14 +32,11 @@ func TestSaveandGetDataThreaded(t *testing.T) {
}
}

func TestNokeyThreaded(t *testing.T) {
func TestNoKeyThreaded(t *testing.T) {
keyring, err := NewThreadKeyring(ctx, SessionKeyring)
if err != nil {
t.Fatalf("failed getting keyring: %v", err)
}
if err != nil {
t.Fatalf("failed getting keyring: %v", err)
}
_, err = keyring.ReadKey("this.key.does.not.exist")
if !errors.Is(err, syscall.ENOKEY) {
t.Fatalf("err: %v", err)
Expand All @@ -51,9 +48,6 @@ func TestRemoveKeyThreaded(t *testing.T) {
if err != nil {
t.Fatalf("failed getting keyring: %v", err)
}
if err != nil {
t.Fatalf("failed getting keyring: %v", err)
}
b := []byte("test string")
if err := keyring.AddKey("test-2", b); err != nil {
t.Fatalf("err: %v", err)
Expand Down