- Fixed FS#3118 - munin & monit logins not being urlencoded.

falkotimme · falkotimme · commit 2c76f1a2117f · 2013-10-23T02:31:57.000+02:00
diff --git a/interface/web/monitor/show_monit.php b/interface/web/monitor/show_monit.php
@@ -58,10 +58,10 @@
 		$monit_password = trim($server_config['monit_password']);
 		$auth_string = '';
 		if($monit_user != ''){
-			$auth_string = $monit_user;
+			$auth_string = rawurlencode($monit_user);
 		}
 		if($monit_user != '' && $monit_password != ''){
-			$auth_string .= ':'.$monit_password;
+			$auth_string .= ':'.rawurlencode($monit_password);
 		}
 		if($auth_string != '') $auth_string .= '@';
 	
diff --git a/interface/web/monitor/show_munin.php b/interface/web/monitor/show_munin.php
@@ -58,10 +58,10 @@
 		$munin_password = trim($server_config['munin_password']);
 		$auth_string = '';
 		if($munin_user != ''){
-			$auth_string = $munin_user;
+			$auth_string = rawurlencode($munin_user);
 		}
 		if($munin_user != '' && $munin_password != ''){
-			$auth_string .= ':'.$munin_password;
+			$auth_string .= ':'.rawurlencode($munin_password);
 		}
 		if($auth_string != '') $auth_string .= '@';
 	

Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,10 @@`
`58`	`58`	`$monit_password = trim($server_config['monit_password']);`
`59`	`59`	`$auth_string = '';`
`60`	`60`	`if($monit_user != ''){`
`61`		`- $auth_string = $monit_user;`
	`61`	`+ $auth_string = rawurlencode($monit_user);`
`62`	`62`	`}`
`63`	`63`	`if($monit_user != '' && $monit_password != ''){`
`64`		`- $auth_string .= ':'.$monit_password;`
	`64`	`+ $auth_string .= ':'.rawurlencode($monit_password);`
`65`	`65`	`}`
`66`	`66`	`if($auth_string != '') $auth_string .= '@';`
`67`	`67`