Changeset 5087:5b845e53934a

Timestamp:

06/21/07 09:40:43 (6 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Message:

some little stuff for actual use.

Location:

sage/server/notebook

Files:

• notebook.py (modified) (3 diffs)
• run_notebook.py (modified) (2 diffs)

sage/server/notebook/notebook.py

@@ -11 +11 @@
 
 import os
+import random
 import re  
 import shutil
@@ -77 +78 @@
     def default_users(self):
         self.add_user('pub', '', '', account_type='guest')
-        self.add_user('guest', 'a', '', account_type='guest')
-        self.add_user('guest2', 'a', '', account_type='guest')        
-        self.add_user('admin', 'a', '', account_type='admin')
-        self.add_user("a", "a", "", "admin")
-        self.add_user("b", "a", "", "user")
-        for n in range(20):
-            self.add_user("s%s"%n, "a", "", "user")
+        self.add_user('guest', '', '', account_type='guest')
+        pw = hex(random.randint(1,2**24))[2:] 
+        self.add_user('admin', pw, '', account_type='admin')
+        print "*"*60
+        print "*"*60
+        print ""
+        print "Setting Admin password to '%s'"%pw
+        print ""
+        print "*"*60
+        print "*"*60
             
     def users(self):
@@ -1194 +1198 @@
             F = os.path.abspath(filename)
             
-        print "Saving notebook to '%s'..."%F
+        #print "Saving notebook to '%s'..."%F
         D, _ = os.path.split(F)
         if not os.path.exists(D):

sage/server/notebook/run_notebook.py

@@ -44 +44 @@
              ulimit      = None):
     r"""
-    Experimental twisted version of the SAGE Notebook.
+    The SAGE Notebook.
 
     INPUT:
@@ -57 +57 @@
                       between web browsers and the SAGE notebook is
                       encrypted (via GNU TLS).
-    ADVANCED OPTIONS:
+
+    The recommended somewhat secure way to run the SAGE notebook
+    publically is to (1) use a chroot jail, and (2) a command like
+    
+       notebook(secure=True, server_pool=['sage1@localhost'], ulimit='-v 1000000')
+
+    The secure=True option will use ssl for securing all
+    communications, the server pool option will ensure that the sage
+    worksheet process (where the users can execute arbitrary code) are
+    run as a separate process, and ulimit option ensures that no user
+    uses more than 1GB RAM per process.
+
+    INPUT:  (more advanced)
         server_pool -- (default: None), if given, should be a list like 
                       ['sage1@localhost', 'sage2@localhost'], where