From 6dd44de19fd5d146e8ba899cf5ad26ad86c28bb3 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Fri, 17 Jan 2014 22:58:57 -0800
Subject: [PATCH] Notaries sign notebooks now

---
 IPython/html/notebookapp.py                      |  2 +-
 IPython/html/services/notebooks/filenbmanager.py | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/IPython/html/notebookapp.py b/IPython/html/notebookapp.py
index bc8405d9f..40300f303 100644
--- a/IPython/html/notebookapp.py
+++ b/IPython/html/notebookapp.py
@@ -262,7 +262,7 @@ class NotebookTrustApp(BaseIPythonApplication):
             self.exit(1)
         with io.open(notebook_path, encoding='utf8') as f:
             nb = current.read(f, 'json')
-        sign.trust_notebook(nb, self.notary.secret, self.notary.signature_scheme)
+        self.notary.sign(nb)
         with io.open(notebook_path, 'w', encoding='utf8') as f:
             current.write(nb, f, 'json')
     
diff --git a/IPython/html/services/notebooks/filenbmanager.py b/IPython/html/services/notebooks/filenbmanager.py
index 0ec6b6348..8bcee5759 100644
--- a/IPython/html/services/notebooks/filenbmanager.py
+++ b/IPython/html/services/notebooks/filenbmanager.py
@@ -214,7 +214,10 @@ class FileNotebookManager(NotebookManager):
                 except Exception as e:
                     raise web.HTTPError(400, u"Unreadable Notebook: %s %s" % (os_path, e))
             model['content'] = nb
-            sign.mark_trusted_cells(nb, self.notary.secret, self.notary.scheme)
+            trusted = self.notary.check_signature(nb)
+            if not trusted:
+                self.log.warn("Notebook %s/%s is not trusted", model['path'], model['name'])
+            self.notary.mark_cells(nb, trusted)
         return model
 
     def save_notebook_model(self, model, name='', path=''):
@@ -238,8 +241,11 @@ class FileNotebookManager(NotebookManager):
         os_path = self.get_os_path(new_name, new_path)
         nb = current.to_notebook_json(model['content'])
         
-        if sign.check_trusted_cells(nb):
-            sign.trust_notebook(nb, self.notary.secret, self.notary.scheme)
+        if self.notary.check_cells(nb):
+            self.notary.sign(nb)
+        else:
+            self.log.warn("Saving untrusted notebook %s/%s", new_path, new_name)
+            
         
         if 'name' in nb['metadata']:
             nb['metadata']['name'] = u''