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

GUACAMOLE-38: Tweak to regex and correct behavior of matcher.

Browse Source
This commit is contained in:
Nick Couchman
2018-03-25 15:02:16 -04:00
parent 16130b32fe
commit 43919e5623
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ public class QCParser {
/** /**
* The regex to use to split username and password. * The regex to use to split username and password.
*/ */
private static final Pattern userinfoPattern = Pattern.compile("(^[^:]+):(.*)"); private static final Pattern userinfoPattern = Pattern.compile("(^[^:]+):?(.*)");
/** /**
* The regex group of the username. * The regex group of the username.
@@ -107,8 +107,10 @@ public class QCParser {
if (userInfo != null && !userInfo.equals("")) { if (userInfo != null && !userInfo.equals("")) {
Matcher userinfoMatcher = userinfoPattern.matcher(userInfo); Matcher userinfoMatcher = userinfoPattern.matcher(userInfo);
username = userinfoMatcher.group(USERNAME_GROUP); if (userinfoMatcher.matches()) {
password = userinfoMatcher.group(PASSWORD_GROUP); username = userinfoMatcher.group(USERNAME_GROUP);
password = userinfoMatcher.group(PASSWORD_GROUP);
}
} }