"Any programmer who fails to comply with the standard naming, formatting,

or commenting conventions should be shot.  If it so happens that it is
inconvenient to shoot him, then he is to be politely requested to recode
his program in adherence to the above standard."
		-- Michael Spier, Digital Equipment Corporation

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

1 files changed, 243 insertions, 243 deletions

diff --git a/rpki/old_irdbd.py b/rpki/old_irdbd.py
index 9294ee84..fca1f1d9 100644
--- a/rpki/old_irdbd.py
+++ b/rpki/old_irdbd.py
@@ -46,270 +46,270 @@ logger = logging.getLogger(__name__)
 class main(object):
 
 
-  def handle_list_resources(self, q_pdu, r_msg):
-
-    r_pdu = rpki.left_right.list_resources_elt()
-    r_pdu.tag = q_pdu.tag
-    r_pdu.self_handle = q_pdu.self_handle
-    r_pdu.child_handle = q_pdu.child_handle
-
-    self.cur.execute(
-      """
-      SELECT registrant_id, valid_until
-      FROM registrant
-      WHERE registry_handle = %s AND registrant_handle = %s
-      """,
-      (q_pdu.self_handle, q_pdu.child_handle))
-
-    if self.cur.rowcount != 1:
-      raise rpki.exceptions.NotInDatabase(
-        "This query should have produced a single exact match, something's messed up"
-        " (rowcount = %d, self_handle = %s, child_handle = %s)"
-        % (self.cur.rowcount, q_pdu.self_handle, q_pdu.child_handle))
-
-    registrant_id, valid_until = self.cur.fetchone()
-
-    r_pdu.valid_until = valid_until.strftime("%Y-%m-%dT%H:%M:%SZ")
-
-    r_pdu.asn  = rpki.resource_set.resource_set_as.from_sql(
-      self.cur,
-      """
-      SELECT start_as, end_as
-      FROM registrant_asn
-      WHERE registrant_id = %s
-      """,
-      (registrant_id,))
-
-    r_pdu.ipv4 = rpki.resource_set.resource_set_ipv4.from_sql(
-      self.cur,
-      """
-      SELECT start_ip, end_ip
-      FROM registrant_net
-      WHERE registrant_id = %s AND version = 4
-      """,
-      (registrant_id,))
-
-    r_pdu.ipv6 = rpki.resource_set.resource_set_ipv6.from_sql(
-      self.cur,
-      """
-      SELECT start_ip, end_ip
-      FROM registrant_net
-      WHERE registrant_id = %s AND version = 6
-      """,
-      (registrant_id,))
-
-    r_msg.append(r_pdu)
-
-
-  def handle_list_roa_requests(self, q_pdu, r_msg):
-
-    self.cur.execute(
-      "SELECT roa_request_id, asn FROM roa_request WHERE self_handle = %s",
-      (q_pdu.self_handle,))
-
-    for roa_request_id, asn in self.cur.fetchall():
-
-      r_pdu = rpki.left_right.list_roa_requests_elt()
-      r_pdu.tag = q_pdu.tag
-      r_pdu.self_handle = q_pdu.self_handle
-      r_pdu.asn = asn
-
-      r_pdu.ipv4 = rpki.resource_set.roa_prefix_set_ipv4.from_sql(
-        self.cur,
-        """
-        SELECT prefix, prefixlen, max_prefixlen
-        FROM roa_request_prefix
-        WHERE roa_request_id = %s AND version = 4
-        """,
-        (roa_request_id,))
-
-      r_pdu.ipv6 = rpki.resource_set.roa_prefix_set_ipv6.from_sql(
-        self.cur,
-        """
-        SELECT prefix, prefixlen, max_prefixlen
-        FROM roa_request_prefix
-        WHERE roa_request_id = %s AND version = 6
-        """,
-        (roa_request_id,))
-
-      r_msg.append(r_pdu)
-
-
-  def handle_list_ghostbuster_requests(self, q_pdu, r_msg):
-
-    self.cur.execute(
-      """
-      SELECT vcard
-      FROM ghostbuster_request
-      WHERE self_handle = %s AND parent_handle = %s
-      """,
-      (q_pdu.self_handle, q_pdu.parent_handle))
-
-    vcards = [result[0] for result in self.cur.fetchall()]
-
-    if not vcards:
-
-      self.cur.execute(
-        """
-        SELECT vcard
-        FROM ghostbuster_request
-        WHERE self_handle = %s AND parent_handle IS NULL
-        """,
-        (q_pdu.self_handle,))
-
-      vcards = [result[0] for result in self.cur.fetchall()]
-
-    for vcard in vcards:
-      r_pdu = rpki.left_right.list_ghostbuster_requests_elt()
-      r_pdu.tag = q_pdu.tag
-      r_pdu.self_handle = q_pdu.self_handle
-      r_pdu.parent_handle = q_pdu.parent_handle
-      r_pdu.vcard = vcard
-      r_msg.append(r_pdu)
-
-
-  def handle_list_ee_certificate_requests(self, q_pdu, r_msg):
-
-    self.cur.execute(
-      """
-      SELECT ee_certificate_id, pkcs10, gski, cn, sn, eku, valid_until
-      FROM ee_certificate
-      WHERE self_handle = %s
-      """,
-      (q_pdu.self_handle,))
-
-    for ee_certificate_id, pkcs10, gski, cn, sn, eku, valid_until in self.cur.fetchall():
-
-      r_pdu = rpki.left_right.list_ee_certificate_requests_elt()
-      r_pdu.tag = q_pdu.tag
-      r_pdu.self_handle = q_pdu.self_handle
-      r_pdu.valid_until = valid_until.strftime("%Y-%m-%dT%H:%M:%SZ")
-      r_pdu.pkcs10      = rpki.x509.PKCS10(DER = pkcs10)
-      r_pdu.gski        = gski
-      r_pdu.cn          = cn
-      r_pdu.sn          = sn
-      r_pdu.eku         = eku
-
-      r_pdu.asn = rpki.resource_set.resource_set_as.from_sql(
-        self.cur,
-        """
-        SELECT start_as, end_as
-        FROM ee_certificate_asn
-        WHERE ee_certificate_id = %s
-        """,
-        (ee_certificate_id,))
+    def handle_list_resources(self, q_pdu, r_msg):
+
+        r_pdu = rpki.left_right.list_resources_elt()
+        r_pdu.tag = q_pdu.tag
+        r_pdu.self_handle = q_pdu.self_handle
+        r_pdu.child_handle = q_pdu.child_handle
+
+        self.cur.execute(
+            """
+            SELECT registrant_id, valid_until
+            FROM registrant
+            WHERE registry_handle = %s AND registrant_handle = %s
+            """,
+            (q_pdu.self_handle, q_pdu.child_handle))
+
+        if self.cur.rowcount != 1:
+            raise rpki.exceptions.NotInDatabase(
+                "This query should have produced a single exact match, something's messed up"
+                " (rowcount = %d, self_handle = %s, child_handle = %s)"
+                % (self.cur.rowcount, q_pdu.self_handle, q_pdu.child_handle))
+
+        registrant_id, valid_until = self.cur.fetchone()
+
+        r_pdu.valid_until = valid_until.strftime("%Y-%m-%dT%H:%M:%SZ")
+
+        r_pdu.asn  = rpki.resource_set.resource_set_as.from_sql(
+            self.cur,
+            """
+            SELECT start_as, end_as
+            FROM registrant_asn
+            WHERE registrant_id = %s
+            """,
+            (registrant_id,))
+
+        r_pdu.ipv4 = rpki.resource_set.resource_set_ipv4.from_sql(
+            self.cur,
+            """
+            SELECT start_ip, end_ip
+            FROM registrant_net
+            WHERE registrant_id = %s AND version = 4
+            """,
+            (registrant_id,))
+
+        r_pdu.ipv6 = rpki.resource_set.resource_set_ipv6.from_sql(
+            self.cur,
+            """
+            SELECT start_ip, end_ip
+            FROM registrant_net
+            WHERE registrant_id = %s AND version = 6
+            """,
+            (registrant_id,))
+
+        r_msg.append(r_pdu)
+
+
+    def handle_list_roa_requests(self, q_pdu, r_msg):
+
+        self.cur.execute(
+            "SELECT roa_request_id, asn FROM roa_request WHERE self_handle = %s",
+            (q_pdu.self_handle,))
+
+        for roa_request_id, asn in self.cur.fetchall():
+
+            r_pdu = rpki.left_right.list_roa_requests_elt()
+            r_pdu.tag = q_pdu.tag
+            r_pdu.self_handle = q_pdu.self_handle
+            r_pdu.asn = asn
+
+            r_pdu.ipv4 = rpki.resource_set.roa_prefix_set_ipv4.from_sql(
+                self.cur,
+                """
+                SELECT prefix, prefixlen, max_prefixlen
+                FROM roa_request_prefix
+                WHERE roa_request_id = %s AND version = 4
+                """,
+                (roa_request_id,))
+
+            r_pdu.ipv6 = rpki.resource_set.roa_prefix_set_ipv6.from_sql(
+                self.cur,
+                """
+                SELECT prefix, prefixlen, max_prefixlen
+                FROM roa_request_prefix
+                WHERE roa_request_id = %s AND version = 6
+                """,
+                (roa_request_id,))
+
+            r_msg.append(r_pdu)
+
+
+    def handle_list_ghostbuster_requests(self, q_pdu, r_msg):
+
+        self.cur.execute(
+            """
+            SELECT vcard
+            FROM ghostbuster_request
+            WHERE self_handle = %s AND parent_handle = %s
+            """,
+            (q_pdu.self_handle, q_pdu.parent_handle))
+
+        vcards = [result[0] for result in self.cur.fetchall()]
+
+        if not vcards:
+
+            self.cur.execute(
+                """
+                SELECT vcard
+                FROM ghostbuster_request
+                WHERE self_handle = %s AND parent_handle IS NULL
+                """,
+                (q_pdu.self_handle,))
+
+            vcards = [result[0] for result in self.cur.fetchall()]
+
+        for vcard in vcards:
+            r_pdu = rpki.left_right.list_ghostbuster_requests_elt()
+            r_pdu.tag = q_pdu.tag
+            r_pdu.self_handle = q_pdu.self_handle
+            r_pdu.parent_handle = q_pdu.parent_handle
+            r_pdu.vcard = vcard
+            r_msg.append(r_pdu)
+
+
+    def handle_list_ee_certificate_requests(self, q_pdu, r_msg):
+
+        self.cur.execute(
+            """
+            SELECT ee_certificate_id, pkcs10, gski, cn, sn, eku, valid_until
+            FROM ee_certificate
+            WHERE self_handle = %s
+            """,
+            (q_pdu.self_handle,))
+
+        for ee_certificate_id, pkcs10, gski, cn, sn, eku, valid_until in self.cur.fetchall():
+
+            r_pdu = rpki.left_right.list_ee_certificate_requests_elt()
+            r_pdu.tag = q_pdu.tag
+            r_pdu.self_handle = q_pdu.self_handle
+            r_pdu.valid_until = valid_until.strftime("%Y-%m-%dT%H:%M:%SZ")
+            r_pdu.pkcs10      = rpki.x509.PKCS10(DER = pkcs10)
+            r_pdu.gski        = gski
+            r_pdu.cn          = cn
+            r_pdu.sn          = sn
+            r_pdu.eku         = eku
+
+            r_pdu.asn = rpki.resource_set.resource_set_as.from_sql(
+                self.cur,
+                """
+                SELECT start_as, end_as
+                FROM ee_certificate_asn
+                WHERE ee_certificate_id = %s
+                """,
+                (ee_certificate_id,))
+
+            r_pdu.ipv4 = rpki.resource_set.resource_set_ipv4.from_sql(
+                self.cur,
+                """
+                SELECT start_ip, end_ip
+                FROM ee_certificate_net
+                WHERE ee_certificate_id = %s AND version = 4
+                """,
+                (ee_certificate_id,))
+
+            r_pdu.ipv6 = rpki.resource_set.resource_set_ipv6.from_sql(
+                self.cur,
+                """
+                SELECT start_ip, end_ip
+                FROM ee_certificate_net
+                WHERE ee_certificate_id = %s AND version = 6
+                """,
+                (ee_certificate_id,))
+
+            r_msg.append(r_pdu)
+
+
+    handle_dispatch = {
+      rpki.left_right.list_resources_elt               : handle_list_resources,
+      rpki.left_right.list_roa_requests_elt            : handle_list_roa_requests,
+      rpki.left_right.list_ghostbuster_requests_elt    : handle_list_ghostbuster_requests,
+      rpki.left_right.list_ee_certificate_requests_elt : handle_list_ee_certificate_requests }
+
+    def handler(self, request, q_der):
+        try:
+
+            self.db.ping(True)
+
+            r_msg = rpki.left_right.msg.reply()
 
