This is an archive of the discontinued Mercurial Phabricator instance.

Differential D811

keepalive: add more context to bad status line errors
ClosedPublic

Authored by indygreg on Sep 25 2017, 5:05 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG9bd003052d55: keepalive: add more context to bad status line errors
Summary

As the TODO in the test said, the previous error message was not
very helpful. Let's improve things.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Sep 25 2017, 5:05 AM
yuja accepted this revision.Sep 26 2017, 9:09 AM
yuja added a subscriber: yuja.

Queued, thanks.

mercurial/keepalive.py
238

py3nit: we'll have to convert the translated message to unicode
because URLError is a subclass of IOError.

This revision is now accepted and ready to land.Sep 26 2017, 9:09 AM
Closed by commit rHG9bd003052d55: keepalive: add more context to bad status line errors (authored by indygreg). · Explain WhySep 26 2017, 9:45 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/keepalive.py (5 lines)
Mtests/test-http-bad-server.t (14 lines)

Diff 2086

mercurial/keepalive.py

from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import errno import errno
import hashlib import hashlib
import socket import socket
import sys import sys
import threading import threading
from .i18n import _
from . import ( from . import (
util, util,
) )
httplib = util.httplib httplib = util.httplib
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
# no (working) free connections were found. Create a new one. # no (working) free connections were found. Create a new one.
h = http_class(host) h = http_class(host)
if DEBUG: if DEBUG:
DEBUG.info("creating new connection to %s (%d)", DEBUG.info("creating new connection to %s (%d)",
host, id(h)) host, id(h))
self._cm.add(host, h, 0) self._cm.add(host, h, 0)
self._start_transaction(h, req) self._start_transaction(h, req)
r = h.getresponse() r = h.getresponse()
# The string form of BadStatusLine is the status line. Add some context
# to make the error message slightly more useful.
except httplib.BadStatusLine as err:
raise urlerr.urlerror(_('bad HTTP status line: %s') % err.line)
yujaUnsubmitted
Not Done

py3nit: we'll have to convert the translated message to unicode
because URLError is a subclass of IOError.

yuja: py3nit: we'll have to convert the translated message to unicode because URLError is a subclass…
except (socket.error, httplib.HTTPException) as err: except (socket.error, httplib.HTTPException) as err:
raise urlerr.urlerror(err) raise urlerr.urlerror(err)
# if not a persistent connection, don't try to reuse it # if not a persistent connection, don't try to reuse it
if r.will_close: if r.will_close:
self._cm.remove(h) self._cm.remove(h)
if DEBUG: if DEBUG:

tests/test-http-bad-server.t

