Display a helpful error on the website if a name has specifically been

reserved

svn path=/trunk/packages/invirt-web/; revision=1492

diff --git a/code/validation.py b/code/validation.py
index 2f64f9a..39c0084 100644 (file)
--- a/code/validation.py
+++ b/code/validation.py
@@ -272,8 +272,18 @@ def testName(user, name, machine=None):
     if machine is not None and name == machine.name:
         return None
     try:
     if machine is not None and name == machine.name:
         return None
     try:

-        f = open('/tmp/log', 'a')
-        dns.resolver.query('%s.%s.' % (name, config.dns.domains[0]), 'A')
+        hostname = '%s.%s.' % (name, config.dns.domains[0])
+        try:
+            dns.resolver.query(hostname, 'A')
+        except dns.resolver.NoAnswer, e:
+            # If we can get the TXT record, then we can verify it's
+            # reserved. If this lookup fails, let it bubble up and be
+            # dealt with
+            answer = dns.resolver.query(hostname, 'TXT')
+            txt = answer[0].strings[0]
+            if txt.startswith('Reserved'):
+                raise InvalidInput('name', name, 'The name you have requested has been %s. For more information, contact us at %s' % (txt, config.dns.contact))
+

         # If the hostname didn't exist, it would have thrown an
         # exception by now - error out
         raise InvalidInput('name', name, 'Name is already taken.')
         # If the hostname didn't exist, it would have thrown an
         # exception by now - error out
         raise InvalidInput('name', name, 'Name is already taken.')