[Pymerase-cvs-commit] pymerase/pymweb/cgi pymweb.py,1.10,1.11

[<ki...@us...>]

Update of /cvsroot/pymerase/pymerase/pymweb/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv23518/cgi

Modified Files:
	pymweb.py 
Log Message:
added a check to see if the user is trying to upload a file that
already exists, if so, raise error.


Index: pymweb.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/pymweb/cgi/pymweb.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pymweb.py	9 Apr 2003 15:26:21 -0000	1.10
--- pymweb.py	9 Apr 2003 15:45:09 -0000	1.11
***************
*** 217,220 ****
--- 217,232 ----
  
  
+ def checkSchema(fileName):
+   if fileName[-7:] == '.tar.gz':
+     fileName = fileName[:-7]
+   
+   if fileName == 'driver.sh' \
+      or fileName == 'driver.py' \
+      or fileName == 'index.html' \
+      or fileName == 'untar.sh':
+     return 0
+ 
+   return 1
+ 
  def checkDest(dest):
    block = ['\\', '/']
***************
*** 224,227 ****
--- 236,245 ----
        return 0
  
+   if dest == 'driver.sh' \
+      or dest == 'driver.py' \
+      or dest == 'index.html' \
+      or dest == 'untar.sh':
+     return 0
+ 
    return 1
    
***************
*** 252,255 ****
--- 270,278 ----
      fileName = file.filename
      fileName = checkFileName(fileName)
+ 
+     if checkSchema(fileName) != 1:
+       text = 'File name %s invalid! File already exists.<br>\n' % (fileName)
+       print text
+       raise ValueError, text
      
      saved = saveFile(fileName, file.file.read())