Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: extract pwd field more properly #1708

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix: extract pwd field more properly #1708

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7425b4b
fix: extract pwd field of query string more properly.
ahmetsari Aug 19, 2021
e312673
fix: do not send null pwd as non-null parameter.
ahmetsari Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 29 additions & 9 deletions jvb/src/main/java/org/jitsi/videobridge/websocket/ColibriWebSocketServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.jitsi.videobridge.websocket.config.*;

import java.io.*;
import java.net.URLDecoder;
import java.util.*;
import java.util.stream.*;

Expand Down Expand Up @@ -149,7 +150,7 @@ private ColibriWebSocket createWebSocket(

Endpoint endpoint = (Endpoint) abstractEndpoint;
String pwd = getPwd(request.getRequestURI().getQuery());
if (!endpoint.acceptWebSocket(pwd))
if (pwd == null || !endpoint.acceptWebSocket(pwd))
{
response.sendError(403, authFailed);
return null;
Expand All @@ -173,15 +174,34 @@ private ColibriWebSocket createWebSocket(
*/
private String getPwd(String query)
{
// TODO: this only deals with the simplest case.
if (query == null)
{
return null;
try {
Map<String, List<String>> parametersMap = splitQuery(query);
if (parametersMap.get("pwd") != null){
return parametersMap.get("pwd").get(0);
}
}catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
if (!query.startsWith("pwd="))
{
return null;
return null;
}

/**
* Converts query string to Map<String, List<String>> format. Supports multiple parameters with the same key.
* @param query query string
* @return parsed list
*/
public static Map<String, List<String>> splitQuery(String query) throws UnsupportedEncodingException {
final Map<String, List<String>> query_pairs = new LinkedHashMap<>();
final String[] pairs = query.split("&");
for (String pair : pairs) {
final int idx = pair.indexOf("=");
final String key = idx > 0 ? URLDecoder.decode(pair.substring(0, idx), "UTF-8") : pair;
if (!query_pairs.containsKey(key)) {
query_pairs.put(key, new LinkedList<>());
}
final String value = idx > 0 && pair.length() > idx + 1 ? URLDecoder.decode(pair.substring(idx + 1), "UTF-8") : null;
query_pairs.get(key).add(value);
}
return query.substring("pwd=".length());
return query_pairs;
}
}