ajax call from main form working

Casey Boettcher · Casey Boettcher · commit e3c26b6a0cf6 · 2017-10-03T00:56:10.000-04:00
diff --git a/web/server.cfg b/web/server.cfg
@@ -1,6 +1,10 @@
 
 [/]
-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.root = os.path.abspath(os.getcwd())
+tools.staticdir.index = "xfipchk.html"
+tools.staticdir.dir = os.getcwd()
+
+[/process_form]
+tools.response_headers.on = True
+tools.response_headers.headers = [('Content-Type', 'application/json')]
diff --git a/web/webui.py b/web/webui.py
@@ -3,29 +3,38 @@
 import cherrypy
 import xfipchk
 
+
 class XforceForm(object):
+
     def __init__(self, address='127.0.0.1', port=8000):
-        cherrypy.config.update({'tools.staticdir.debug': True})
-        # cherrypy.config.update('web/server.cfg')
         # parms override anything in config
         cherrypy.config.update({'server.socket_port': port,
                                 'server.socket_host': address})
 
-
     @cherrypy.expose
     def index(self):
         return "/"
 
     @cherrypy.expose()
+    @cherrypy.tools.json_out()
     def process_form(self, api_key, api_password, ip_addresses):
-        if isinstance(ip_addresses, list):
-            xfipchk.r
-        xfipchk.call_xforce_api(ip_addresses, api_key, api_password)
+        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)
+            good_ips = []
+            for i in form_ips:
+                if xfipchk.validate_ip(i):
+                    good_ips.append(i)
+            return xfipchk.call_xforce_api(good_ips, api_key, api_password)
+        else:
+            return cherrypy.HTTPError("400: Bad Request", 400)
 
     @cherrypy.expose()
     def stop_demo(self, stop_demo):
         cherrypy.engine.stop()
 
-
 if __name__ == '__main__':
-    cherrypy.quickstart(XforceForm())
+    xfipchk.start_server()
diff --git a/web/xfipchk.html b/web/xfipchk.html
@@ -14,24 +14,16 @@
 
             if (conf)
             {
-                $.post("/stop_demo", function(data){ alert("Data Loaded: " + data); });
+                $.post( "/stop_demo" )
             }
-                /*$.post( "/stop_demo", function() {
-
-                })
-                .success(data, status, ajaxRequestObj) function() {
+        }
 
-                .done(function() {
-                  alert( "second success" );
-                })
-                .fail(function() {
-                alert( "error" );
-                })
-                .always(function() {
-                alert( "finished" );
-                });
-            }*/
+        function check_ips()
+        {
+            var req = $.ajax({'url': '/process_form'});
+            req.done(function (data){ $( ".result" ).html( data ); }, "json");
         }
+
     </script>
     <link rel="stylesheet" type="text/css" href="xfipchk.css"/>
 </head>
@@ -42,7 +34,7 @@
             <p><span class="instructions">Instructions:</span></p>
             <ol>
                 <li>Paste your IBM X-Force API key and password into the corresponding fields.</li>
-                <li>Enter IP addresses in the box labeled accordingly. They must be delimited by commas or newlines.</li>
+                <li>Enter IP addresses in the box labeled accordingly, each IP address on its own line.</li>
                 <li>Press the Submit button to call the API.</li>
                 <li>Review the results.</li>
                 <li>Press the Stop Demo button to stop the demo.</li>
@@ -61,7 +53,7 @@
             <textarea class="ip_addresses" name="ip_addresses" id="ip_addresses"></textarea>
         </div>
         <div id="std_buttons">
-            <button id="submit" type="submit" form="the_form" value="submit">Submit</button> <button id="reset" type="reset" form="the_form" value="reset">Reset</button>
+            <button id="submit" form="the_form" onclick="check_ips()">Submit</button> <button id="reset" type="reset" form="the_form" value="reset">Reset</button>
         </div>
     </form>
     <form id="stop_form">
diff --git a/xfipchk.py b/xfipchk.py
@@ -190,22 +190,14 @@ 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()
-        }
-    }
+    if not os.path.abspath(os.getcwd()).endswith("python_challenge/web"):
+        os.chdir('./web')
     webapp = web.webui.XforceForm(address, port)
     d = cherrypy.process.plugins.Daemonizer(cherrypy.engine)
     d.subscribe()
-    cherrypy.config.update(config)
-    cherrypy.tree.mount(webapp, config=config)
+    #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()
@@ -231,7 +223,7 @@ def main():
         try:
             pidfile = start_server(args.address, args.port)
         except (ConnectionError, KeyboardInterrupt) as err:
-            print("Server failed to start: {}".format(err.strerror))
+            print("Server failed to start: {}".format(err))
 
     # assume cli if user passed in api key file
     elif hasattr(args, 'authN'):
