diff options
Diffstat (limited to 'chromium/third_party/pywebsocket3')
4 files changed, 255 insertions, 253 deletions
diff --git a/chromium/third_party/pywebsocket3/src/example/echo_client.py b/chromium/third_party/pywebsocket3/src/example/echo_client.py index e4459a19bc6..dafda059b11 100755 --- a/chromium/third_party/pywebsocket3/src/example/echo_client.py +++ b/chromium/third_party/pywebsocket3/src/example/echo_client.py @@ -51,7 +51,7 @@ import base64 import codecs from hashlib import sha1 import logging -from optparse import OptionParser +import argparse import os import random import re @@ -602,76 +602,78 @@ def main(): if six.PY2: sys.stdout = codecs.getwriter('utf-8')(sys.stdout) - parser = OptionParser() + parser = argparse.ArgumentParser() # We accept --command_line_flag style flags which is the same as Google # gflags in addition to common --command-line-flag style flags. - parser.add_option('-s', - '--server-host', - '--server_host', - dest='server_host', - type='string', - default='localhost', - help='server host') - parser.add_option('-p', - '--server-port', - '--server_port', - dest='server_port', - type='int', - default=_UNDEFINED_PORT, - help='server port') - parser.add_option('-o', - '--origin', - dest='origin', - type='string', - default=None, - help='origin') - parser.add_option('-r', - '--resource', - dest='resource', - type='string', - default='/echo', - help='resource path') - parser.add_option('-m', - '--message', - dest='message', - type='string', - help=('comma-separated messages to send. ' - '%s will force close the connection from server.' % - _GOODBYE_MESSAGE)) - parser.add_option('-q', - '--quiet', - dest='verbose', - action='store_false', - default=True, - help='suppress messages') - parser.add_option('-t', - '--tls', - dest='use_tls', - action='store_true', - default=False, - help='use TLS (wss://).') - parser.add_option('-k', - '--socket-timeout', - '--socket_timeout', - dest='socket_timeout', - type='int', - default=_TIMEOUT_SEC, - help='Timeout(sec) for sockets') - parser.add_option('--use-permessage-deflate', - '--use_permessage_deflate', - dest='use_permessage_deflate', - action='store_true', - default=False, - help='Use the permessage-deflate extension.') - parser.add_option('--log-level', - '--log_level', - type='choice', - dest='log_level', - default='warn', - choices=['debug', 'info', 'warn', 'error', 'critical'], - help='Log level.') - - (options, unused_args) = parser.parse_args() + parser.add_argument('-s', + '--server-host', + '--server_host', + dest='server_host', + type=six.text_type, + default='localhost', + help='server host') + parser.add_argument('-p', + '--server-port', + '--server_port', + dest='server_port', + type=int, + default=_UNDEFINED_PORT, + help='server port') + parser.add_argument('-o', + '--origin', + dest='origin', + type=six.text_type, + default=None, + help='origin') + parser.add_argument('-r', + '--resource', + dest='resource', + type=six.text_type, + default='/echo', + help='resource path') + parser.add_argument( + '-m', + '--message', + dest='message', + type=six.text_type, + default=u'Hello,\u65e5\u672c', + help=('comma-separated messages to send. ' + '%s will force close the connection from server.' % + _GOODBYE_MESSAGE)) + parser.add_argument('-q', + '--quiet', + dest='verbose', + action='store_false', + default=True, + help='suppress messages') + parser.add_argument('-t', + '--tls', + dest='use_tls', + action='store_true', + default=False, + help='use TLS (wss://).') + parser.add_argument('-k', + '--socket-timeout', + '--socket_timeout', + dest='socket_timeout', + type=int, + default=_TIMEOUT_SEC, + help='Timeout(sec) for sockets') + parser.add_argument('--use-permessage-deflate', + '--use_permessage_deflate', + dest='use_permessage_deflate', + action='store_true', + default=False, + help='Use the permessage-deflate extension.') + parser.add_argument('--log-level', + '--log_level', + type=six.text_type, + dest='log_level', + default='warn', + choices=['debug', 'info', 'warn', 'error', 'critical'], + help='Log level.') + + options = parser.parse_args() logging.basicConfig(level=logging.getLevelName(options.log_level.upper())) @@ -682,11 +684,6 @@ def main(): else: options.server_port = common.DEFAULT_WEB_SOCKET_PORT - # optparse doesn't seem to handle non-ascii default values. - # Set default message here. - if not options.message: - options.message = u'Hello,\u65e5\u672c' # "Japan" in Japanese - EchoClient(options).run() diff --git a/chromium/third_party/pywebsocket3/src/mod_pywebsocket/request_handler.py b/chromium/third_party/pywebsocket3/src/mod_pywebsocket/request_handler.py index e038d9f43ac..5e9c875dc7d 100644 --- a/chromium/third_party/pywebsocket3/src/mod_pywebsocket/request_handler.py +++ b/chromium/third_party/pywebsocket3/src/mod_pywebsocket/request_handler.py @@ -208,7 +208,7 @@ class WebSocketRequestHandler(CGIHTTPServer.CGIHTTPRequestHandler): return False if self._options.use_basic_auth: - auth = self.headers.getheader('Authorization') + auth = self.headers.get('Authorization') if auth != self._options.basic_auth_credential: self.send_response(401) self.send_header('WWW-Authenticate', diff --git a/chromium/third_party/pywebsocket3/src/mod_pywebsocket/standalone.py b/chromium/third_party/pywebsocket3/src/mod_pywebsocket/standalone.py index 1042c496c58..b075d989f05 100755 --- a/chromium/third_party/pywebsocket3/src/mod_pywebsocket/standalone.py +++ b/chromium/third_party/pywebsocket3/src/mod_pywebsocket/standalone.py @@ -157,8 +157,9 @@ from __future__ import absolute_import from six.moves import configparser import base64 import logging -import optparse +import argparse import os +import six import sys import traceback @@ -174,188 +175,192 @@ _DEFAULT_REQUEST_QUEUE_SIZE = 128 def _build_option_parser(): - parser = optparse.OptionParser() - - parser.add_option('--config', - dest='config_file', - type='string', - default=None, - help=('Path to configuration file. See the file comment ' - 'at the top of this file for the configuration ' - 'file format')) - parser.add_option('-H', - '--server-host', - '--server_host', - dest='server_host', - default='', - help='server hostname to listen to') - parser.add_option('-V', - '--validation-host', - '--validation_host', - dest='validation_host', - default=None, - help='server hostname to validate in absolute path.') - parser.add_option('-p', - '--port', - dest='port', - type='int', - default=common.DEFAULT_WEB_SOCKET_PORT, - help='port to listen to') - parser.add_option('-P', - '--validation-port', - '--validation_port', - dest='validation_port', - type='int', - default=None, - help='server port to validate in absolute path.') - parser.add_option('-w', - '--websock-handlers', - '--websock_handlers', - dest='websock_handlers', - default='.', - help=('The root directory of WebSocket handler files. ' - 'If the path is relative, --document-root is used ' - 'as the base.')) - parser.add_option('-m', - '--websock-handlers-map-file', - '--websock_handlers_map_file', - dest='websock_handlers_map_file', - default=None, - help=('WebSocket handlers map file. ' - 'Each line consists of alias_resource_path and ' - 'existing_resource_path, separated by spaces.')) - parser.add_option('-s', - '--scan-dir', - '--scan_dir', - dest='scan_dir', - default=None, - help=('Must be a directory under --websock-handlers. ' - 'Only handlers under this directory are scanned ' - 'and registered to the server. ' - 'Useful for saving scan time when the handler ' - 'root directory contains lots of files that are ' - 'not handler file or are handler files but you ' - 'don\'t want them to be registered. ')) - parser.add_option('--allow-handlers-outside-root-dir', - '--allow_handlers_outside_root_dir', - dest='allow_handlers_outside_root_dir', - action='store_true', - default=False, - help=('Scans WebSocket handlers even if their canonical ' - 'path is not under --websock-handlers.')) - parser.add_option('-d', - '--document-root', - '--document_root', - dest='document_root', - default='.', - help='Document root directory.') - parser.add_option('-x', - '--cgi-paths', - '--cgi_paths', - dest='cgi_paths', - default=None, - help=('CGI paths relative to document_root.' - 'Comma-separated. (e.g -x /cgi,/htbin) ' - 'Files under document_root/cgi_path are handled ' - 'as CGI programs. Must be executable.')) - parser.add_option('-t', - '--tls', - dest='use_tls', - action='store_true', - default=False, - help='use TLS (wss://)') - parser.add_option('-k', - '--private-key', - '--private_key', - dest='private_key', - default='', - help='TLS private key file.') - parser.add_option('-c', - '--certificate', - dest='certificate', - default='', - help='TLS certificate file.') - parser.add_option('--tls-client-auth', - dest='tls_client_auth', - action='store_true', - default=False, - help='Requests TLS client auth on every connection.') - parser.add_option('--tls-client-cert-optional', - dest='tls_client_cert_optional', - action='store_true', - default=False, - help=('Makes client certificate optional even though ' - 'TLS client auth is enabled.')) - parser.add_option('--tls-client-ca', - dest='tls_client_ca', - default='', - help=('Specifies a pem file which contains a set of ' - 'concatenated CA certificates which are used to ' - 'validate certificates passed from clients')) - parser.add_option('--basic-auth', - dest='use_basic_auth', - action='store_true', - default=False, - help='Requires Basic authentication.') - parser.add_option('--basic-auth-credential', - dest='basic_auth_credential', - default='test:test', - help='Specifies the credential of basic authentication ' - 'by username:password pair (e.g. test:test).') - parser.add_option('-l', - '--log-file', - '--log_file', - dest='log_file', - default='', - help='Log file.') + parser = argparse.ArgumentParser() + + parser.add_argument( + '--config', + dest='config_file', + type=six.text_type, + default=None, + help=('Path to configuration file. See the file comment ' + 'at the top of this file for the configuration ' + 'file format')) + parser.add_argument('-H', + '--server-host', + '--server_host', + dest='server_host', + default='', + help='server hostname to listen to') + parser.add_argument('-V', + '--validation-host', + '--validation_host', + dest='validation_host', + default=None, + help='server hostname to validate in absolute path.') + parser.add_argument('-p', + '--port', + dest='port', + type=int, + default=common.DEFAULT_WEB_SOCKET_PORT, + help='port to listen to') + parser.add_argument('-P', + '--validation-port', + '--validation_port', + dest='validation_port', + type=int, + default=None, + help='server port to validate in absolute path.') + parser.add_argument( + '-w', + '--websock-handlers', + '--websock_handlers', + dest='websock_handlers', + default='.', + help=('The root directory of WebSocket handler files. ' + 'If the path is relative, --document-root is used ' + 'as the base.')) + parser.add_argument('-m', + '--websock-handlers-map-file', + '--websock_handlers_map_file', + dest='websock_handlers_map_file', + default=None, + help=('WebSocket handlers map file. ' + 'Each line consists of alias_resource_path and ' + 'existing_resource_path, separated by spaces.')) + parser.add_argument('-s', + '--scan-dir', + '--scan_dir', + dest='scan_dir', + default=None, + help=('Must be a directory under --websock-handlers. ' + 'Only handlers under this directory are scanned ' + 'and registered to the server. ' + 'Useful for saving scan time when the handler ' + 'root directory contains lots of files that are ' + 'not handler file or are handler files but you ' + 'don\'t want them to be registered. ')) + parser.add_argument( + '--allow-handlers-outside-root-dir', + '--allow_handlers_outside_root_dir', + dest='allow_handlers_outside_root_dir', + action='store_true', + default=False, + help=('Scans WebSocket handlers even if their canonical ' + 'path is not under --websock-handlers.')) + parser.add_argument('-d', + '--document-root', + '--document_root', + dest='document_root', + default='.', + help='Document root directory.') + parser.add_argument('-x', + '--cgi-paths', + '--cgi_paths', + dest='cgi_paths', + default=None, + help=('CGI paths relative to document_root.' + 'Comma-separated. (e.g -x /cgi,/htbin) ' + 'Files under document_root/cgi_path are handled ' + 'as CGI programs. Must be executable.')) + parser.add_argument('-t', + '--tls', + dest='use_tls', + action='store_true', + default=False, + help='use TLS (wss://)') + parser.add_argument('-k', + '--private-key', + '--private_key', + dest='private_key', + default='', + help='TLS private key file.') + parser.add_argument('-c', + '--certificate', + dest='certificate', + default='', + help='TLS certificate file.') + parser.add_argument('--tls-client-auth', + dest='tls_client_auth', + action='store_true', + default=False, + help='Requests TLS client auth on every connection.') + parser.add_argument('--tls-client-cert-optional', + dest='tls_client_cert_optional', + action='store_true', + default=False, + help=('Makes client certificate optional even though ' + 'TLS client auth is enabled.')) + parser.add_argument('--tls-client-ca', + dest='tls_client_ca', + default='', + help=('Specifies a pem file which contains a set of ' + 'concatenated CA certificates which are used to ' + 'validate certificates passed from clients')) + parser.add_argument('--basic-auth', + dest='use_basic_auth', + action='store_true', + default=False, + help='Requires Basic authentication.') + parser.add_argument( + '--basic-auth-credential', + dest='basic_auth_credential', + default='test:test', + help='Specifies the credential of basic authentication ' + 'by username:password pair (e.g. test:test).') + parser.add_argument('-l', + '--log-file', + '--log_file', + dest='log_file', + default='', + help='Log file.') # Custom log level: # - FINE: Prints status of each frame processing step - parser.add_option('--log-level', - '--log_level', - type='choice', - dest='log_level', - default='warn', - choices=[ - 'fine', 'debug', 'info', 'warning', 'warn', 'error', - 'critical' - ], - help='Log level.') - parser.add_option( + parser.add_argument('--log-level', + '--log_level', + type=six.text_type, + dest='log_level', + default='warn', + choices=[ + 'fine', 'debug', 'info', 'warning', 'warn', + 'error', 'critical' + ], + help='Log level.') + parser.add_argument( '--deflate-log-level', '--deflate_log_level', - type='choice', + type=six.text_type, dest='deflate_log_level', default='warn', choices=['debug', 'info', 'warning', 'warn', 'error', 'critical'], help='Log level for _Deflater and _Inflater.') - parser.add_option('--thread-monitor-interval-in-sec', - '--thread_monitor_interval_in_sec', - dest='thread_monitor_interval_in_sec', - type='int', - default=-1, - help=('If positive integer is specified, run a thread ' - 'monitor to show the status of server threads ' - 'periodically in the specified inteval in ' - 'second. If non-positive integer is specified, ' - 'disable the thread monitor.')) - parser.add_option('--log-max', - '--log_max', - dest='log_max', - type='int', - default=_DEFAULT_LOG_MAX_BYTES, - help='Log maximum bytes') - parser.add_option('--log-count', - '--log_count', - dest='log_count', - type='int', - default=_DEFAULT_LOG_BACKUP_COUNT, - help='Log backup count') - parser.add_option('-q', - '--queue', - dest='request_queue_size', - type='int', - default=_DEFAULT_REQUEST_QUEUE_SIZE, - help='request queue size') + parser.add_argument('--thread-monitor-interval-in-sec', + '--thread_monitor_interval_in_sec', + dest='thread_monitor_interval_in_sec', + type=int, + default=-1, + help=('If positive integer is specified, run a thread ' + 'monitor to show the status of server threads ' + 'periodically in the specified inteval in ' + 'second. If non-positive integer is specified, ' + 'disable the thread monitor.')) + parser.add_argument('--log-max', + '--log_max', + dest='log_max', + type=int, + default=_DEFAULT_LOG_MAX_BYTES, + help='Log maximum bytes') + parser.add_argument('--log-count', + '--log_count', + dest='log_count', + type=int, + default=_DEFAULT_LOG_BACKUP_COUNT, + help='Log backup count') + parser.add_argument('-q', + '--queue', + dest='request_queue_size', + type=int, + default=_DEFAULT_REQUEST_QUEUE_SIZE, + help='request queue size') return parser @@ -364,7 +369,7 @@ def _parse_args_and_config(args): parser = _build_option_parser() # First, parse options without configuration file. - temporary_options, temporary_args = parser.parse_args(args=args) + temporary_options, temporary_args = parser.parse_known_args(args=args) if temporary_args: logging.critical('Unrecognized positional arguments: %r', temporary_args) @@ -390,7 +395,7 @@ def _parse_args_and_config(args): args = args_from_config else: args = args_from_config + args - return parser.parse_args(args=args) + return parser.parse_known_args(args=args) else: return temporary_options, temporary_args diff --git a/chromium/third_party/pywebsocket3/src/mod_pywebsocket/websocket_server.py b/chromium/third_party/pywebsocket3/src/mod_pywebsocket/websocket_server.py index aac7bb2cddf..df8cd393c7e 100644 --- a/chromium/third_party/pywebsocket3/src/mod_pywebsocket/websocket_server.py +++ b/chromium/third_party/pywebsocket3/src/mod_pywebsocket/websocket_server.py @@ -1,4 +1,4 @@ -# Copyright 202, Google Inc. +# Copyright 2020, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without |