From 4c543e6f06224393886d83fb4ceda76293f8f379 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sun, 25 May 2014 18:51:35 -0700
Subject: [PATCH] Update websocket close codes to comply with RFC

---
 .../textsecuregcm/controllers/WebsocketController.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/whispersystems/textsecuregcm/controllers/WebsocketController.java b/src/main/java/org/whispersystems/textsecuregcm/controllers/WebsocketController.java
index 93134ffca..4aa3b7904 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/controllers/WebsocketController.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/controllers/WebsocketController.java
@@ -74,7 +74,7 @@ public class WebsocketController implements WebSocketListener, PubSubListener {
       if (usernames == null || usernames.length == 0 ||
           passwords == null || passwords.length == 0)
       {
-        session.close(new CloseStatus(401, "Unauthorized"));
+        session.close(new CloseStatus(4001, "Unauthorized"));
         return;
       }
 
@@ -82,7 +82,7 @@ public class WebsocketController implements WebSocketListener, PubSubListener {
       Optional<Account> account     = accountAuthenticator.authenticate(credentials);
 
       if (!account.isPresent()) {
-        session.close(new CloseStatus(401, "Unauthorized"));
+        session.close(new CloseStatus(4001, "Unauthorized"));
         return;
       }
 
@@ -96,7 +96,7 @@ public class WebsocketController implements WebSocketListener, PubSubListener {
 
       handleQueryDatabase();
     } catch (AuthenticationException e) {
-      try { session.close(500, "Server Error");} catch (IOException e1) {}
+      try { session.close(1011, "Server Error");} catch (IOException e1) {}
     } catch (IOException ioe) {
       logger.info("Abrupt session close.");
     }
@@ -112,11 +112,11 @@ public class WebsocketController implements WebSocketListener, PubSubListener {
           handleMessageAck(body);
           break;
         default:
-          close(new CloseStatus(410, "Unknown Type"));
+          close(new CloseStatus(1008, "Unknown Type"));
       }
     } catch (IOException e) {
       logger.debug("Parse", e);
-      close(new CloseStatus(410, "Badly Formatted"));
+      close(new CloseStatus(1008, "Badly Formatted"));
     }
   }