correct reason why you can't walk into a fresh autoinstall by ssh

[invirt/packages/invirt-web.git] / code / validation.py

diff --git a/code/validation.py b/code/validation.py
index 2f64f9a..fe6d7c8 100644 (file)
--- a/code/validation.py
+++ b/code/validation.py
@@ -7,7 +7,7 @@ import string
 import dns.resolver
 from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall
 from invirt.config import structs as config
 import dns.resolver
 from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall
 from invirt.config import structs as config

-from webcommon import InvalidInput
+from invirt.common import InvalidInput

 
 MAX_MEMORY_TOTAL = 512
 MAX_MEMORY_SINGLE = 256
 
 MAX_MEMORY_TOTAL = 512
 MAX_MEMORY_SINGLE = 256

@@ -272,8 +272,20 @@ 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])
+        resolver = dns.resolver.Resolver()
+        resolver.nameservers = ['127.0.0.1']
+        try:
+            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 = 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.')