Configure pylint to use the pylint-django plugin, which (mostly)

understands Django's exotic metaclasses, which in turn allows us to
re-enable a number of pylint checks we had disabled.  While we were at
this, stripped out a bunch of old pylint pragmas, then added back the
subset that were really needed.  As usual with pylint, this turned up
a few real bugs along with an awful lot of noise.

svn path=/branches/tk705/; revision=6162

1 files changed, 25 insertions, 10 deletions

diff --git a/rpki/rpkidb/models.py b/rpki/rpkidb/models.py
index ab89ba7b..527b81d4 100644
--- a/rpki/rpkidb/models.py
+++ b/rpki/rpkidb/models.py
@@ -26,6 +26,9 @@ from lxml.etree import Element, SubElement, tostring as ElementToString
 
 logger = logging.getLogger(__name__)
 
+# pylint: disable=W5101
+
+
 # XXX Temporary hack to help trace call chains so we can clear some of
 # the historical clutter out of this module.
 
@@ -161,7 +164,7 @@ class XMLTemplate(object):
                 setattr(obj, k, self.element_type[k](Base64 = v))
 
 
-class XMLManager(models.Manager):       # pylint: disable=W0232
+class XMLManager(models.Manager):
     """
     Add a few methods which locate or create an object or objects
     corresponding to the handles in an XML element, as appropriate.
@@ -174,6 +177,8 @@ class XMLManager(models.Manager):       # pylint: disable=W0232
 
     debug = False
 
+    # pylint: disable=E1101
+
     def xml_get_or_create(self, xml):
         name   = self.model.xml_template.name
         action = xml.get("action")
@@ -382,6 +387,7 @@ class Tenant(models.Model):
 
     def cron_tasks(self, rpkid):
         trace_call_chain()
+        # pylint: disable=W0201
         try:
             return self._cron_tasks
         except AttributeError:
@@ -418,7 +424,7 @@ class BSC(models.Model):
     tenant = models.ForeignKey(Tenant, related_name = "bscs")
     objects = XMLManager()
 
-    class Meta:                           # pylint: disable=C1001,W0232
+    class Meta:
         unique_together = ("tenant", "bsc_handle")
 
     xml_template = XMLTemplate(
@@ -447,7 +453,7 @@ class Repository(models.Model):
     tenant = models.ForeignKey(Tenant, related_name = "repositories")
     objects = XMLManager()
 
-    class Meta:                           # pylint: disable=C1001,W0232
+    class Meta:
         unique_together = ("tenant", "repository_handle")
 
     xml_template = XMLTemplate(
@@ -542,7 +548,7 @@ class Parent(models.Model):
     repository = models.ForeignKey(Repository, related_name = "parents")
     objects = XMLManager()
 
-    class Meta:                           # pylint: disable=C1001,W0232
+    class Meta:
         unique_together = ("tenant", "parent_handle")
 
     xml_template = XMLTemplate(
@@ -668,7 +674,7 @@ class Parent(models.Model):
         """
 
         trace_call_chain()
-        yield [ca.destroy(self) for ca in self.cas()]
+        yield [ca.destroy(self) for ca in self.cas()]           # pylint: disable=E1101
         yield self.serve_revoke_forgotten(rpkid = rpkid)
         if delete_parent:
             self.delete()
@@ -806,6 +812,8 @@ class CA(models.Model):
         with the same key, etc.
         """
 
+        # pylint: disable=C0330
+
         trace_call_chain()
         logger.debug("check_for_updates()")
         sia_uri = parent.construct_sia_uri(rc)
@@ -1056,7 +1064,7 @@ class CADetail(models.Model):
     manifest_published = SundialField(null = True)
     state = EnumField(choices = ("pending", "active", "deprecated", "revoked"))
     ca_cert_uri = models.TextField(null = True)
-    ca = models.ForeignKey(CA, related_name = "ca_details")
+    ca = models.ForeignKey(CA, related_name = "ca_details") # pylint: disable=C0103
 
 
     # Like the old ca_obj class, the old ca_detail_obj class had ten
@@ -1079,6 +1087,7 @@ class CADetail(models.Model):
         Return tail (filename portion) of publication URI for this ca_detail's CRL.
         """
 
+        # pylint: disable=E1101
         return self.public_key.gSKI() + ".crl"
 
 
@@ -1088,6 +1097,7 @@ class CADetail(models.Model):
         Return publication URI for this ca_detail's manifest.
         """
 
+        # pylint: disable=E1101
         return self.ca.sia_uri + self.public_key.gSKI() + ".mft"
 
 
@@ -1179,7 +1189,7 @@ class CADetail(models.Model):
 
         - Request revocation of old keypair by parent.
 
-        - Revoke all child certs issued by the old keypair.
+        - Revoke all certificates issued by the old keypair.
 
         - Generate a final CRL, signed with the old keypair, listing all
           the revoked certs, with a next CRL time after the last cert or
@@ -1234,6 +1244,10 @@ class CADetail(models.Model):
             nextUpdate = nextUpdate.later(ghostbuster.cert.getNotAfter())
             ghostbuster.revoke(publisher = publisher)
 
+        for eecert in self.ee_certificates.all():
+            nextUpdate = nextUpdate.later(eecert.cert.getNotAfter())
+            eecert.revoke(publisher = publisher)
+
         nextUpdate += crl_interval
 
         self.generate_crl(publisher = publisher, nextUpdate = nextUpdate)
@@ -1463,8 +1477,8 @@ class CADetail(models.Model):
         if nextUpdate is None:
             nextUpdate = now + crl_interval
         if (self.latest_manifest_cert is None or
-            (self.latest_manifest_cert.getNotAfter() < nextUpdate and
-             self.latest_manifest_cert.getNotAfter() < self.latest_ca_cert.getNotAfter())):
+                (self.latest_manifest_cert.getNotAfter() < nextUpdate and
+                 self.latest_manifest_cert.getNotAfter() < self.latest_ca_cert.getNotAfter())):
             logger.debug("Generating EE certificate for %s", uri)
             self.generate_manifest_cert()
             logger.debug("Latest CA cert notAfter %s, new %s EE notAfter %s",
@@ -1616,7 +1630,7 @@ class Child(models.Model):
     bsc = models.ForeignKey(BSC, related_name = "children")
     objects = XMLManager()
 
-    class Meta:                           # pylint: disable=C1001,W0232
+    class Meta:
         unique_together = ("tenant", "child_handle")
 
     xml_template = XMLTemplate(
@@ -1861,6 +1875,7 @@ class ChildCert(models.Model):
         """
 
         trace_call_chain()
+        # pylint: disable=E1101
         ca = ca_detail.ca
         child = self.child
         old_resources = self.cert.get_3779resources()