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

GUACAMOLE-38: Break query string parsing into its own method.

Browse Source
This commit is contained in:
Nick Couchman
2018-04-19 07:20:51 -04:00
parent d9751f20d0
commit 1011845032
1 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java
View File

@@ -25,7 +25,9 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.guacamole.GuacamoleClientException;
@@ -104,7 +106,7 @@ public class QCParser {
String query = qcUri.getQuery();
String username = null;
String password = null;
List<String> paramList = null;
Map<String, String> queryParams = null;
if (protocol == null || protocol.isEmpty())
protocol = DEFAULT_URI_PROTOCOL;
@@ -112,8 +114,14 @@ public class QCParser {
if (host == null || host.isEmpty())
host = DEFAULT_URI_HOST;
if (query != null && !query.isEmpty())
paramList = Arrays.asList(query.split("&"));
if (query != null && !query.isEmpty()) {
try {
queryParams = parseQueryString(query);
}
catch (UnsupportedEncodingException e) {
throw new GuacamoleServerException("Unexpected lack of UTF-8 encoding support.", e);
}
}
if (userInfo != null && !userInfo.isEmpty()) {
@@ -138,24 +146,44 @@ public class QCParser {
if (password != null && !password.isEmpty())
qcConfig.setParameter("password", password);
if (paramList != null) {
for (String parameter : paramList) {
String[] paramArray = parameter.split("=", 2);
try {
qcConfig.setParameter(URLDecoder.decode(paramArray[0], "UTF-8"),
URLDecoder.decode(paramArray[1], "UTF-8"));
}
catch (UnsupportedEncodingException e) {
logger.error("Unexpected lack of UTF-8 encoding support.");
throw new GuacamoleServerException("Unexpected lack of UTF-8 encoding support.", e);
}
}
}
if (queryParams != null)
for (Map.Entry<String, String> entry : queryParams.entrySet())
qcConfig.setParameter(entry.getKey(), entry.getValue());
return qcConfig;
}
/**
* Parse the given string for parameter key/value pairs and return
* a map with the parameters.
*
* @param queryStr
* The query string to parse for the values.
*
* @return
* A map with the key/value pairs.
*
* @throws UnsupportedEncodingException
* If Java lacks UTF-8 support.
*/
private static Map<String, String> parseQueryString(String queryStr)
throws UnsupportedEncodingException {
// Split the query string into the pairs
List<String> paramList = Arrays.asList(queryStr.split("&"));
Map<String, String> parameters = new HashMap<String,String>();
// Split into key/value pairs and decode
for (String param : paramList) {
String[] paramArray = param.split("=", 2);
parameters.put(URLDecoder.decode(paramArray[0], "UTF-8"),
URLDecoder.decode(paramArray[1], "UTF-8"));
}
return parameters;
}
/**
* Given a GuacamoleConfiguration object, generate a name
* for the configuration based on the protocol, host, user
@@ -182,7 +210,7 @@ public class QCParser {
String port = config.getParameter("port");
String user = config.getParameter("username");
StringBuilder name = new StringBuilder("");
StringBuilder name = new StringBuilder();
if (protocol != null && !protocol.isEmpty())
name.append(protocol).append("://");