Skip to content

add .toLowerCase() to req.get("Upgrade") and req.get("Connection") c… #4

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

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

add .toLowerCase() to req.get("Upgrade") and req.get("Connection") c… #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3a9557
add .toLowerCase() to req.get("Upgrade") and req.get("Connection") c…
mhabou Apr 4, 2017
fa24159
Update WebSocketServerInputStream.java
mhabou Apr 5, 2017
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
18 changes: 16 additions & 2 deletions src/main/java/com/pmeade/websocket/io/WebSocketServerInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,20 @@ public static boolean checkContains(final String s1, final String s2) {
}
return s1.contains(s2);
}

/**
* Check if the first String contains() the second String and ignore case. This method
* returns false if the first string is null.
* @param s1 String to be checked if it contains
* @param s2 String to check for
* @return true, iff s1.contains(s2), otherwise false
*/
public static boolean checkContainsIgnoreCase(final String s1, final String s2) {
if (s1 == null) {
return false;
}
return s1.toLowerCase().contains(s2.toLowerCase());
}

/**
* Check if the first String startsWith() the second String. This method
Expand Down Expand Up @@ -467,8 +481,8 @@ private void shakeHands() throws IOException {
handshakeComplete = checkStartsWith(requestLine, "GET /")
&& checkContains(requestLine, "HTTP/")
&& req.get("Host") != null
&& checkContains(req.get("Upgrade"), "websocket")
&& checkContains(req.get("Connection"), "Upgrade")
&& checkContainsIgnoreCase(req.get("Upgrade"), "websocket")
&& checkContainsIgnoreCase(req.get("Connection"), "Upgrade")
&& "13".equals(req.get("Sec-WebSocket-Version"))
&& req.get("Sec-WebSocket-Key") != null;
String nonce = req.get("Sec-WebSocket-Key");
Expand Down