Merge pull request #2471 from takluyver/safer-sys-info

Make sys_info more robust

notebook/_sysinfo.py

@@ -46,11 +46,15 @@ def pkg_commit_hash(pkg_path):
     while cur_path != par_path:
         cur_path = par_path
         if p.exists(p.join(cur_path, '.git')):
-            proc = subprocess.Popen('git rev-parse --short HEAD',
-                                stdout=subprocess.PIPE,
-                                stderr=subprocess.PIPE,
-                                cwd=pkg_path, shell=True)
-            repo_commit, _ = proc.communicate()
+            try:
+                proc = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'],
+                                    stdout=subprocess.PIPE,
+                                    stderr=subprocess.PIPE,
+                                    cwd=pkg_path)
+                repo_commit, _ = proc.communicate()
+            except OSError:
+                repo_commit = None
+
             if repo_commit:
                 return 'repository', repo_commit.strip().decode('ascii')
             else:

notebook/base/handlers.py

@@ -39,7 +39,12 @@ from notebook.services.security import csp_report_uri
 #-----------------------------------------------------------------------------
 non_alphanum = re.compile(r'[^A-Za-z0-9]')
 
-sys_info = json.dumps(get_sys_info())
+_sys_info_cache = None
+def json_sys_info():
+    global _sys_info_cache
+    if _sys_info_cache is None:
+        _sys_info_cache = json.dumps(get_sys_info())
+    return _sys_info_cache
 
 def log():
     if Application.initialized():
@@ -357,7 +362,7 @@ class IPythonHandler(AuthenticatedHandler):
             login_available=self.login_available,
             token_available=bool(self.token or self.one_time_token),
             static_url=self.static_url,
-            sys_info=sys_info,
+            sys_info=json_sys_info(),
             contents_js_source=self.contents_js_source,
             version_hash=self.version_hash,
             ignore_minified_js=self.ignore_minified_js,