Bind interactive job vncsession to specific service interface

mig/shared/functionality/vncsession.py

@@ -1,10 +1,10 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
 # --- BEGIN_HEADER ---
 #
-# vncsession - Start a new VNC session
-# Copyright (C) 2003-2023  The MiG Project lead by Brian Vinter
+# vncsession - Start a new VNC session for interactive jobs
+# Copyright (C) 2003-2026  The MiG Project by the Science HPC Center at UCPH
 #
 # This file is part of MiG.
 #
@@ -20,12 +20,12 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 # -- END_HEADER ---
 #
 
-"""Start a new vnc session"""
+"""Start a new vnc session for interactive jobs"""
 
 from __future__ import absolute_import
 
@@ -56,10 +56,10 @@
     return ['html_form', defaults]
 
 
 def main(client_id, user_arguments_dict):
     """Main function used by front end"""
 
     (configuration, logger, output_objects, op_name) = \
         initialize_main_variables(client_id, op_header=False)
     client_dir = client_id_dir(client_id)
     defaults = signature()[1]
@@ -79,6 +79,11 @@
     depth = accepted['depth'][-1]
     desktopname = accepted['desktopname'][-1]
 
+    if not configuration.site_enable_jobs:
+        output_objects.append({'object_type': 'error_text', 'text':
+                               '''Job execution is not enabled on this system'''})
+        return (output_objects, returnvalues.SYSTEM_ERROR)
+
     # Please note that base_dir must end in slash to avoid access to other
     # user dirs when own name is a prefix of another user name
 
@@ -95,10 +100,10 @@
         var httpRequest = new XMLHttpRequest();
       try {
         httpRequest.open("POST", "vncstop.py", "");
         httpRequest.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
         httpRequest.send("");
       }
       catch (e) 
       {
         alert(e);
         return e;
@@ -106,7 +111,7 @@
     }
     '''
 
     # ## TODO: Include something like the following for support for interactive jobrequests!
     # ===============================================================================
     #    function submitjob(request) {
     #    if (!window.XMLHttpRequest)
@@ -115,7 +120,7 @@
     #      var httpRequest = new XMLHttpRequest();
     #      try {
     #        httpRequest.open('POST', 'textarea.py', '');
     #        httpRequest.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
     #        httpRequest.send(request);
     #      }
     #      catch (e) {
@@ -128,10 +133,10 @@
     #        return httpRequest.status + " " + httpRequest.statusText;
     #    }
     # ##############################################################333
     # ....FOLLOWING IS A SAMPLE TAKEN FROM: dsl.gymer.dk (thx. for sharing gymer)
     # ....function submitkey() {
     # ....        var form = document.getElementById("submitkeyform");
     # ....        var res = submitjob("action=submitkey"+"&key="+form.key.value );
     # ....        document.getElementById("subcontent").innerHTML = res;
     # ....}
     # ===============================================================================
@@ -146,8 +151,8 @@
     error = ''
 
     # Find available port/display.
     # TODO: Separate port and display no... Check /tmp/.X11-lock/ for available displays
     # ....and make bind check for available ports! Display might be in use without
     # ....using a port and vice-versa!
 
     passwdfile = ''
@@ -172,15 +177,15 @@
         for i in range(start_display, VNC_port_count + start_display):
             free_display_found = False
             try:
-                S = socket.socket()
-                S.bind(('', baseVNCport + i))
+                vnc_sock = socket.socket()
+                vnc_sock.bind((configuration.server_fqdn, baseVNCport + i))
                 display_number = i
                 vnc_port = baseVNCport + display_number
                 free_display_found = True
             except Exception as exc:
                 error = exc
-            S.close()
-            S = None
+            vnc_sock.close()
+            vnc_sock = None
 
             if free_display_found: