Changeset 1473 for trunk/packages/invirt-web

Timestamp:

Oct 31, 2008, 10:58:23 PM (16 years ago)

Author:

broder

Message:

Validate hostnames by querying to see if the name exists in DNS, and
add an appropriate dependency

Location:

trunk/packages/invirt-web

Files:

• code/validation.py (modified) (2 diffs)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)

trunk/packages/invirt-web/code/validation.py

@@ -5 +5 @@
 import re
 import string
+import dns.resolver
 from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall
 from invirt.config import structs as config
@@ -271 +272 @@
     if machine is not None and name == machine.name:
         return None
-    if not Machine.query().filter_by(name=name).count():
+    try:
+        f = open('/tmp/log', 'a')
+        dns.resolver.query('%s.%s.' % (name, config.dns.domains[0]), 'A')
+        # If the hostname didn't exist, it would have thrown an
+        # exception by now - error out
+        raise InvalidInput('name', name, 'Name is already taken.')
+    except dns.resolver.NXDOMAIN, e:
         if not validMachineName(name):
             raise InvalidInput('name', name, 'You must provide a machine name.  Max 63 chars, alnum plus \'-\', does not begin or end with \'-\'.')
         return name
-    raise InvalidInput('name', name, "Name is already taken.")
+    except InvalidInput:
+        raise
+    except:
+        # Any other error is a validation failure
+        raise InvalidInput('name', name, 'We were unable to verify that this name is available. If you believe this is in error, please contact us at %s' % config.dns.contact)
 
 def testDescription(user, description, machine=None):

trunk/packages/invirt-web/debian/changelog

@@ +1 @@
+invirt-web (0.0.5) unstable; urgency=low
+
+  * Add new dependency on python-dns
+
+ -- Evan Broder <broder@mit.edu>  Fri, 31 Oct 2008 22:57:41 -0400
+
 invirt-web (0.0.4) unstable; urgency=low
 

trunk/packages/invirt-web/debian/control

@@ -9 +9 @@
 Architecture: all
 Depends: ${misc:Depends}, libapache2-mod-fcgid, python-flup,
- python-cheetah, python-simplejson, invirt-database,
+ python-cheetah, python-simplejson, python-dns, invirt-database,
  invirt-vnc-client, kstart, debathena-afs-config, invirt-base,
- libapache2-svn, libapache2-mod-auth-kerb, postfix, subversion, zephyr-clients
+ libapache2-svn, libapache2-mod-auth-kerb, postfix, subversion,
+ zephyr-clients
 Description: the Invirt web interface