DXR is a code search and navigation tool aimed at making sense of large projects. It supports full-text and regex searches as well as structural queries.

Mercurial (d1ed7de67f5a)

VCS Links

Line Code
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
This pywebsocket code is mostly unchanged from the source at

  svn checkout http://pywebsocket.googlecode.com/svn/trunk/ pywebsocket-read-only

The current Mozilla code is based on

  svnversion:  631  (supports RFC 6455)

--------------------------------------------------------------------------------
STEPS TO UPDATE MOZILLA TO NEWER PYWEBSOCKET VERSION
--------------------------------------------------------------------------------
- Get new pywebsocket checkout from googlecode (into, for instance, 'src')

  svn checkout http://pywebsocket.googlecode.com/svn/trunk/ pywebsocket-read-only

- Export a version w/o SVN files:

    svn export src dist

- rsync new version into our tree, deleting files that aren't needed any more
  (NOTE: this will blow away this file!  hg revert it or keep a copy.)

    rsync -rv --delete dist/ $MOZ_SRC/testing/mochitest/pywebsocket

- Get rid of examples/test directory and some cruft:

    rm -rf example test setup.py MANIFEST.in

- Manually move the 'standalone.py' file from the mmod_pywebsocket/ directory to
  the parent directory (not sure why we moved it: probably no reason)

- hg add/rm appropriate files, and add/remove them from _MOD_PYWEBSOCKET_FILES
  and/or _HANDSHAKE_FILES in testing/mochitest/Makefile.am

- We need to apply the patch to hybi.py that makes HSTS work: (attached at end
  of this README)

- Test and make sure the code works:

    make mochitest-plain TEST_PATH=content/base/test/test_websocket.html

- If this doesn't take a look at the pywebsocket server log,
  $OBJDIR/_tests/testing/mochitest/websock.log

- Upgrade the svnversion number at top of this file to whatever version we're
  now based off of.

--------------------------------------------------------------------------------
PATCH TO hybi.py for HSTS support:


diff --git a/testing/mochitest/pywebsocket/mod_pywebsocket/handshake/hybi.py b/testing/mochitest/pywebsocket/mod_pywebsocket/handshake/hybi.py
--- a/testing/mochitest/pywebsocket/mod_pywebsocket/handshake/hybi.py
+++ b/testing/mochitest/pywebsocket/mod_pywebsocket/handshake/hybi.py
@@ -227,16 +227,19 @@ class Handshaker(object):
 
     def _check_version(self):
         unused_value = validate_mandatory_header(
             self._request, common.SEC_WEBSOCKET_VERSION_HEADER,
             str(common.VERSION_HYBI_LATEST), fail_status=426)
 
     def _set_protocol(self):
         self._request.ws_protocol = None
+        # MOZILLA
+        self._request.sts = None
+        # /MOZILLA
 
         protocol_header = self._request.headers_in.get(
             common.SEC_WEBSOCKET_PROTOCOL_HEADER)
 
         if not protocol_header:
             self._request.ws_requested_protocols = None
             return
 
@@ -311,16 +314,21 @@ class Handshaker(object):
             response.append(format_header(
                 common.SEC_WEBSOCKET_PROTOCOL_HEADER,
                 self._request.ws_protocol))
         if (self._request.ws_extensions is not None and
             len(self._request.ws_extensions) != 0):
             response.append(format_header(
                 common.SEC_WEBSOCKET_EXTENSIONS_HEADER,
                 format_extensions(self._request.ws_extensions)))
+        # MOZILLA: Add HSTS header if requested to
+        if self._request.sts is not None:
+            response.append(format_header("Strict-Transport-Security",
+                                          self._request.sts))
+        # /MOZILLA
         response.append('\r\n')
 
         raw_response = ''.join(response)
         self._logger.debug('Opening handshake response: %r', raw_response)
         self._request.connection.write(raw_response)