Support for password protected Notebook servers

Author: z-m-k

Python2.tmLanguage

@@ -2886,4 +2886,4 @@
 	<key>uuid</key>
 	<string>F23DB5B2-7D08-11D9-A709-220D93B6E43C</string>
 </dict>
-</plist>
+</plist>

ipy_connection.py

@@ -29,31 +29,36 @@
     from .external import nbformat3 as nbformat
     from .external.websocket import websocket3 as websocket
     from .external.websocket.websocket3 import *
-    from urllib.request import urlopen, Request, ProxyHandler, build_opener, install_opener
-    from urllib.parse import urlparse
-
-
-
+    from urllib.request import urlopen, Request, ProxyHandler, build_opener, install_opener, HTTPCookieProcessor
+    from urllib.parse import urlparse, urlencode
+    from http.cookiejar import CookieJar
 
 def install_proxy_opener():
+    cookies=CookieJar()
     proxy = ProxyHandler({})
-    opener = build_opener(proxy)
+    opener = build_opener(proxy, HTTPCookieProcessor(cookies))
     install_opener(opener)
+    return cookies
 
-install_proxy_opener()
+cookies=install_proxy_opener()
 
 def create_uid():
     return str(uuid.uuid4())
 
-def get_notebooks(baseurl):
-    target_url = "http://%s/notebooks" % baseurl
+def get_notebooks(baseurl, psswd=None):
     try:
+        if psswd!=None:
+            target_url=baseurl+'''/login?next=%2F'''
+            urlopen(target_url, data=urlencode({'password': psswd}).encode('utf8'))
+        target_url = baseurl    +"/notebooks"
         req = urlopen(target_url)
         try:
             encoding = req.headers.get_content_charset()
             body = req.readall().decode(encoding)
         except AttributeError:
             body = req.read()
+        if '<input type="password" name="password" id="password_input">' in body:
+            return 'psswd'
         data = json.loads(body)
         return data
     except Exception as e:
@@ -63,7 +68,7 @@ def get_notebooks(baseurl):
 
 def create_new_notebook(baseurl):
     try:
-        req = urlopen("http://" + baseurl + "/new")
+        req = urlopen(baseurl + "/new")
         try:
             encoding = req.headers.get_content_charset()
             body = req.readall().decode(encoding)
@@ -285,20 +290,20 @@ def get_kernel_id(self):
         raise Exception("notebook_id not found")
 
     def start_kernel(self):
-        url = "http://" + self.baseurl + "/kernels?notebook=" + self.notebook_id
+        url = self.baseurl + "/kernels?notebook=" + self.notebook_id
         req = urlopen(url, data=b"")  # data="" makes it POST request
         req.read()
         self.create_websockets()
 
     def restart_kernel(self):
-        url = "http://" + self.baseurl + "/kernels/" + self.kernel_id + "/restart"
+        url = self.baseurl + "/kernels/" + self.kernel_id + "/restart"
         req = urlopen(url, data=b"")
         req.read()
         self.create_websockets()
         self.status_callback("idle")
 
     def interrupt_kernel(self):
-        url = "http://" + self.baseurl + "/kernels/" + self.kernel_id + "/interrupt"
+        url = self.baseurl + "/kernels/" + self.kernel_id + "/interrupt"
         req = urlopen(url, data=bytearray(b""))
         req.read()
 
@@ -311,7 +316,7 @@ def get_notebook(self):
 
     @property
     def notebook_url(self):
-        return "http://" + self.baseurl + "/notebooks/" + self.notebook_id
+        return self.baseurl + "/notebooks/" + self.notebook_id
 
     def save_notebook(self, notebook):
         request = Request(self.notebook_url, str(notebook).encode(self.encoding))
@@ -400,15 +405,17 @@ def create_websockets(self):
         if self.iopub is not None:
             self.iopub.close()
 
-        url = "ws://" + self.baseurl + "/kernels/" + self.kernel_id + "/"
+        url = self.baseurl.replace('http', 'ws') + "/kernels/" + self.kernel_id + "/"
+        auth=''.join([c.name+'='+c.value for c in cookies])
         self.shell = websocket.WebSocketApp(url=url + "shell",
                                             on_message=lambda ws, msg: self.on_shell_msg(msg),
-                                            on_open=lambda ws: ws.send(""),
+                                            on_open=lambda ws: ws.send(auth),
                                             on_error=lambda ws, err: print(err))
         self.iopub = websocket.WebSocketApp(url=url + "iopub",
                                             on_message=lambda ws, msg: self.on_iopub_msg(msg),
-                                            on_open=lambda ws: ws.send(""),
-                                            on_error=lambda ws, err: print(err))
+                                            on_open=lambda ws: ws.send(auth),
+                                            on_error=lambda ws, err: print(err)
+                                            )
 
         _thread.start_new_thread(self.shell.run_forever, ())
         _thread.start_new_thread(self.iopub.run_forever, ())

ipy_view.py

@@ -97,7 +97,7 @@ def get_input_content(self):
             return self.view.substr(input_region)
         else:
             return ""
-    
+
     def check_R(self):
         pass
 
@@ -288,7 +288,7 @@ def __init__(self, view, notebook_id, baseurl):
         self.baseurl = baseurl
         view.set_scratch(True)
         #view.set_syntax_file("Packages/Python/Python.tmLanguage")
-        view.set_syntax_file("Packages/IPython Notebook/SublimeIPythonNotebook.tmLanguage")
+        view.set_syntax_file("Packages/SublimeIPythonNotebook/SublimeIPythonNotebook.tmLanguage")
         view.settings().set("ipython_notebook", True)
         self.cells = []
         self.notebook_id = notebook_id

subl_ipy_notebook.py

@@ -31,7 +31,7 @@ def on_close(self, view):
 
 def get_last_used_address():
 	settings = sublime.load_settings("SublimeIPythonNotebook.sublime-settings")
-	return settings.get("default_address", "127.0.0.1:8888")
+	return settings.get("default_address", "http://127.0.0.1:8888")
 
 
 def set_last_used_address(value):
@@ -45,13 +45,25 @@ def run(self):
                                      self.on_done, None, None)
 
     def on_done(self, line):
-        self.window.run_command("inb_list_notebooks", {"baseurl": line})
+        self.window.run_command("inb_list_notebooks", {"baseurl": line, "psswd": None})
+
+class InbPromptPasswordCommand(sublime_plugin.WindowCommand):
+    def run(self, baseurl):
+        self.baseurl=baseurl
+        self.window.show_input_panel("Password: ", '',
+                                     self.on_done, None, None)
+
+    def on_done(self, line):
+        self.window.run_command("inb_list_notebooks", {"baseurl": self.baseurl, 'psswd': line})
 
 
 class InbListNotebooksCommand(sublime_plugin.WindowCommand):
-    def run(self, baseurl):
+    def run(self, baseurl, psswd):
         self.baseurl = baseurl
-        nbs = ipy_connection.get_notebooks(baseurl)
+        nbs = ipy_connection.get_notebooks(baseurl, psswd)
+        if nbs=='psswd':
+            self.window.run_command("inb_prompt_password", {"baseurl": baseurl})
+            return
         if nbs is None:
             print("Cannot get a list of notebooks")
             return