Fixed some url encoding issues.

Martin Brecht-Precht · Martin Brecht-Precht · commit a7f0fb95b1d8 · 2017-02-01T16:53:18.000+01:00
diff --git a/src/SecretSharing/SharedSecretUrlEncoder/HotpSharedSecretUrlEncoder.php b/src/SecretSharing/SharedSecretUrlEncoder/HotpSharedSecretUrlEncoder.php
@@ -21,7 +21,7 @@ public function encode($keyName, $sharedSecret, $issuer = null)
 		$sharedSecret = bin2hex($sharedSecret);
 		$encoded = 'otpauth://hotp/' . rawurlencode($keyName) . '?secret=' . $sharedSecret;
 		if (!is_null($issuer)) {
-			$encoded .= '&issuer=' . $issuer;
+			$encoded .= '&issuer=' . rawurlencode($issuer);
 		}
 		return $encoded;
 	}
diff --git a/src/SecretSharing/SharedSecretUrlEncoder/TotpBase32SharedSecretUrlEncoder.php b/src/SecretSharing/SharedSecretUrlEncoder/TotpBase32SharedSecretUrlEncoder.php
@@ -24,7 +24,7 @@ public function encode($keyName, $sharedSecret, $issuer = null)
 		$sharedSecret = Base32::encodeByteStr($sharedSecret, true);
 		$encoded = 'otpauth://totp/' . rawurlencode($keyName) . '?secret=' . $sharedSecret;
 		if (!is_null($issuer)) {
-			$encoded .= '&issuer=' . $issuer;
+			$encoded .= '&issuer=' . rawurlencode($issuer);
 		}
 		return $encoded;
 	}
diff --git a/src/SecretSharing/SharedSecretUrlEncoder/TotpSharedSecretUrlEncoder.php b/src/SecretSharing/SharedSecretUrlEncoder/TotpSharedSecretUrlEncoder.php
@@ -21,7 +21,7 @@ public function encode($keyName, $sharedSecret, $issuer = null)
 		$sharedSecret = bin2hex($sharedSecret);
 		$encoded = 'otpauth://totp/' . rawurlencode($keyName) . '?secret=' . $sharedSecret;
 		if (!is_null($issuer)) {
-			$encoded .= '&issuer=' . $issuer;
+			$encoded .= '&issuer=' . rawurlencode($issuer);
 		}
 		return $encoded;
 	}

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public function encode($keyName, $sharedSecret, $issuer = null)`
`21`	`21`	`$sharedSecret = bin2hex($sharedSecret);`
`22`	`22`	`$encoded = 'otpauth://hotp/' . rawurlencode($keyName) . '?secret=' . $sharedSecret;`
`23`	`23`	`if (!is_null($issuer)) {`
`24`		`- $encoded .= '&issuer=' . $issuer;`
	`24`	`+ $encoded .= '&issuer=' . rawurlencode($issuer);`
`25`	`25`	`}`
`26`	`26`	`return $encoded;`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function encode($keyName, $sharedSecret, $issuer = null)`
`24`	`24`	`$sharedSecret = Base32::encodeByteStr($sharedSecret, true);`
`25`	`25`	`$encoded = 'otpauth://totp/' . rawurlencode($keyName) . '?secret=' . $sharedSecret;`
`26`	`26`	`if (!is_null($issuer)) {`
`27`		`- $encoded .= '&issuer=' . $issuer;`
	`27`	`+ $encoded .= '&issuer=' . rawurlencode($issuer);`
`28`	`28`	`}`
`29`	`29`	`return $encoded;`
`30`	`30`	`}`