safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-05 20:57:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1.6.0 changes to patch.

Browse Source
This commit is contained in:
Virtually Nick
2025-04-23 15:21:29 -04:00
parent cce4fc6500 a4dafe961c
commit aeed51190e
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/src/main/java/org/apache/guacamole/auth/ssl/SSLClientAuthenticationResource.java
View File

@@ -142,6 +142,12 @@ public class SSLClientAuthenticationResource extends SSOResource {
/** /**
* Decodes the provided URL-encoded string as UTF-8, returning the result. * Decodes the provided URL-encoded string as UTF-8, returning the result.
* <p>
* NOTE: The escape() function of the Apache HTTPD server is known to not
* encode plus signs, which can appear in the base64-encoded certificates
* typically received here. To avoid mangling such certificates, this
* function specifically avoids decoding plus signs as spaces (as would
* otherwise happen if URLDecoder is used directly).
* *
* @param value * @param value
* The URL-encoded string to decode. * The URL-encoded string to decode.
@@ -153,6 +159,13 @@ public class SSLClientAuthenticationResource extends SSOResource {
* If the provided value is not a valid URL-encoded string. * If the provided value is not a valid URL-encoded string.
*/ */
private byte[] decode(String value) throws GuacamoleException { private byte[] decode(String value) throws GuacamoleException {
// Ensure all plus signs are decoded literally rather than as spaces
// (the Apache HTTPD implementation of URL escaping that applies to
// request headers does not encode plus signs, whereas the Nginx
// implementation does)
value = value.replace("+", "%2B");
try { try {
return URLDecoder.decode(value, StandardCharsets.UTF_8.name()) return URLDecoder.decode(value, StandardCharsets.UTF_8.name())
.getBytes(StandardCharsets.UTF_8); .getBytes(StandardCharsets.UTF_8);