Fix hostname in generated JNLP file and address code review feedback

diff --git a/code/main.py b/code/main.py
index 59a31f8..b4e659e 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -319,7 +319,6 @@ console will suffer artifacts.
 
         @cherrypy.expose
         @cherrypy.tools.mako(filename="/vnc.mako")
-
         def vnc(self, machine_id):
             """VNC applet page"""
             return self._vnc(machine_id)

diff --git a/code/templates/vnc.mako b/code/templates/vnc.mako
index b7b6857..1c9afbc 100644 (file)
--- a/code/templates/vnc.mako
+++ b/code/templates/vnc.mako
@@ -20,5 +20,6 @@ Console to ${machine.name}
 <param name="VMNAME" value="${machine.name}">
 <param name="AUTHTOKEN" value="${authtoken}">
 <param name="SocketFactory" value="VNCProxyConnectSocketFactory">
-You must have Java enabled in your browser to use the VNC console applet. If your browser does not support Java, but you do have a Java Runtime Environment installed, try clicking <a href="machine/${machine.machine_id}/vnc_jnlp">here</a> to launch the VNC console via Java Web Start.
+You must have Java enabled in your browser to use the VNC console applet.
 </applet>
+<p>If your browser does not support Java, but you do have a Java Runtime Environment installed, try clicking <a href="machine/${machine.machine_id}/vnc_jnlp">here</a> to launch the VNC console via Java Web Start.</p>

diff --git a/code/templates/vnc_jnlp.mako b/code/templates/vnc_jnlp.mako
index 60f3269..66884ba 100644 (file)
--- a/code/templates/vnc_jnlp.mako
+++ b/code/templates/vnc_jnlp.mako
@@ -1,4 +1,4 @@
-<jnlp spec="1.0+" codebase="https://xvm.mit.edu:446/static/">
+<jnlp spec="1.0+" codebase="https://${hostname}:446/static/">
   <information>
     <title>XVM Java Console</title>
     <vendor>Invirt Project</vendor>
@@ -14,7 +14,8 @@
     <j2se version="1.6.0+" initial-heap-size="32M" max-heap-size="128M"/>
     <jar href="VncViewer.jar" download="eager" main="true"/>
   </resources>
-  <applet-desc main-class="VncViewer" name="VncViewer" width="1000" height="1000">
+  <applet-desc main-class="VncViewer" name="VncViewer" width="1000" height="1000"
+  documentbase="https://${hostname}/machine/${machine.machine_id}/vnc_jnlp">
     <param name="PORT" value="${port}" />
     <param name="HOST" value="${hostname}" />
     <param name="VMNAME" value="${machine.name}" />

diff --git a/debian/changelog b/debian/changelog
index 58385e6..43113e8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+invirt-web (0.1.53) precise; urgency=medium
+
+  * Fix hostname of URL in codebase in vnc_jnlp.mako
+  * Move the "try in javaws" text on vnc.mako outside the applet tag so
+    it's accessible even if the user has the java plugin and it's
+    disabled.
+  * Add documentbase attribute to applet-desc tag in vnc_jnlp.mako, so
+    that the "login again" button does something for people whose javaws
+    knows how to talk to their browser.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Thu, 14 Jun 2018 22:01:19 -0400
+
 invirt-web (0.1.53~glasgall1) precise; urgency=medium
 
   * Add Java Web Start support for Java HVM console as a stopgap until we