From d1ab3c8ce46d1bd5e31be51707bf58d538f3387f Mon Sep 17 00:00:00 2001
From: Patrick Bellasi <patrick.bellasi@arm.com>
Date: Mon, 10 Apr 2017 15:33:31 +0100
Subject: [PATCH] lisa_shell: fix reported URL

Jupyter notebook 4.3.1 introduces protection from cross-site request forgeries,
requiring API requests to either:
- originate from pages served by this server
  (validated with XSRF cookie and toekn)
- authenticate with a token

This patch adds support to generate a random token and report it in the
complete URL thus allowing the user to properly get the complete address
where her server is running.

Signed-off-by: Patrick Bellasi <patrick.bellasi@arm.com>
---
 src/shell/lisa_shell | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/shell/lisa_shell b/src/shell/lisa_shell
index 0992dcabf..34c8bde8f 100755
--- a/src/shell/lisa_shell
+++ b/src/shell/lisa_shell
@@ -185,15 +185,24 @@ fi
 PYDIR="$LISA_HOME/ipynb"
 LOGFILE="$PYDIR/server.log"
 PIDFILE="$PYDIR/server.pid"
+URLFILE="$PYDIR/server.url"
+
+# Generate server URL
+TOKEN=$(cat /dev/urandom | tr -dc 'a-fA-F0-9' | fold -w 48 | head -n 1)
+URL="http://$IPADDR:$PORT/?token=$TOKEN"
+
 # Check if an instance is already running
 if [ -f "$PIDFILE" ] && pgrep -F $PIDFILE >/dev/null; then
-	echo "Server already running, opening new window in browser"
-    xdg-open "http://$IPADDR:8888/"
+	echo "Server already running:"
+    echo "  " $(cat $URLFILE)
+    xdg-open $(cat $URLFILE)
 	return 1
 fi
+
 # Start the server bindeed to the specified interface
-echo 'Starting IPython Notebook server...'
-echo "  IP Address :  http://$IPADDR:$PORT/"
+echo
+echo 'Notebook server configuration:'
+echo '  URL        : ' $URL
 echo '  Folder     : ' $PYDIR
 echo '  Logfile    : ' $LOGFILE
 echo '  PYTHONPATH : '
@@ -201,8 +210,11 @@ echo -e "\t${PYTHONPATH//:/\\n\\t}"
 cd $PYDIR
 echo
 echo -n 'Notebook server task: '
-nohup ipython notebook --ip=$IPADDR --port=$PORT &>$LOGFILE &
+nohup ipython notebook --ip=$IPADDR --port=$PORT \
+                       --NotebookApp.token=$TOKEN \
+                       >$LOGFILE 2>&1 &
 echo $! >$PIDFILE
+echo $URL >$URLFILE
 cd - >/dev/null
 }
 
-- 
GitLab