Add port forwarding page

Add the port forwarding page that has the table showing current
port forwards and a link to add a new one.  Using the generic
tables infrastructure this was not a huge deal.  The work went
along these lines:

1. Add the model class to model.hpp/model.cpp
2. Add the model class to the two factories in model.cpp
3. Create a form that references the model
4. Add pyrobox.js and a call to json_forms_and_tables
   that references the form
5. Add the table to the html page that is referenced by the form
6. Wrap the table with a popup add class if desired
7. Fix any bugs that appear and do regression testing on
   existing tables to make sure changes didn't break those too.

This is the path that I followed to add this page.  In the
bug fixing department, here is a laundry list of what I found:

1. Not all items are inline-form ready.  I had to modify the
   select form item in pyrobox.js to render properly.
2. db.cpp was not properly handling null fields in the database
3. Table sorter does not appear to like empty tables. (not fixed)
4. The add new row logic does not accomodate empty tables. (not fixed)

Signed-off-by: Vernon Mauery <[email protected]>

Author: vmauery

fcgi/db.cpp

@@ -7,11 +7,11 @@ using namespace std;
 static int parse_rows(void *arg, int col_count, char **columns, char **col_names) {
 	db::Results *results = (db::Results *)arg;
 	db::Result row;
+	char * null="";
 	for (int i=0; i<col_count; i++) {
-//		cout << col_names[i] << " => " << columns[i] << ", ";
-		row[col_names[i]] = columns[i];
+		// info(col_names[i] << " => " << (columns[i]?columns[i]:null) << ", ");
+		row[col_names[i]] = (columns[i]?columns[i]:null);
 	}
-//	cout << endl;
 	results->push_back(row);
 	return 0;
 }

fcgi/model.cpp

@@ -51,6 +51,9 @@ list<model::ptr> model::fetch_all(const string& type) {
 	if (type == "deny_dhcp") {
 		return deny_dhcp::all();
 	}
+	if (type == "firewall_forward") {
+		return firewall_forward::all();
+	}
 	return list<model::ptr>();
 }
 
@@ -62,6 +65,9 @@ model::ptr model::factory(const string& type, const db::Result& vals) {
 	if (type == "deny_dhcp") {
 		return deny_dhcp::create(vals);
 	}
+	if (type == "firewall_forward") {
+		return firewall_forward::create(vals);
+	}
 	return model::ptr();
 }
 
@@ -213,6 +219,41 @@ string deny_dhcp::json() {
 }
 
 
+//////////////////////////////////////////////////////////////////////////
+// class firewall_forward
+/////////////////////////////////////////////////////////////////////////
+const char firewall_forward::_table_name[] = "app_portforward";
+
+const vector<string>& firewall_forward::names() const {
+	static vector<string> _names;
+	if (_names.size() == 0) {
+		_names.push_back("id");
+		_names.push_back("protocol");
+		_names.push_back("src_port");
+		_names.push_back("port_range");
+		_names.push_back("dst_addr");
+		_names.push_back("dst_port");
+	}
+	return _names;
+}
+
+model_all(firewall_forward)
+model_create(firewall_forward)
+
+string firewall_forward::json() {
+	stringstream ss;
+	ss << "{ "
+	   << "\"id\": " << id() << ", "
+	   << "\"protocol\": \"" << protocol() << "\", "
+	   << "\"src_port\": \"" << src_port() << "\", "
+	   << "\"port_range\": \"" << port_range() << "\", "
+	   << "\"dst_addr\": \"" << dst_addr() << "\", "
+	   << "\"dst_port\": \"" << dst_port() << "\", "
+	   << " }";
+	return ss.str();
+}
+
+
 //////////////////////////////////////////////////////////////////////////
 // class variable
 /////////////////////////////////////////////////////////////////////////

fcgi/model.hpp

