diff --git a/linkcheck/configuration/__init__.py b/linkcheck/configuration/__init__.py index 2c159cb4..7ef00df0 100644 --- a/linkcheck/configuration/__init__.py +++ b/linkcheck/configuration/__init__.py @@ -218,7 +218,6 @@ class Configuration (dict): filtered_cfiles.append(cfile) log.debug(LOG_CHECK, "reading configuration from %s", filtered_cfiles) confparse.LCConfigParser(self).read(filtered_cfiles) - self.sanitize() def add_auth (self, user=None, password=None, pattern=None): """Add given authentication data.""" diff --git a/linkcheck/director/aggregator.py b/linkcheck/director/aggregator.py index 685fbe29..74fed09e 100644 --- a/linkcheck/director/aggregator.py +++ b/linkcheck/director/aggregator.py @@ -23,7 +23,7 @@ import requests import time import urlparse import random -from .. import log, LOG_CHECK, strformat +from .. import log, LOG_CHECK, strformat, LinkCheckerError from ..decorators import synchronized from ..cache import urlqueue from ..htmlutil import formsearch @@ -89,9 +89,10 @@ class Aggregate (object): for key, value in self.config["loginextrafields"].items(): form.data[key] = value formurl = urlparse.urljoin(url, form.url) - req = session.post(formurl, data=form.data) - self.cookies = req.cookies - print "XXX cookies", self.cookies + response = session.post(formurl, data=form.data) + self.cookies = session.cookies + if len(self.cookies) == 0: + raise LinkCheckerError("No cookies set by login URL %s" % url) @synchronized(_threads_lock) def start_threads (self):