Ability to handle hostnames in whitelist regarding .desy.de

src/ZeroMQTunnel/FileMover.py

@@ -60,7 +60,14 @@ class FileMover():
         self.ondaIps             = ondaIps
         self.ondaPorts           = ondaPorts
 
-        self.receiverWhiteList   = receiverWhiteList
+        #remove .desy.de from hostnames
+        self.receiverWhiteList = []
+        for host in receiverWhiteList:
+            if host.endswith(".desy.de"):
+                self.receiverWhiteList.append(host[:-8])
+            else:
+                self.receiverWhiteList.append(host)
+
         self.parallelDataStreams = parallelDataStreams
         self.chunkSize           = chunkSize
 
@@ -182,8 +189,11 @@ class FileMover():
                         self.receiverComSocket.send("NO_VALID_SIGNAL", zmq.NOBLOCK)
                         continue
 
+                    if signalHostname.endswith(".desy.de"):
+                        signalHostnameModified = signalHostname[:-8]
+
                     self.log.debug("Check if signal sending host is in WhiteList...")
-                    if signalHostname in self.receiverWhiteList:
+                    if signalHostname in self.receiverWhiteList or signalHostnameModified in self.receiverWhiteList:
                         self.log.info("Check if signal sending host is in WhiteList...Host " + str(signalHostname) + " is allowed to connect.")
                     else:
                         self.log.info("Check if signal sending host is in WhiteList...Host " + str(signalHostname) + " is not allowed to connect.")

src/sender.py

@@ -121,25 +121,24 @@ class Sender():
             logging.info("Keyboard interruption detected. Shutting down")
         # except Exception, e:
         #     print "unknown exception detected."
-
-
-        logging.debug("shutting down zeromq...")
-        try:
-            fileMover.stop()
-            logging.debug("shutting down zeromq...done.")
-        except:
-            logging.error(sys.exc_info())
-            logging.error("shutting down zeromq...failed.")
-
-        # give the other processes time to close the sockets
-        time.sleep(0.1)
-        try:
-            logging.debug("closing zmqContext...")
-            self.zmqContext.destroy()
-            logging.debug("closing zmqContext...done.")
-        except:
-            logging.debug("closing zmqContext...failed.")
-            logging.error(sys.exc_info())
+        finally:
+            logging.debug("shutting down zeromq...")
+            try:
+                fileMover.stop()
+                logging.debug("shutting down zeromq...done.")
+            except:
+                logging.error(sys.exc_info())
+                logging.error("shutting down zeromq...failed.")
+
+            # give the other processes time to close the sockets
+            time.sleep(0.1)
+            try:
+                logging.debug("closing zmqContext...")
+                self.zmqContext.destroy()
+                logging.debug("closing zmqContext...done.")
+            except:
+                logging.debug("closing zmqContext...failed.")
+                logging.error(sys.exc_info())