-      r_pdu.ipv4 = rpki.resource_set.resource_set_ipv4.from_sql(
-        self.cur,
-        """
-        SELECT start_ip, end_ip
-        FROM ee_certificate_net
-        WHERE ee_certificate_id = %s AND version = 4
-        """,
-        (ee_certificate_id,))
-
-      r_pdu.ipv6 = rpki.resource_set.resource_set_ipv6.from_sql(
-        self.cur,
-        """
-        SELECT start_ip, end_ip
-        FROM ee_certificate_net
-        WHERE ee_certificate_id = %s AND version = 6
-        """,
-        (ee_certificate_id,))
-
-      r_msg.append(r_pdu)
-
-
-  handle_dispatch = {
-    rpki.left_right.list_resources_elt               : handle_list_resources,
-    rpki.left_right.list_roa_requests_elt            : handle_list_roa_requests,
-    rpki.left_right.list_ghostbuster_requests_elt    : handle_list_ghostbuster_requests,
-    rpki.left_right.list_ee_certificate_requests_elt : handle_list_ee_certificate_requests }
-
-  def handler(self, request, q_der):
-    try:
-
-      self.db.ping(True)
+            try:
 
-      r_msg = rpki.left_right.msg.reply()
+                q_msg = rpki.left_right.cms_msg_saxify(DER = q_der).unwrap((self.bpki_ta, self.rpkid_cert))
 
-      try:
+                if not isinstance(q_msg, rpki.left_right.msg) or not q_msg.is_query():
+                    raise rpki.exceptions.BadQuery("Unexpected %r PDU" % q_msg)
 
-        q_msg = rpki.left_right.cms_msg_saxify(DER = q_der).unwrap((self.bpki_ta, self.rpkid_cert))
-
-        if not isinstance(q_msg, rpki.left_right.msg) or not q_msg.is_query():
-          raise rpki.exceptions.BadQuery("Unexpected %r PDU" % q_msg)
-
-        for q_pdu in q_msg:
+                for q_pdu in q_msg:
 
-          try:
+                    try:
 
-            try:
-              h = self.handle_dispatch[type(q_pdu)]
-            except KeyError:
-              raise rpki.exceptions.BadQuery("Unexpected %r PDU" % q_pdu)
-            else:
-              h(self, q_pdu, r_msg)
+                        try:
+                            h = self.handle_dispatch[type(q_pdu)]
+                        except KeyError:
+                            raise rpki.exceptions.BadQuery("Unexpected %r PDU" % q_pdu)
+                        else:
+                            h(self, q_pdu, r_msg)
 
-          except Exception, e:
-            logger.exception("Exception serving PDU %r", q_pdu)
-            r_msg.append(rpki.left_right.report_error_elt.from_exception(e, q_pdu.self_handle, q_pdu.tag))
+                    except Exception, e:
+                        logger.exception("Exception serving PDU %r", q_pdu)
+                        r_msg.append(rpki.left_right.report_error_elt.from_exception(e, q_pdu.self_handle, q_pdu.tag))
 
