ruby-changes:67478
From: Daniel <ko1@a...>
Date: Tue, 31 Aug 2021 19:07:57 +0900 (JST)
Subject: [ruby-changes:67478] aa898b4206 (master): [rubygems/rubygems] Remove @credential_redacted instance variable
https://git.ruby-lang.org/ruby.git/commit/?id=aa898b4206 From aa898b420676633cf36f95b8f97b10d6cac59141 Mon Sep 17 00:00:00 2001 From: Daniel Niknam <mhmd.niknam@g...> Date: Mon, 23 Aug 2021 23:51:07 +1000 Subject: [rubygems/rubygems] Remove @credential_redacted instance variable https://github.com/rubygems/rubygems/commit/c3bb52eb5c --- lib/rubygems/printable_uri.rb | 8 -------- test/rubygems/test_gem_printable_uri.rb | 28 ---------------------------- 2 files changed, 36 deletions(-) diff --git a/lib/rubygems/printable_uri.rb b/lib/rubygems/printable_uri.rb index 3690e0b..f719f4d 100644 --- a/lib/rubygems/printable_uri.rb +++ b/lib/rubygems/printable_uri.rb @@ -8,7 +8,6 @@ class Gem::PrintableUri https://github.com/ruby/ruby/blob/trunk/lib/rubygems/printable_uri.rb#L8 end def initialize(original_uri) - @credential_redacted = false @original_uri = original_uri end @@ -27,10 +26,6 @@ class Gem::PrintableUri https://github.com/ruby/ruby/blob/trunk/lib/rubygems/printable_uri.rb#L26 @uri.respond_to?(:password=) end - def credential_redacted? - @credential_redacted - end - def original_password @original_uri.password end @@ -44,13 +39,10 @@ class Gem::PrintableUri https://github.com/ruby/ruby/blob/trunk/lib/rubygems/printable_uri.rb#L39 def redact_credential if token? @uri.user = 'REDACTED' - @credential_redacted = true elsif oauth_basic? @uri.user = 'REDACTED' - @credential_redacted = true elsif password? @uri.password = 'REDACTED' - @credential_redacted = true end end diff --git a/test/rubygems/test_gem_printable_uri.rb b/test/rubygems/test_gem_printable_uri.rb index c9127a4..9f49d65 100644 --- a/test/rubygems/test_gem_printable_uri.rb +++ b/test/rubygems/test_gem_printable_uri.rb @@ -23,34 +23,6 @@ class TestPrintableUri < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_printable_uri.rb#L23 assert_equal false, Gem::PrintableUri.parse_uri("https://www.example.com:80index").valid_uri? end - def test_credential_redacted_with_user_pass - assert_equal true, Gem::PrintableUri.parse_uri("https://user:pass@e...").credential_redacted? - end - - def test_credential_redacted_with_token - assert_equal true, Gem::PrintableUri.parse_uri("https://token@e...").credential_redacted? - end - - def test_credential_redacted_with_user_x_oauth_basic - assert_equal true, Gem::PrintableUri.parse_uri("https://token:x-oauth-basic@e...").credential_redacted? - end - - def test_credential_redacted_without_credential - assert_equal false, Gem::PrintableUri.parse_uri("https://www.example.com").credential_redacted? - end - - def test_credential_redacted_with_empty_uri_object - assert_equal false, Gem::PrintableUri.parse_uri(URI("")).credential_redacted? - end - - def test_credential_redacted_with_valid_uri_object - assert_equal true, Gem::PrintableUri.parse_uri(URI("https://user:pass@e...")).credential_redacted? - end - - def test_credential_redacted_with_other_objects - assert_equal false, Gem::PrintableUri.parse_uri(Object.new).credential_redacted? - end - def test_original_password_user_pass assert_equal "pass", Gem::PrintableUri.parse_uri("https://user:pass@e...").original_password end -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/