From 2aed061384f68b10d8a4a973009512cb57999c63 Mon Sep 17 00:00:00 2001
From: Matt Larraz <mlarraz@users.noreply.github.com>
Date: Thu, 19 Aug 2021 16:12:04 -0400
Subject: [rubygems/rubygems] Correctly redact credentials when using
 x-oauth-basic

https://github.com/rubygems/rubygems/commit/290b6ab078
---
 lib/bundler/settings.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'lib/bundler/settings.rb')

diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index abf7db21b4..450f57e3d3 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -419,7 +419,15 @@ module Bundler
       elsif is_credential(key)
         "[REDACTED]"
       elsif is_userinfo(converted)
-        converted.gsub(/:.*$/, ":[REDACTED]")
+        username, pass = converted.split(":")
+
+        if pass == "x-oauth-basic"
+          username = "[REDACTED]"
+        else
+          pass = "[REDACTED]"
+        end
+
+        [username, pass].join(":")
       else
         converted
       end
-- 
cgit v1.2.3