add and respect 'adminable' column to machines

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

diff --git a/code/validation.py b/code/validation.py
index dc0fd8c..2e6c7c3 100644 (file)
--- a/code/validation.py
+++ b/code/validation.py
@@ -4,7 +4,7 @@ import cache_acls
 import getafsgroups
 import re
 import string
 import getafsgroups
 import re
 import string

-from sipb_xen_database import Machine, NIC, Type, Disk, CDROM
+from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall

 from webcommon import InvalidInput
 
 MAX_MEMORY_TOTAL = 512
 from webcommon import InvalidInput
 
 MAX_MEMORY_TOTAL = 512

@@ -19,7 +19,7 @@ MAX_VMS_ACTIVE = 4
 class Validate:
     def __init__(self, username, state, machine_id=None, name=None, description=None, owner=None,
                  admin=None, contact=None, memory=None, disksize=None,
 class Validate:
     def __init__(self, username, state, machine_id=None, name=None, description=None, owner=None,
                  admin=None, contact=None, memory=None, disksize=None,

-                 vmtype=None, cdrom=None, clone_from=None, strict=False):
+                 vmtype=None, cdrom=None, autoinstall=None, strict=False):

         # XXX Successive quota checks aren't a good idea, since you
         # can't necessarily change the locker and disk size at the
         # same time.
         # XXX Successive quota checks aren't a good idea, since you
         # can't necessarily change the locker and disk size at the
         # same time.

@@ -36,7 +36,7 @@ class Validate:
                 raise InvalidInput('disk', disksize, "You must provide a disk size.")
 
         if machine_id is not None:
                 raise InvalidInput('disk', disksize, "You must provide a disk size.")
 
         if machine_id is not None:

-            self.machine = testMachineId(username, machine_id)
+            self.machine = testMachineId(username, state, machine_id)

         machine = getattr(self, 'machine', None)
 
         owner = testOwner(username, owner, machine)
         machine = getattr(self, 'machine', None)
 
         owner = testOwner(username, owner, machine)

@@ -58,17 +58,15 @@ class Validate:
             self.memory = validMemory(self.owner, state, memory, machine,
                                       on=not created_new)
         if disksize is not None:
             self.memory = validMemory(self.owner, state, memory, machine,
                                       on=not created_new)
         if disksize is not None:

-            self.disksize = validDisk(self.owner, disksize, machine)
+            self.disksize = validDisk(self.owner, state, disksize, machine)

         if vmtype is not None:
             self.vmtype = validVmType(vmtype)
         if cdrom is not None:
             if not CDROM.get(cdrom):
                 raise CodeError("Invalid cdrom type '%s'" % cdrom)
             self.cdrom = cdrom
         if vmtype is not None:
             self.vmtype = validVmType(vmtype)
         if cdrom is not None:
             if not CDROM.get(cdrom):
                 raise CodeError("Invalid cdrom type '%s'" % cdrom)
             self.cdrom = cdrom

-        if clone_from is not None:
-            if clone_from not in ('ice3', ):
-                raise CodeError("Invalid clone image '%s'" % clone_from)
-            self.clone_from = clone_from
+        if autoinstall is not None:
+            self.autoinstall = Autoinstall.get(autoinstall)

 
 
 def getMachinesByOwner(owner, machine=None):
 
 
 def getMachinesByOwner(owner, machine=None):

@@ -125,9 +123,10 @@ def cantAddVm(owner, g):
                 'To create more, turn one off.')
     return False
 
                 'To create more, turn one off.')
     return False
 

-def haveAccess(user, machine):
+def haveAccess(user, state, machine):

     """Return whether a user has administrative access to a machine"""
     """Return whether a user has administrative access to a machine"""

-    return user in cache_acls.accessList(machine)
+    return (user in cache_acls.accessList(machine)
+            or (machine.adminable and state.isadmin))

 
 def owns(user, machine):
     """Return whether a user owns a machine"""
 
 def owns(user, machine):
     """Return whether a user owns a machine"""

