Update vacutils; use URL-keyed pipescache

Author: Andrew-McNab-UK

Makefile

@@ -1,6 +1,6 @@
 #
 #  Andrew McNab, University of Manchester.
-#  Copyright (c) 2013-6. All rights reserved.
+#  Copyright (c) 2013-9. All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or
 #  without modification, are permitted provided that the following
@@ -61,6 +61,7 @@ install: $(INSTALL_FILES)
  	         $(RPM_BUILD_ROOT)/usr/share/man/man5 \
                  $(RPM_BUILD_ROOT)/usr/share/man/man8 \
  	         $(RPM_BUILD_ROOT)/var/lib/vcycle/tmp \
+ 	         $(RPM_BUILD_ROOT)/var/lib/vcycle/pipescache \
  	         $(RPM_BUILD_ROOT)/var/lib/vcycle/imagecache \
 	         $(RPM_BUILD_ROOT)/var/lib/vcycle/apel-archive \
 	         $(RPM_BUILD_ROOT)/var/lib/vcycle/apel-outgoing \

shared.py

@@ -950,12 +950,10 @@ def _expandVacuumPipe(self, parser, vacuumPipeSectionName, machinetypeNamePrefix
       totalTargetShare = 0.0
 
     try:
-      vacuumPipe = vcycle.vacutils.readPipe(
-          '/var/lib/vcycle/spaces/' + self.spaceName + '/machinetypes/'
-          + machinetypeNamePrefix + '/vacuum.pipe',
-          vacuumPipeURL,
-          'vcycle ' + vcycleVersion,
-          updatePipes = updatePipes)
+      vacuumPipe = vcycle.vacutils.readPipe('/var/lib/vcycle/pipescache',
+                                            vacuumPipeURL,
+                                            'vcycle ' + vcycleVersion,
+                                            updatePipes = updatePipes)
     except Exception as e:
       raise VcycleError(vacuumPipeURL + ' given but failed reading/updating the pipe: ' + str(e))
 

vacutils.py

@@ -5,7 +5,7 @@
 ## UNMODIFIED VERSIONS ARE COPIED TO THE Vcycle REPO AS NEEDED  ##
 #
 #  Andrew McNab, University of Manchester.
-#  Copyright (c) 2013-8. All rights reserved.
+#  Copyright (c) 2013-9. All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or
 #  without modification, are permitted provided that the following
@@ -117,11 +117,13 @@ def secondsToString(timeStamp):
    else:
      return '%dd' % (seconds / 86400)
 
-def readPipe(pipeFile, pipeURL, versionString, updatePipes = False):
+def readPipe(pipeDir, pipeURL, versionString, updatePipes = False):
 
    # Default value in case not given in file
    cacheSeconds = 3600
 
+   pipeFile = pipeDir + '/' + urllib.quote(pipeURL, '')
+
    try:
      pipeDict = json.load(open(pipeFile, 'r'))
    except:

vcycle-cgi

@@ -58,7 +58,21 @@ except:
   print
   sys.exit(0)
 
-if ('SSL_CLIENT_S_DN' not in os.environ) or (os.environ['SSL_CLIENT_S_DN'] != httpsX509dn):
+if 'SSL_CLIENT_S_DN' not in os.environ:
+  print 'Status: 403 Forbidden'
+  print
+  sys.exit(0)
+
+if os.environ['SSL_CLIENT_S_DN'][0] == '/':
+  # Use slash format DN without modification
+  x509Client = os.environ['SSL_CLIENT_S_DN']
+else:
+  # Convert comma DN format to slashes
+  x509ClientList = os.environ['SSL_CLIENT_S_DN'].split(',')
+  x509ClientList.reverse()
+  x509Client = '/' + '/'.join(x509ClientList)
+  
+if x509Client != httpsX509dn:
   print 'Status: 403 Forbidden'
   print
   sys.exit(0)