Changeset 1492 for trunk

Timestamp:

Nov 1, 2008, 4:21:49 AM (16 years ago)

Author:

broder

Message:

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

File:

• trunk/packages/invirt-web/code/validation.py (modified) (1 diff)

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

@@ -273 +273 @@
         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