@@ -137,8 +136,8 @@ def validMachineName(name):
     """Check that name is valid for a machine name"""
     if not name:
         return False
     """Check that name is valid for a machine name"""
     if not name:
         return False

-    charset = string.ascii_letters + string.digits + '-_'
-    if name[0] in '-_' or len(name) > 22:
+    charset = string.lowercase + string.digits + '-'
+    if '-' in (name[0], name[-1]) or len(name) > 63:

         return False
     for x in name:
         if x not in charset:
         return False
     for x in name:
         if x not in charset:

@@ -159,16 +158,16 @@ def validMemory(owner, g, memory, machine=None, on=True):
         raise InvalidInput('memory', memory,
                            "Minimum %s MiB" % MIN_MEMORY_SINGLE)
     max_val = maxMemory(owner, g, machine, on)
         raise InvalidInput('memory', memory,
                            "Minimum %s MiB" % MIN_MEMORY_SINGLE)
     max_val = maxMemory(owner, g, machine, on)

-    if memory > max_val:
+    if not g.isadmin and memory > max_val:

         raise InvalidInput('memory', memory,
                            'Maximum %s MiB for %s' % (max_val, owner))
     return memory
 
         raise InvalidInput('memory', memory,
                            'Maximum %s MiB for %s' % (max_val, owner))
     return memory
 

-def validDisk(owner, disk, machine=None):
+def validDisk(owner, g, disk, machine=None):

     """Parse and validate limits for disk for a given owner and machine."""
     try:
         disk = float(disk)
     """Parse and validate limits for disk for a given owner and machine."""
     try:
         disk = float(disk)

-        if disk > maxDisk(owner, machine):
+        if not g.isadmin and disk > maxDisk(owner, machine):

             raise InvalidInput('disk', disk,
                                "Maximum %s G" % maxDisk(owner, machine))
         disk = int(disk * 1024)
             raise InvalidInput('disk', disk,
                                "Maximum %s G" % maxDisk(owner, machine))
         disk = int(disk * 1024)

@@ -187,7 +186,7 @@ def validVmType(vm_type):
         raise CodeError("Invalid vm type '%s'"  % vm_type)
     return t
 
         raise CodeError("Invalid vm type '%s'"  % vm_type)
     return t
 

-def testMachineId(user, machine_id, exists=True):
+def testMachineId(user, state, machine_id, exists=True):

     """Parse, validate and check authorization for a given user and machine.
 
     If exists is False, don't check that it exists.
     """Parse, validate and check authorization for a given user and machine.
 
     If exists is False, don't check that it exists.

@@ -202,7 +201,7 @@ def testMachineId(user, machine_id, exists=True):
     machine = Machine.get(machine_id)
     if exists and machine is None:
         raise InvalidInput('machine_id', machine_id, "Does not exist.")
     machine = Machine.get(machine_id)
     if exists and machine is None:
         raise InvalidInput('machine_id', machine_id, "Does not exist.")

-    if machine is not None and not haveAccess(user, machine):
+    if machine is not None and not haveAccess(user, state, machine):

         raise InvalidInput('machine_id', machine_id,
                            "You do not have access to this machine.")
     return machine
         raise InvalidInput('machine_id', machine_id,
                            "You do not have access to this machine.")
     return machine

@@ -266,11 +265,12 @@ def testDisk(user, disksize, machine=None):
 def testName(user, name, machine=None):
     if name is None:
         return None
 def testName(user, name, machine=None):
     if name is None:
         return None

+    name = name.lower()

     if machine is not None and name == machine.name:
         return None
     if not Machine.select_by(name=name):
         if not validMachineName(name):
     if machine is not None and name == machine.name:
         return None
     if not Machine.select_by(name=name):
         if not validMachineName(name):

-            raise InvalidInput('name', name, 'You must provide a machine name.  Max 22 chars, alnum plus \'-\' and \'_\'.')
+            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.")
 
         return name
     raise InvalidInput('name', name, "Name is already taken.")