$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
Failure to read all bytes in initial HTTP request should yield connection related error message Failure to read all bytes in initial HTTP request should yield connection related error message
$ hg --config badserver.closeafterrecvbytes=1 serve -p $HGPORT -d --pid-file=hg.pid -E error.log $ hg --config badserver.closeafterrecvbytes=1 serve -p $HGPORT -d --pid-file=hg.pid -E error.log
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
TODO this error message is not very good
$ hg clone http://localhost:$HGPORT/ clone $ hg clone http://localhost:$HGPORT/ clone
abort: error: '' abort: error: bad HTTP status line: ''
[255] [255]
$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
$ cat error.log $ cat error.log
readline(1 from 65537) -> (1) G readline(1 from 65537) -> (1) G
read limit reached; closing socket read limit reached; closing socket
$ rm -f error.log $ rm -f error.log
Same failure, but server reads full HTTP request line Same failure, but server reads full HTTP request line
$ hg --config badserver.closeafterrecvbytes=40 serve -p $HGPORT -d --pid-file=hg.pid -E error.log $ hg --config badserver.closeafterrecvbytes=40 serve -p $HGPORT -d --pid-file=hg.pid -E error.log
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT/ clone $ hg clone http://localhost:$HGPORT/ clone
abort: error: '' abort: error: bad HTTP status line: ''
[255] [255]
$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
$ cat error.log $ cat error.log
readline(40 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n readline(40 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n
readline(7 from -1) -> (7) Accept- readline(7 from -1) -> (7) Accept-
read limit reached; closing socket read limit reached; closing socket
$ rm -f error.log $ rm -f error.log
Failure on subsequent HTTP request on the same socket (cmd?batch) Failure on subsequent HTTP request on the same socket (cmd?batch)
$ hg --config badserver.closeafterrecvbytes=210 serve -p $HGPORT -d --pid-file=hg.pid -E error.log $ hg --config badserver.closeafterrecvbytes=210 serve -p $HGPORT -d --pid-file=hg.pid -E error.log
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT/ clone $ hg clone http://localhost:$HGPORT/ clone
abort: error: '' abort: error: bad HTTP status line: ''
[255] [255]
$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
$ cat error.log $ cat error.log
readline(210 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n readline(210 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n
readline(177 from -1) -> (27) Accept-Encoding: identity\r\n readline(177 from -1) -> (27) Accept-Encoding: identity\r\n
readline(150 from -1) -> (35) accept: application/mercurial-0.1\r\n readline(150 from -1) -> (35) accept: application/mercurial-0.1\r\n
$ rm -f error.log $ rm -f error.log
Failure to read getbundle HTTP request Failure to read getbundle HTTP request
$ hg --config badserver.closeafterrecvbytes=292 serve -p $HGPORT -d --pid-file=hg.pid -E error.log $ hg --config badserver.closeafterrecvbytes=292 serve -p $HGPORT -d --pid-file=hg.pid -E error.log
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT/ clone $ hg clone http://localhost:$HGPORT/ clone
requesting all changes requesting all changes
abort: error: '' abort: error: bad HTTP status line: ''
[255] [255]
$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
$ cat error.log $ cat error.log
readline(292 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n readline(292 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n
readline(259 from -1) -> (27) Accept-Encoding: identity\r\n readline(259 from -1) -> (27) Accept-Encoding: identity\r\n
readline(232 from -1) -> (35) accept: application/mercurial-0.1\r\n readline(232 from -1) -> (35) accept: application/mercurial-0.1\r\n
$ rm -f error.log $ rm -f error.log
Now do a variation using POST to send arguments Now do a variation using POST to send arguments
$ hg --config experimental.httppostargs=true --config badserver.closeafterrecvbytes=315 serve -p $HGPORT -d --pid-file=hg.pid -E error.log $ hg --config experimental.httppostargs=true --config badserver.closeafterrecvbytes=315 serve -p $HGPORT -d --pid-file=hg.pid -E error.log
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT/ clone $ hg clone http://localhost:$HGPORT/ clone
abort: error: '' abort: error: bad HTTP status line: ''
[255] [255]
$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
$ cat error.log $ cat error.log
readline(315 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n readline(315 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n
readline(282 from -1) -> (27) Accept-Encoding: identity\r\n readline(282 from -1) -> (27) Accept-Encoding: identity\r\n
readline(255 from -1) -> (35) accept: application/mercurial-0.1\r\n readline(255 from -1) -> (35) accept: application/mercurial-0.1\r\n
Now move on to partial server responses Now move on to partial server responses
Server sends a single character from the HTTP response line Server sends a single character from the HTTP response line
$ hg --config badserver.closeaftersendbytes=1 serve -p $HGPORT -d --pid-file=hg.pid -E error.log $ hg --config badserver.closeaftersendbytes=1 serve -p $HGPORT -d --pid-file=hg.pid -E error.log
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT/ clone $ hg clone http://localhost:$HGPORT/ clone
abort: error: H abort: error: bad HTTP status line: H
[255] [255]
$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
$ cat error.log $ cat error.log
readline(65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n readline(65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n
readline(-1) -> (27) Accept-Encoding: identity\r\n readline(-1) -> (27) Accept-Encoding: identity\r\n
readline(-1) -> (35) accept: application/mercurial-0.1\r\n readline(-1) -> (35) accept: application/mercurial-0.1\r\n