-      except Exception, e:
-        logger.exception("Exception decoding query")
-        r_msg.append(rpki.left_right.report_error_elt.from_exception(e))
+            except Exception, e:
+                logger.exception("Exception decoding query")
+                r_msg.append(rpki.left_right.report_error_elt.from_exception(e))
 
-      request.send_cms_response(rpki.left_right.cms_msg_saxify().wrap(r_msg, self.irdbd_key, self.irdbd_cert))
+            request.send_cms_response(rpki.left_right.cms_msg_saxify().wrap(r_msg, self.irdbd_key, self.irdbd_cert))
 
-    except Exception, e:
-      logger.exception("Unhandled exception, returning HTTP failure")
-      request.send_error(500, "Unhandled exception %s: %s" % (e.__class__.__name__, e))
+        except Exception, e:
+            logger.exception("Unhandled exception, returning HTTP failure")
+            request.send_error(500, "Unhandled exception %s: %s" % (e.__class__.__name__, e))
 
 
-  def __init__(self):
+    def __init__(self):
 
-    os.environ["TZ"] = "UTC"
-    time.tzset()
+        os.environ["TZ"] = "UTC"
+        time.tzset()
 
-    parser = argparse.ArgumentParser(description = __doc__)
-    parser.add_argument("-c", "--config",
-                        help = "override default location of configuration file")
-    parser.add_argument("-f", "--foreground", action = "store_true",
-                        help = "do not daemonize (ignored, old_irdbd never daemonizes)")
-    rpki.log.argparse_setup(parser)
-    args = parser.parse_args()
+        parser = argparse.ArgumentParser(description = __doc__)
+        parser.add_argument("-c", "--config",
+                            help = "override default location of configuration file")
+        parser.add_argument("-f", "--foreground", action = "store_true",
+                            help = "do not daemonize (ignored, old_irdbd never daemonizes)")
+        rpki.log.argparse_setup(parser)
+        args = parser.parse_args()
 