@@ -65,7 +65,7 @@ class static_dhcp : public model {
 
 	private:
 		static const char _table_name[];
-	
+
 	// variable access interface
 	public:
 		virtual std::string json();
@@ -98,7 +98,7 @@ class deny_dhcp : public model {
 
 	private:
 		static const char _table_name[];
-	
+
 	// variable access interface
 	public:
 		virtual std::string json();
@@ -108,6 +108,43 @@ class deny_dhcp : public model {
 		void mac_addr(const std::string& value) { _set("mac_addr", value); }
 };
 
+//////////////////////////////////////////////////////////////////////////
+// class firewall_forward
+/////////////////////////////////////////////////////////////////////////
+class firewall_forward : public model {
+	public:
+		typedef boost::shared_ptr<firewall_forward> ptr;
+
+	public:
+		virtual ~firewall_forward() {}
+		static std::list<model::ptr> all();
+		static firewall_forward::ptr create(const db::Result& vals);
+
+	protected:
+		firewall_forward() : model() {}
+		firewall_forward(long int i) : model(i) {}
+		firewall_forward(const db::Result& vals) : model(vals) {}
+		virtual const char *table_name() const { return _table_name; }
+		virtual const std::vector<std::string>& names() const;
+
+	private:
+		static const char _table_name[];
+
+	// variable access interface
+	public:
+		virtual std::string json();
+		std::string& protocol() { return _get("protocol"); }
+		void protocol(const std::string& value) { _set("protocol", value); }
+		std::string& src_port() { return _get("src_port"); }
+		void src_port(const std::string& value) { _set("src_port", value); }
+		std::string& port_range() { return _get("port_range"); }
+		void port_range(const std::string& value) { _set("port_range", value); }
+		std::string& dst_addr() { return _get("dst_addr"); }
+		void dst_addr(const std::string& value) { _set("dst_addr", value); }
+		std::string& dst_port() { return _get("dst_port"); }
+		void dst_port(const std::string& value) { _set("dst_port", value); }
+};
+
 //////////////////////////////////////////////////////////////////////////
 // class variable
 /////////////////////////////////////////////////////////////////////////
@@ -130,7 +167,7 @@ class variable : public model {
 
 	private:
 		static const char _table_name[];
-	
+
 	// variable access interface
 	public:
 		virtual std::string json();

html/js/json/forms/firewall_forward

@@ -0,0 +1,38 @@
+model:
+	name: firewall_forward
+	id: port-forward-form
+	action: none
+	actions: edit delete
+	class: ajax json
+	elements:
+		hidden:
+			name: id
+		end: hidden
+		select:
+			name: protocol
+			label: Protocol
+			default_value: tcp
+			options:
+				tcp: TCP
+				udp: UDP
+			end: options
+		end: select
+		textbox:
+			name: src_port
+			label: Source Port
+		end: textbox
+		textbox:
+			name: port_range
+			label: Port Range
+		end: textbox
+		textbox:
+			name: dst_addr
+			label: Destination IP Address
+		end: textbox
+		textbox:
+			name: dst_port
+			label: Destination Port
+		end: textbox
+	end: elements
+end: model
+

html/js/pyrobox.js

@@ -294,9 +294,14 @@ function is_object(obj) {
 		return ret;
 	}
 
-	$.render_select = function(el) {
+	$.render_select = function(el, input_only) {
 		var attributes = [];
 		element_common(el, attributes);
+		if (input_only) {
+			return '<select name="'+el.name+'" id="'+el.id+'">\n'+
+			render_select_options(el) +
+			'</select><span class="error"></span>\n</div>';
+		}
 		return '<div class="field-item">\n'+
 			'<div class="label"><label for="'+el.id+'">'+el.label+'</label><div class="description">'+el.description+'</div></div>\n'+
 			'<select name="'+el.name+'" id="'+el.id+'">\n'+
@@ -527,7 +532,15 @@ function is_object(obj) {
 			if (el.type == 'hidden') continue;
 			el.id = 'id_row_'+obj.id+'-'+form.name+'-'+el.name;
 			var field = {type: el.type, name: el.name, id: el.id, value: obj[el.name]};
-			ret += '<td id="row_'+obj.id+'-'+form.name+'-'+el.name+'">'+eval('$.render_'+el.type+'(field, 1)')+'</td>\n';
+			if (el.options != null) {
+				field.options = el.options;
+			}
+			ret += '<td id="row_'+obj.id+'-'+form.name+'-'+el.name+'">';
+			if (typeof el.type == 'string' &&
+					eval('typeof $.render_' + el.type) == 'function') {
+				ret += eval('$.render_' + el.type + '(field, 1)');
+			}
+			ret += '</td>\n';
 		}
 		ret += '<td>';
 		var actions = ['save', 'cancel'];

html/pages/firewall/forward.html

@@ -12,8 +12,19 @@
 
 <script type="text/javascript" src="/js/jquery.js"></script>
 <script type="text/javascript" src="/js/jquery.combobox.js"></script>
+<script type="text/javascript" src="/js/jquery.tablesorter.js"></script>
+<script type="text/javascript" src="/js/jquery.form.js"></script>
 <script type="text/javascript" src="/js/pyrobox.js"></script>
 
+<script type="text/javascript">
+
+(function($) {$(function() {
+
+$.json_forms_and_tables([], ['firewall_forward']);
+$.activate_add_popups();
+
+}); })(jQuery);
+</script>
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="/theme/flames/images/favicon.ico" type="image/x-icon" />
@@ -62,8 +73,6 @@ <h2>Change Status</h2>
 		<div id="blocks-pre"></div>
 
 
-
-
 <!--
 	Here we need to render a two-level ul tree
 	that represents the tabs for this section
@@ -72,16 +81,11 @@ <h2>Change Status</h2>
 
 <div id="content">
 
-
-
-
-
-
-<form id="port-forward-form">
-</form>
-
-
-
+<div id="port-forward-form-popup" class="add-popup">
+<h2>Port Forwarding</h2>
+<table class="tablesorter" id="port-forward-form">
+</table>
+</div>
 
 
 </div>