Terminate interaction when rescuing WebauthnVerificationError during wait_for_otp

Co-authored-by: Betty Li <makewithbetty@gmail.com>

2 files changed, 4 insertions, 1 deletions

diff --git a/lib/rubygems/commands/owner_command.rb b/lib/rubygems/commands/owner_command.rb
index eb66c510a9..fce32aca3e 100644
--- a/lib/rubygems/commands/owner_command.rb
+++ b/lib/rubygems/commands/owner_command.rb
@@ -101,7 +101,7 @@ permission to.
     rescue Gem::WebauthnVerificationError => e
       raise e
     rescue StandardError
-      # ignore
+      # ignore early exits to allow for completing the iteration of all owners
     end
   end
 
diff --git a/lib/rubygems/gemcutter_utilities.rb b/lib/rubygems/gemcutter_utilities.rb
index c4f31dc0d6..e66fd0e60f 100644
--- a/lib/rubygems/gemcutter_utilities.rb
+++ b/lib/rubygems/gemcutter_utilities.rb
@@ -266,6 +266,9 @@ module Gem::GemcutterUtilities
 
     thread = Thread.new do
       Thread.current[:otp] = Gem::WebauthnListener.wait_for_otp_code(host, server)
+    rescue Gem::WebauthnVerificationError => e
+      alert_error e.message
+      terminate_interaction(1)
     end
     thread.abort_on_exception = true
     thread.report_on_exception = false