Skip to content

feat: Skip waiting for the first connection to the key #203

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
merged 2 commits into from
Mar 4, 2025
Merged

feat: Skip waiting for the first connection to the key #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08d3d21
Bypass the three-second wait on the initial connection
TimLico Feb 28, 2025
5a53d2d
Update the relevant test case accordingly
TimLico Feb 28, 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
6 changes: 3 additions & 3 deletions Yubico.YubiKey/src/Yubico/YubiKey/ConnectionFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,13 @@ private void WaitForReclaimTimeout(Transport newTransport)
? TimeSpan.FromMilliseconds(100)
: TimeSpan.FromSeconds(3.01);

// We're only affected by the reclaim timeout if we're switching USB transports.
if (_device.LastActiveTransport == newTransport)
// Skip waiting if the transport is already active or was previously None
if (_device.LastActiveTransport == newTransport || _device.LastActiveTransport == Transport.None)
{
_log.LogDebug(
"{Transport} transport is already active. No need to wait for reclaim.",
_device.LastActiveTransport);

_device.LastActiveTransport = newTransport;
return;
}

Expand Down
3 changes: 2 additions & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/ReclaimTimeoutTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ public void SwitchingBetweenTransports_ForcesThreeSecondWait()
sw3.Stop();

const long expectedLapse = 3000;
Assert.True(sw1.ElapsedMilliseconds > expectedLapse);
const long firstConnectionMaxTime = 100;
Assert.True(sw1.ElapsedMilliseconds < firstConnectionMaxTime);
Assert.True(sw2.ElapsedMilliseconds > expectedLapse);
Assert.True(sw3.ElapsedMilliseconds > expectedLapse);
}
Expand Down
Loading