Better error messaging for invalid lockers.

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

diff --git a/code/getafsgroups.py b/code/getafsgroups.py
index 9e0f31f..e2fece0 100644 (file)
--- a/code/getafsgroups.py
+++ b/code/getafsgroups.py
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 import pprint
 import subprocess
-from webcommon import InvalidInput
 
 # import ldap
 # l = ldap.open("W92-130-LDAP-2.mit.edu")
@@ -25,7 +24,7 @@ from webcommon import InvalidInput
 #             return True
 #     return False
 
-class MyException(Exception):
+class AfsProcessError(Exception):
     pass
 
 def getAfsGroupMembers(group, cell):
@@ -37,7 +36,7 @@ def getAfsGroupMembers(group, cell):
 
 def getLockerPath(locker):
     if '/' in locker or locker in ['.', '..']:
-        raise InvalidInput('owner', locker, 'Locker name is invalid.')
+        raise AfsProcessError("Locker '%s' is invalid." % locker)
     return '/mit/' + locker
 
 def checkAfsGroup(user, group, cell):
@@ -50,14 +49,14 @@ def getCell(locker):
     p = subprocess.Popen(["fs", "whichcell", getLockerPath(locker)], 
                          stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     if p.wait():
-        raise MyException(p.stderr.read())
+        raise AfsProcessError(p.stderr.read())
     return p.stdout.read().split()[-1][1:-1]
 
 def getLockerAcl(locker):
     p = subprocess.Popen(["fs", "listacl", getLockerPath(locker)], 
                          stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     if p.wait():
-        raise MyException(p.stderr.read())
+        raise AfsProcessError(p.stderr.read())
     lines = p.stdout.readlines()
     values = []
     for line in lines[1:]:
@@ -78,7 +77,7 @@ def notLockerOwner(user, locker):
     try:
         cell = getCell(locker)
         values = getLockerAcl(locker)
-    except MyException, e:
+    except AfsProcessError, e:
         return str(e)
 
     for entry in values: