Multiple IPs working from webui

Casey Boettcher · Casey Boettcher · commit 396ac9f05357 · 2017-10-03T07:52:29.000-04:00
diff --git a/README.md b/README.md
@@ -1,15 +1,48 @@
 ### Python Challenge
 
 ```
-Usage: xfipchk.py [-h] api_authN_file [ip_address]
+usage: xfipchk.py [-h] {cli,web} ...
+
+Use the X-Force API to check IP address reputation.
 
 positional arguments:
-  api_authN_file  Path to a file containing your X-Force credentials, key and
-                  password on first and second lines, respectively.
-                  
-  ip_address      An IP address to be checked via X-Force. If the IP address
-                  is omitted or invalid, the user will be prompted for one.
-
-optional arguments:
-  -h, --help      show this help message and exit
+  {cli,web}   Mutually exclusive sub-commands
+    cli       Command-line Interface; run 'xfipchk cli -h' to see options
+    web       Web interface; run 'xfipchk web -h' to see options
+
+
+cli:
+    xfipchk.py cli [-h] [-o [output_file]]
+                          [-i ip_address | -I file_of_ip_addresses]
+                          authN
+
+    positional arguments:
+      authN                 Path to a file containing your X-Force credentials,
+                            key and password on first and second lines,
+                            respectively.
+
+    optional arguments:
+      -h, --help            show this help message and exit
+      -o [output_file], --out [output_file]
+                            Write result of X-Force call to file; if this option
+                            is elected but no filename is provided, a file will be
+                            created for the user.
+      -i ip_address, --ip ip_address
+                            An IP address to be checked via X-Force. If the
+                            IPaddress is omitted or invalid, the user will be
+                            prompted for one.
+      -I file_of_ip_addresses, --Ips file_of_ip_addresses
+                            A file containing IP addresses, one per line.
+
+web:
+    usage: xfipchk.py web [-h] [-p PORT] [-a ADDRESS]
+
+    Web Interface:
+      You may specify the address and port to bind to; defaults are 127.0.0.1
+      and 8000
+
+      -p PORT, --port PORT
+      -a ADDRESS, --address ADDRESS
+
+
 ```
diff --git a/web/webui.py b/web/webui.py
@@ -21,9 +21,7 @@ def process_form(self, api_key, api_password, ip_addresses):
         if xfipchk.validate_api_creds(api_key.strip()) and xfipchk.validate_api_creds(api_password.strip()):
             form_ips = []
             if isinstance(ip_addresses, str):
-                form_ips.append(ip_addresses)
-            elif isinstance(ip_addresses, list):
-                form_ips.extend(ip_addresses)
+                form_ips = ip_addresses.splitlines()
             good_ips = []
             for i in form_ips:
                 if xfipchk.validate_ip(i):
@@ -33,8 +31,26 @@ def process_form(self, api_key, api_password, ip_addresses):
             return cherrypy.HTTPError("400: Bad Request", 400)
 
     @cherrypy.expose()
-    def stop_demo(self, stop_demo):
+    def stop_demo(self):
         cherrypy.engine.stop()
 
+
 if __name__ == '__main__':
-    xfipchk.start_server()
+    webapp = XforceForm('127.0.0.1', 8000)
+    #d = cherrypy.process.plugins.Daemonizer(cherrypy.engine)
+    #d.subscribe()
+    cherrypy.tree.mount(webapp, config='./server.cfg')
+
+    if hasattr(cherrypy.engine, 'signal_handler'):
+        cherrypy.engine.signal_handler.subscribe()
+
+    # Initialize console control
+    if hasattr(cherrypy.engine, "console_control_handler"):
+        cherrypy.engine.console_control_handler.subscribe()
+
+    cherrypy.engine.start()
+
+    #pidfile = tempfile.TemporaryFile(prefix='xfipchk', suffix='.pid')
+    #PIDFile(cherrypy.engine, pidfile).subscribe()
+
+    cherrypy.engine.block()
diff --git a/web/xfipchk.html b/web/xfipchk.html
@@ -14,14 +14,16 @@
 
             if (conf)
             {
-                $.post( "/stop_demo" )
+                $.ajax( {url: "/stop_demo"} );
             }
         }
 
         function check_ips()
         {
             var req = $.ajax({'url': '/process_form'});
-            req.done(function (data){ $( ".result" ).html( data ); }, "json");
+            req.done(function (data){
+                $.getElementById("results_div").setAttribute("hidden")
+                $( ".result" ).html( data ); }, "json");
         }
 
     </script>
diff --git a/xfipchk.py b/xfipchk.py
@@ -24,8 +24,6 @@
 XFORCE_API_IP_REP = 'ipr'
 XFORCE_CRED_PATTERN = '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-global pidfile
-
 
 def parse_args():
     """
@@ -152,7 +150,9 @@ def call_xforce_api(address_list, key, password):
     Call the ipr method of the X-Force API using the IP address(es) contained in the parameter. Results are written
     to a file or stdout (default).
 
-    :param address_list:  a list of IP addresses
+    :param address_list:    a list of IP addresses
+    :param key:             X-Force API key
+    :param password:             X-Force API password
     :return:    a list of json objects
     """
     results = []
@@ -195,33 +195,22 @@ def start_server(address='127.0.0.1', port=8000):
     webapp = web.webui.XforceForm(address, port)
     d = cherrypy.process.plugins.Daemonizer(cherrypy.engine)
     d.subscribe()
-    #cherrypy.config.update('server.cfg')
     cherrypy.tree.mount(webapp, config='./server.cfg')
-    #cherrypy.tree.mount(webapp)
     cherrypy.engine.start()
+
     pidfile = tempfile.TemporaryFile(prefix='xfipchk', suffix='.pid')
     PIDFile(cherrypy.engine, pidfile).subscribe()
 
-    cherrypy.engine.subscribe('stop', cleanup(pidfile))
     cherrypy.engine.block()
 
-    return pidfile.name
-
-
-def cleanup(pid_file):
-    print(pid_file.name)
-    if os.path.exists(pid_file):
-        cherrypy.engine.stop()
-
 
 def main():
-    global pidfile
     args = parse_args()
     # if port is in Namespace object, assume web interface
     if hasattr(args, 'port'):
         # TODO: should use a context manager here
         try:
-            pidfile = start_server(args.address, args.port)
+            start_server(args.address, args.port)
         except (ConnectionError, KeyboardInterrupt) as err:
             print("Server failed to start: {}".format(err))
 

Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,16 @@`
`14`	`14`
`15`	`15`	`if (conf)`
`16`	`16`	`{`
`17`		`- $.post( "/stop_demo" )`
	`17`	`+ $.ajax( {url: "/stop_demo"} );`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`function check_ips()`
`22`	`22`	`{`
`23`	`23`	`var req = $.ajax({'url': '/process_form'});`
`24`		`- req.done(function (data){ $( ".result" ).html( data ); }, "json");`
	`24`	`+ req.done(function (data){`
	`25`	`+ $.getElementById("results_div").setAttribute("hidden")`
	`26`	`+ $( ".result" ).html( data ); }, "json");`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`</script>`