switched to cherrpy daemon

Casey Boettcher · Casey Boettcher · commit bf72ef284881 · 2017-10-02T14:37:59.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ out
 gen
 test/xforce.cfg
 notes.txt
-
+keys.txt
+__pycache__/*
diff --git a/__init__.py b/__init__.py
diff --git a/test/__init__.py b/test/__init__.py
diff --git a/test/data/creds.txt b/test/data/creds.txt
@@ -0,0 +1,11 @@
+720e6119-4e9f-4488-bd9c-9b270f18aebe
+5338fcd2-28b1-4c09-a698-607$11bd54b0
+5339fcd2-28c1-4d09-a798-617911bd54b0
+5338fcd2-28b1-4c09-a698-607911d54b0
+5338fcd2-28b1-4c09-a698-627911bd54b0
+338fcd2-28b1-4c09-a698-607911bd54b0
+5338fcd2-28b1-4c09-a698-607911bd54b0
+5z38fcd2-28b1-4c09-a6x8-607911bdy4b0
+5338fcd2-28b1-4c09-a698-607911bd54b0
+338fcd22-28b1-4c09-A698-607911bd54b0
+5338-28b1-adc84c09-a695208-6079154b0
diff --git a/test/data/ips.txt b/test/data/ips.txt
@@ -15,6 +15,6 @@ cc85:e78:948c:2ad6:5959:102d:10cb:31c4
 dbb1:39b7:1e8f:1a2a:3737:9721:5d16:166
 131.isle.12.9
 1d67:bd71:56d9:13f3:5499:25b:cc84:f7e4
-f4bc:bab1:4d39:9c0b:8797:a867:e6ce:6629
+xbab1:4M39:9c0b:87j7:a867:e6ce:6629
 193.131.176.37
 239.244.72.99
diff --git a/test/test_xfipchk.py b/test/test_xfipchk.py
@@ -1,25 +1,46 @@
+import os
+import requests
 import unittest
 import xfipchk
 
 
 class TestXfipchk(unittest.TestCase):
-    API_CREDS = './xforce.cfg'
+    API_CREDS = '../keys.txt'
+    CREDS_TEST_FILE = './data/creds.txt'
+    ADDRESS_TEST_FILE = './data/ips.txt'
 
     def test_validate_ip(self):
-        ADDRESS_FILE = './ips.txt'
         BAD_IPS = 4
         GOOD_IPS = 16
-
-        good, bad = 0
-        with open(ADDRESS_FILE, 'r') as ipfile:
+        good = bad = 0
+        with open(self.ADDRESS_TEST_FILE, 'r') as ipfile:
             for ip in ipfile:
-                if xfipchk(ip):
+                if xfipchk.validate_ip(ip):
                     good += 1
                 else:
                     bad += 1
 
         assert (good == GOOD_IPS and bad == BAD_IPS)
 
+    def test_validate_api_creds(self):
+        good = bad = 0
+        GOOD_TOKENS = 5
+        BAD_TOKENS = 6
+        with open(self.CREDS_TEST_FILE, 'r') as file:
+            for line in file:
+                if xfipchk.validate_api_creds(line.strip()):
+                    good += 1
+                else:
+                    bad += 1
+
+    def test_start_server(self):
+        os.chdir('..')
+        xfipchk.start_server()
+        try:
+            r = requests.get('http://127.0.0.1:8080')
+        except:
+            assert False
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/web/__init__.py b/web/__init__.py
diff --git a/web/server.cfg b/web/server.cfg
@@ -4,4 +4,3 @@ tools.sessions.on: True
 tools.staticdir.on = True
 tools.staticdir.root = os.path.abspath('.')
 tools.staticdir.dir = os.path.join(os.path.abspath('.'), 'web')
-tools.staticdir.index = "xfipchk.html"
diff --git a/xfipchk.py b/xfipchk.py
@@ -18,6 +18,7 @@
 import IPy
 import web.webui
 import cherrypy
+from cherrypy.process.plugins import PIDFile
 
 XFORCE_API_BASE = 'https://api.xforce.ibmcloud.com'
 XFORCE_API_IP_REP = 'ipr'
@@ -187,23 +188,39 @@ def print_json_file(results, file):
 
 
 def start_server(address='127.0.0.1', port=8000):
+    os.chdir('./web')
+    print("This is getcwd 1: {}".format(os.path.abspath(os.getcwd())))
+    print("This is getcwd 2: {}".format(os.getcwd()))
+    config = {'/':
+        {
+            'tools.staticdir.on': True,
+            'tools.staticdir.root': os.path.abspath(os.getcwd()),
+            'tools.staticdir.index': "xfipchk.html",
+            'tools.staticdir.dir': os.getcwd()
+        }
+    }
     webapp = web.webui.XforceForm(address, port)
-    cherrypy.quickstart(webapp, '/', './web/server.cfg')
+    d = cherrypy.process.plugins.Daemonizer(cherrypy.engine)
+    d.subscribe()
+    cherrypy.config.update(config)
+    cherrypy.tree.mount(webapp, config=config)
+    cherrypy.engine.start()
+    pidfile = tempfile.TemporaryFile(suffix='.pid')
+    PIDFile(cherrypy.engine, pidfile).subscribe()
+    cherrypy.engine.block()
 
 
 def main():
     args = parse_args()
     # if port is in Namespace object, assume web interface
     if hasattr(args, 'port'):
         # TODO: should use a context manager here
-        current = os.curdir
         try:
-            os.chdir('./web')
-            start_server(args.address, args.port)
-        except OSError as ose:
+            start_server(args.address, args.port, pidfile)
+        except:
             print(ose.strerror)
         finally:
-            os.chdir(current)
+
     # assume cli if user passed in api key file
     elif hasattr(args, 'authN'):
         ip = None
