This repository was archived by the owner on Dec 22, 2021. It is now read-only.

Commit 9be7a7e

committed

PERL-1118 - Improve URI stringify sanitization

1 parent 24f1f7c commit 9be7a7eCopy full SHA for 9be7a7e

File tree

+35

-2

lines changed

+35

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,7 @@ sub __userinfo_invalid_chars {`
`655`	`655`	`# redact user credentials when stringifying`
`656`	`656`	`use overload`
`657`	`657`	`'""' => sub {`
`658`		`- (my $s = $_[0]->uri) =~ s{^(\w+)://[^/]+\@}{1ドル://[REDACTED]\@};`
	`658`	`+ (my $s = $_[0]->uri) =~ s{^([^:]+)://[^/]+\@}{1ドル://[REDACTED]\@};`
`659`	`659`	`return $s`
`660`	`660`	`},`
`661`	`661`	`'fallback' => 1;`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -279,4 +279,21 @@ subtest "auth credentials" => sub {`
`279`	`279`	`);`
`280`	`280`	`};`
`281`	`281`
	`282`	`+subtest "stringification" => sub {`
	`283`	`+ # For srv uri parsing and tests, see uri_srv.t`
	`284`	`+ my $uri;`
	`285`	`+`
	`286`	`+ $uri = new_ok( $class, [ uri => 'mongodb://fred:foobar@localhost' ] );`
	`287`	`+ is( "$uri", 'mongodb://[REDACTED]@localhost', "stringify correct" );`
	`288`	`+`
	`289`	`+ $uri = new_ok( $class, [ uri => 'mongodb://:@localhost' ] );`
	`290`	`+ is( "$uri", 'mongodb://[REDACTED]@localhost', "stringify correct" );`
	`291`	`+`
	`292`	`+ $uri = new_ok( $class, [ uri => 'mongodb://@localhost' ] );`
	`293`	`+ is( "$uri", 'mongodb://@localhost', "stringify correct" );`
	`294`	`+`
	`295`	`+ $uri = new_ok( $class, [ uri => 'mongodb://localhost' ] );`
	`296`	`+ is( "$uri", 'mongodb://localhost', "stringify correct" );`
	`297`	`+};`
	`298`	`+`
`282`	`299`	`done_testing;`

Lines changed: 17 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,23 @@ subtest "boolean params unchanged" => sub {`
`90`	`90`	`is $sslVal, 'true', 'SSL true';`
`91`	`91`
`92`	`92`	`is $expires, 1, 'expires as expected';`
`93`		`- }`
	`93`	`+ };`
	`94`	`+};`
	`95`	`+`
	`96`	`+subtest "stringification" => sub {`
	`97`	`+ my $uri = new_ok( $class, [`
	`98`	`+ uri => 'mongodb+srv://testpass@testmongo.example.com',`
	`99`	`+ _test_seedlist_return => [`
	`100`	`+ [{ target => 'localhost', port => 27017 }],`
	`101`	`+ {`
	`102`	`+ retryWrites => 'true',`
	`103`	`+ retryReads => 'false',`
	`104`	`+ },`
	`105`	`+ 0`
	`106`	`+ ]`
	`107`	`+ ]);`
	`108`	`+`
	`109`	`+ is "$uri", 'mongodb+srv://[REDACTED]@testmongo.example.com', 'Stringification for SRV urls correct';`
`94`	`110`	`};`
`95`	`111`
`96`	`112`	`done_testing;`

Comments

(0)