minor cleanup

internimsclient.py

@@ -5,7 +5,7 @@
 import logging
 import logging.config
 log = logging.getLogger('internims')
-logging.getLogger('requests').setLevel(logging.WARNING)
+logging.getLogger('urllib3').setLevel(logging.WARNING) # silence Requests library logging
 
 import re
 import json

nimsapi.py

@@ -13,7 +13,6 @@ import uuid
 import hashlib
 import tarfile
 import webapp2
-import zipfile
 import markdown
 import bson.json_util
 import webapp2_extras.routes
@@ -142,17 +141,17 @@ class NIMSAPI(nimsapiutil.NIMSRequestHandler):
         stage_path = self.app.config['stage_path']
         with tempfile.TemporaryDirectory(prefix='.tmp', dir=stage_path) as tempdir_path:
             hash_ = hashlib.md5()
-            upload_filepath = os.path.join(tempdir_path, filename)
-            with open(upload_filepath, 'wb') as upload_file:
+            filepath = os.path.join(tempdir_path, filename)
+            with open(filepath, 'wb') as upload_file:
                 for chunk in iter(lambda: self.request.body_file.read(2**20), ''):
                     hash_.update(chunk)
                     upload_file.write(chunk)
             if hash_.hexdigest() != self.request.headers['Content-MD5']:
                 self.abort(400, 'Content-MD5 mismatch.')
-            if not tarfile.is_tarfile(upload_filepath) and not zipfile.is_zipfile(upload_filepath):
+            if not tarfile.is_tarfile(filepath):
                 self.abort(415)
-            log.info('upload from %s: %s [%s]' % (self.request.user_agent, os.path.basename(upload_filepath), hrsize(self.request.content_length)))
-            os.rename(upload_filepath, os.path.join(stage_path, str(uuid.uuid1()) + '_' + filename)) # add UUID to prevent clobbering files
+            log.info('upload from %s: %s [%s]' % (self.request.user_agent, filename, hrsize(self.request.content_length)))
+            os.rename(filepath, os.path.join(stage_path, str(uuid.uuid1()) + '_' + filename)) # add UUID to prevent clobbering files
 
     def download(self):
         if self.request.method == 'OPTIONS':

nimsapi.wsgi

@@ -9,9 +9,10 @@ configfile = '../production.ini'
 config = ConfigParser.ConfigParser()
 config.read(configfile)
 
-site.addsitedir(os.path.join(config.get('nims', 'virtualenv'), 'lib', 'python2.7', 'site-packages'))
+site.addsitedir(os.path.join(config.get('nims', 'virtualenv'), 'lib/python2.7/site-packages'))
 sys.path.append(config.get('nims', 'here'))
 os.environ['PYTHON_EGG_CACHE'] = config.get('nims', 'python_egg_cache')
+os.umask(0o022)
 
 import pymongo
 import Crypto.Random
@@ -33,7 +34,7 @@ privkey_file = config.get('nims', 'ssl_key')
 try:
     privkey = Crypto.PublicKey.RSA.importKey(open(privkey_file).read())
 except Exception:
-    log.warn(privkey_file + 'is not a valid private SSL key file')
+    log.warn(privkey_file + ' is not a valid private SSL key file')
     privkey = None
 else:
     log.info('successfully loaded private SSL key from ' + privkey_file)

nimsapiutil.py

@@ -2,7 +2,7 @@
 
 import logging
 log = logging.getLogger('nimsapi')
-logging.getLogger('requests').setLevel(logging.WARNING)                  # silence Requests library logging
+logging.getLogger('urllib3').setLevel(logging.WARNING) # silence Requests library logging
 
 import json
 import base64
@@ -169,7 +169,7 @@ class NIMSRequestHandler(webapp2.RequestHandler):
         else:
             if self.request.method == 'OPTIONS':
                 return self.options()
-            r = requests.request(self.request.method, self.target_uri, params=self.params, data=self.request.body, headers=self.headers, verify=False)
+            r = requests.request(self.request.method, self.target_uri, params=self.params, data=self.request.body, headers=self.headers)
             if r.status_code != 200:
                 self.abort(r.status_code, 'InterNIMS p2p err: ' + r.reason)
             self.response.write(r.content)