comparison mercurial/url.py @ 51830:208698117124

http: use urllib's cookie handler

Split the logic for loading the cookies based on the configuration in a
helper function and otherwise use the library implementation directly.

51829:c1ed5ee2ad82

            return self.parent.open(req)
        else:
            return None


class cookiehandler(urlreq.basehandler):
    def __init__(self, ui):
        self.cookiejar = None

        cookiefile = ui.config(b'auth', b'cookiefile')
        if not cookiefile:
            return

        cookiefile = util.expandpath(cookiefile)
        try:
            cookiejar = util.cookielib.MozillaCookieJar(
                pycompat.fsdecode(cookiefile)
            )
            cookiejar.load()
            self.cookiejar = cookiejar
        except util.cookielib.LoadError as e:
            ui.warn(
                _(
                    b'(error loading cookie file %s: %s; continuing without '
                    b'cookies)\n'
                )
                % (cookiefile, stringutil.forcebytestr(e))
            )

    def http_request(self, request):
        if self.cookiejar:
            self.cookiejar.add_cookie_header(request)

        return request

    def https_request(self, request):
        if self.cookiejar:
            self.cookiejar.add_cookie_header(request)

        return request


class readlinehandler(urlreq.basehandler):
    def http_response(self, request, response):
        class readlineresponse(response.__class__):

    handlers.extend(
        (httpbasicauthhandler(passmgr), httpdigestauthhandler(passmgr))
    )
    handlers.extend([h(ui, passmgr) for h in handlerfuncs])
    handlers.append(cookiehandler(ui))
    handlers.append(readlinehandler())
    opener = urlreq.buildopener(*handlers)

    # keepalive.py's handlers will populate these attributes if they exist.
    opener.requestscount = 0

51830:208698117124

            return self.parent.open(req)
        else:
            return None


def load_cookiejar(ui):
    cookiefile = ui.config(b'auth', b'cookiefile')
    if not cookiefile:
        return
    cookiefile = util.expandpath(cookiefile)
    try:
        cookiejar = util.cookielib.MozillaCookieJar(
            pycompat.fsdecode(cookiefile)
        )
        cookiejar.load()
        return cookiejar
    except util.cookielib.LoadError as e:
        ui.warn(
            _(
                b'(error loading cookie file %s: %s; continuing without '
                b'cookies)\n'
            )
            % (cookiefile, stringutil.forcebytestr(e))
        )


class readlinehandler(urlreq.basehandler):
    def http_response(self, request, response):
        class readlineresponse(response.__class__):

    handlers.extend(
        (httpbasicauthhandler(passmgr), httpdigestauthhandler(passmgr))
    )
    handlers.extend([h(ui, passmgr) for h in handlerfuncs])
    handlers.append(urlreq.httpcookieprocessor(cookiejar=load_cookiejar(ui)))
    handlers.append(readlinehandler())
    opener = urlreq.buildopener(*handlers)

    # keepalive.py's handlers will populate these attributes if they exist.
    opener.requestscount = 0