-    rpki.log.init("irdbd", args)
+        rpki.log.init("irdbd", args)
 
-    self.cfg = rpki.config.parser(set_filename = args.config, section = "irdbd")
+        self.cfg = rpki.config.parser(set_filename = args.config, section = "irdbd")
 
-    startup_msg = self.cfg.get("startup-message", "")
-    if startup_msg:
-      logger.info(startup_msg)
+        startup_msg = self.cfg.get("startup-message", "")
+        if startup_msg:
+            logger.info(startup_msg)
 
-    self.cfg.set_global_flags()
+        self.cfg.set_global_flags()
 
-    self.db = MySQLdb.connect(user   = self.cfg.get("sql-username"),
-                              db     = self.cfg.get("sql-database"),
-                              passwd = self.cfg.get("sql-password"))
+        self.db = MySQLdb.connect(user   = self.cfg.get("sql-username"),
+                                  db     = self.cfg.get("sql-database"),
+                                  passwd = self.cfg.get("sql-password"))
 
-    self.cur = self.db.cursor()
-    self.db.autocommit(True)
+        self.cur = self.db.cursor()
+        self.db.autocommit(True)
 
-    self.bpki_ta         = rpki.x509.X509(Auto_update = self.cfg.get("bpki-ta"))
-    self.rpkid_cert      = rpki.x509.X509(Auto_update = self.cfg.get("rpkid-cert"))
-    self.irdbd_cert      = rpki.x509.X509(Auto_update = self.cfg.get("irdbd-cert"))
-    self.irdbd_key       = rpki.x509.RSA( Auto_update = self.cfg.get("irdbd-key"))
+        self.bpki_ta         = rpki.x509.X509(Auto_update = self.cfg.get("bpki-ta"))
+        self.rpkid_cert      = rpki.x509.X509(Auto_update = self.cfg.get("rpkid-cert"))
+        self.irdbd_cert      = rpki.x509.X509(Auto_update = self.cfg.get("irdbd-cert"))
+        self.irdbd_key       = rpki.x509.RSA( Auto_update = self.cfg.get("irdbd-key"))
 
-    u = urlparse.urlparse(self.cfg.get("http-url"))
+        u = urlparse.urlparse(self.cfg.get("http-url"))
 
-    assert u.scheme in ("", "http") and \
-           u.username is None and \
-           u.password is None and \
-           u.params   == "" and \
-           u.query    == "" and \
-           u.fragment == ""
+        assert u.scheme in ("", "http") and \
+               u.username is None and \
+               u.password is None and \
+               u.params   == "" and \
+               u.query    == "" and \
+               u.fragment == ""
 
-    rpki.http_simple.server(host         = u.hostname or "localhost",
-                            port         = u.port or 443,
-                            handlers     = ((u.path, self.handler),))
+        rpki.http_simple.server(host         = u.hostname or "localhost",
+                                port         = u.port or 443,
+                                handlers     = ((u.path, self.handler),))