Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

haproxy-devel, version bump to 0.56 including a variety of new features and fixes #510

Merged
merged 10 commits into from
Apr 9, 2018
Merged

haproxy-devel, version bump to 0.56 including a variety of new features and fixes #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
01a504d
haproxy-devel, fix widget client traffic statistics / layout
PiBa-NL Feb 6, 2018
a43bde6
haproxy-devel, fix host/path acls for http-response actions
PiBa-NL Apr 7, 2018
a5eaae1
haproxy-devel, fix processing of fixed ips and subnets that are menti…
PiBa-NL Apr 7, 2018
00e4e2a
haproxy-devel, skip saving empty options from action/acl/other htmllists
PiBa-NL Apr 7, 2018
2f6b583
haproxy-devel, add support for server-template definition for automat…
PiBa-NL Apr 7, 2018
f57bf91
haproxy-devel, several small improvements to the webgui
PiBa-NL Apr 7, 2018
97e11d0
haproxy-devel, bump version to 0.56
PiBa-NL Apr 7, 2018
ad2a5ef
haproxy-devel, fix calling lua service script
PiBa-NL Apr 7, 2018
0b33ce7
haproxy-devel, avoid generating empty array items when editing a othe…
PiBa-NL Apr 8, 2018
0b48c1a
haproxy-devel, fix setting stylesheet rules in Firefox when 3rd party…
PiBa-NL Apr 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions net/pfSense-pkg-haproxy-devel/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# $FreeBSD$

PORTNAME= pfSense-pkg-haproxy-devel
PORTVERSION= 0.55
PORTREVISION= 2
PORTVERSION= 0.56
CATEGORIES= net
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
153 changes: 120 additions & 33 deletions net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy/haproxy.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,25 @@ $a_frontendmode['health'] = array('name' => "health", 'shortname' => "health");
global $a_acltypes;
$a_acltypes = array();
$a_acltypes["host_starts_with"] = array('name' => 'Host starts with:',
'mode' => 'http', 'syntax' => 'hdr_beg(host) -i %1$s');
'mode' => 'http', 'syntax' => 'var(txn.txnhost) -m beg -i %1$s', 'advancedoptions' => "http-request set-var(txn.txnhost) hdr(host)");
$a_acltypes["host_ends_with"] = array('name' => 'Host ends with:',
'mode' =>'http', 'syntax' => 'hdr_end(host) -i %1$s');
'mode' =>'http', 'syntax' => 'var(txn.txnhost) -m end -i %1$s', 'advancedoptions' => "http-request set-var(txn.txnhost) hdr(host)");
$a_acltypes["host_matches"] = array('name' => 'Host matches:',
'mode' =>'http', 'syntax' => 'hdr(host) -i %1$s');
'mode' =>'http', 'syntax' => 'var(txn.txnhost) -m str -i %1$s', 'advancedoptions' => "http-request set-var(txn.txnhost) hdr(host)");
$a_acltypes["host_regex"] = array('name' => 'Host regex:',
'mode' =>'http', 'syntax' => 'hdr_reg(host) -i %1$s');
'mode' =>'http', 'syntax' => 'var(txn.txnhost) -m reg -i %1$s', 'advancedoptions' => "http-request set-var(txn.txnhost) hdr(host)");
$a_acltypes["host_contains"] = array('name' => 'Host contains:',
'mode' => 'http', 'syntax' => 'hdr_sub(host) -i %1$s');
'mode' => 'http', 'syntax' => 'var(txn.txnhost) -m sub -i %1$s', 'advancedoptions' => "http-request set-var(txn.txnhost) hdr(host)");
$a_acltypes["path_starts_with"] = array('name' => 'Path starts with:',
'mode' => 'http', 'syntax' => 'path_beg -i %1$s');
'mode' => 'http', 'syntax' => 'var(txn.txnpath) -m beg -i %1$s', 'advancedoptions' => "http-request set-var(txn.txnpath) hdr(path)");
$a_acltypes["path_ends_with"] = array('name' => 'Path ends with:',
'mode' => 'http', 'syntax' => 'path_end -i %1$s');
'mode' => 'http', 'syntax' => 'var(txn.txnpath) -m end -i %1$s', 'advancedoptions' => "http-request set-var(txn.txnpath) hdr(path)");
$a_acltypes["path_matches"] = array('name' => 'Path matches:',
'mode' => 'http', 'syntax' => 'path -i %1$s');
'mode' => 'http', 'syntax' => 'var(txn.txnpath) -m str -i %1$s', 'advancedoptions' => "http-request set-var(txn.txnpath) hdr(path)");
$a_acltypes["path_regex"] = array('name' => 'Path regex:',
'mode' => 'http', 'syntax' => 'path_reg -i %1$s');
'mode' => 'http', 'syntax' => 'var(txn.txnpath) -m reg -i %1$s', 'advancedoptions' => "http-request set-var(txn.txnpath) hdr(path)");
$a_acltypes["path_contains"] = array('name' => 'Path contains:',
'mode' => 'http', 'syntax' => 'path_sub -i %1$s');
'mode' => 'http', 'syntax' => 'var(txn.txnpath) -m sub -i %1$s', 'advancedoptions' => "http-request set-var(txn.txnpath) hdr(path)");
$a_acltypes["url_parameter"] = array('name' => 'Url parameter contains:',
'mode' => 'http', 'syntax' => 'url_param({parameter}) -i %1$s',
'fields' => array(
Expand Down Expand Up @@ -252,7 +252,7 @@ $a_action["use_backend"] = array('name' => "Use Backend", 'mode' => '', 'syntax'
));
$a_action["use_server"] = array('name' => "Use Server", 'mode' => '', 'syntax' => 'use-server {server}', 'usage' => 'backend',
'fields' => array(
'server' => array('name'=>"server",'columnheader'=>"Server",'type'=>"select",'size'=>"50",'mask'=>'server')
'server' => array('name'=>"server",'columnheader'=>"Server",'type'=>"textbox",'size'=>"50",'mask'=>'server')
));
//
$a_action["custom"] = array('name' => "Custom", 'mode' => '', 'syntax' => '{customaction}',
Expand Down Expand Up @@ -309,6 +309,23 @@ $a_action["http-request_replace-value"] = array('name' => "http-request header r
array('name'=>"find",'columnheader'=>"Find regex",'type'=>"textbox",'size'=>"50",'mask'=>'match-regex'),
array('name'=>"replace",'columnheader'=>"Replace by",'type'=>"textbox",'size'=>"50",'mask'=>'replace-fmt')
));

$a_action["http-request_set-method"] = array('name' => "http-request set method", 'mode'=> 'http', 'syntax' => 'http-request set-method {fmt}',
'fields' => array(
array('name'=>"fmt",'columnheader'=>"New logformat value",'type'=>"textbox",'size'=>"50",'mask'=>'logformat')
));
$a_action["http-request_set-path"] = array('name' => "http-request set path", 'mode'=> 'http', 'syntax' => 'http-request set-path {fmt}',
'fields' => array(
array('name'=>"fmt",'columnheader'=>"New logformat value",'type'=>"textbox",'size'=>"50",'mask'=>'logformat')
));
$a_action["http-request_set-query"] = array('name' => "http-request set query", 'mode'=> 'http', 'syntax' => 'http-request set-query {fmt}',
'fields' => array(
array('name'=>"fmt",'columnheader'=>"New logformat value",'type'=>"textbox",'size'=>"50",'mask'=>'logformat')
));
$a_action["http-request_set-uri"] = array('name' => "http-request set uri", 'mode'=> 'http', 'syntax' => 'http-request set-uri {fmt}',
'fields' => array(
array('name'=>"fmt",'columnheader'=>"New logformat value",'type'=>"textbox",'size'=>"50",'mask'=>'logformat')
));
//
$a_action["http-response_allow"] = array('name' => "http-response allow", 'mode'=> 'http', 'syntax' => 'http-response allow');
$a_action["http-response_deny"] = array('name' => "http-response deny", 'mode'=> 'http', 'syntax' => 'http-response deny');
Expand Down Expand Up @@ -344,6 +361,11 @@ $a_action["http-response_replace-value"] = array('name' => "http-response header
array('name'=>"find",'columnheader'=>"Find regex",'type'=>"textbox",'size'=>"50",'mask'=>'match-regex'),
array('name'=>"replace",'columnheader'=>"Replace by",'type'=>"textbox",'size'=>"50",'mask'=>'replace-fmt')
));
$a_action["http-response_set-status"] = array('name' => "http-response set status", 'mode'=> 'http', 'syntax' => 'http-response set-status {status} {reason}',
'fields' => array(
array('name'=>"status",'columnheader'=>"Status",'type'=>"textbox",'size'=>"50",'mask'=>'text'),
array('name'=>"reason",'columnheader'=>"Reason",'type'=>"textbox",'size'=>"50",'mask'=>'text','prefix'=>'reason')
));
//
$a_action["tcp-request_connection_accept"] = array('name' => "tcp-request connection accept", 'mode'=> '', 'syntax' => 'tcp-request connection accept');
$a_action["tcp-request_connection_reject"] = array('name' => "tcp-request connection reject", 'mode'=> '', 'syntax' => 'tcp-request connection reject');
Expand Down Expand Up @@ -414,37 +436,61 @@ function haproxy_portoralias_to_list($port_or_alias) {
return $portresult;
}
}
function haproxy_addressoralias_to_list($address_or_alias) {

function haproxy_expand_alias_array($address_or_alias) {
global $aliastable;
$result = array();
$alias_type = alias_get_type($address_or_alias);
if (!empty($alias_type)) {
$alias = $aliastable[$address_or_alias];
$items = explode(' ', $address_or_alias);

$i = 0;
while($i < count($items)) {
$item = $items[$i];
$alias_type = alias_get_type($item);
$alias = $aliastable[$item];
if ($alias_type == "url") {
$result = explode(' ',$alias);
$items = array_merge($items, explode(' ',$alias));
} else
if ($alias_type == "network") {
//$result = explode(' ',$alias);
$items = array_merge($items, explode(' ',$alias));
} else
if ($alias_type == "host") {
$result = explode(' ',$alias);
$items = array_merge($items, explode(' ',$alias));
} else {
$result[] = $item;
}
} else {
$result[] = $address_or_alias;
$i++;
}
return $result;
}

function haproxy_hostoralias_to_list($host_or_alias) {
if (is_alias($host_or_alias)){
$result = filter_expand_alias_array($host_or_alias);
} else {
$result = array();
$result[] = $host_or_alias;
function haproxy_filter_alias_array($list, $ip=false, $subnet=false, $hostname=false, $convertiptosubnet=false) {
$result = array();
foreach($list as $item) {
if ($ip && $ipv = is_ipaddr($item)) {
if ($convertiptosubnet) {
if ($ipv == 4) {
$item .= "/32";
} elseif ($ipv == 6) {
$item .= "/128";
}
}
$result[] = $item;
} elseif ($subnet && is_subnet($item)) {
$result[] = $item;
} elseif ($hostname && is_hostname($item)) {
$result[] = $item;
}
}
return $result;
}

function haproxy_hostoralias_to_list($host_or_alias) {
//used by source_ip acl
$items = haproxy_expand_alias_array($host_or_alias);
$result = haproxy_filter_alias_array($items, true, true);
return $result;
}

function haproxy_get_fileslist() {
// returns the files array with 'keys'.
$result = array();
Expand Down Expand Up @@ -842,7 +888,7 @@ function write_backend($configpath, $fd, $name, $pool, $backendsettings) {
}
fwrite ($fd, "\ttimeout server\t\t" . $pool['server_timeout'] . "\n");

if (empty($pool['retries'])) {
if (!is_numeric($pool['retries'])) {
$pool['retries'] = 3;
}
fwrite ($fd, "\tretries\t\t\t" . $pool['retries'] . "\n");
Expand Down Expand Up @@ -889,6 +935,7 @@ function write_backend($configpath, $fd, $name, $pool, $backendsettings) {
if (!is_array($a_acl)) {
$a_acl = array();
}
$advancedextra = array();
// ACL's
foreach ($a_acl as $entry) {
$aclitem = $entry['ref'];
Expand All @@ -908,7 +955,7 @@ function write_backend($configpath, $fd, $name, $pool, $backendsettings) {
$inspectdelay = $acltype['inspect-delay'];
}
if ($acltype['advancedoptions'] != '') {
$advancedextra[$acltype['syntax']] = $acltype['advancedoptions']."\n";
$advancedextra[$acltype['advancedoptions']] = $acltype['advancedoptions'];
}
if ($acltype['require_client_cert']) {
$needs_clientcert[$aclname] = true;
Expand Down Expand Up @@ -947,6 +994,9 @@ function write_backend($configpath, $fd, $name, $pool, $backendsettings) {
foreach($config_acls as $acl => $dummy) {
fwrite ($fd, $acl);
}
foreach($advancedextra as $extra) {
fwrite ($fd, "\t".$extra."\n");
}

$a_actionitems = $pool['a_actionitems']['item'];
if (!is_array($a_actionitems)) {
Expand Down Expand Up @@ -976,6 +1026,9 @@ function write_backend($configpath, $fd, $name, $pool, $backendsettings) {
}*/
$parameter = $backendname;
}
if (!empty($parameter) && !empty($field['prefix'])) {
$parameter = $field['prefix'] . " ". $parameter;
}
$action_cfg = str_replace("{{$fieldname}}", $parameter, $action_cfg);
}
}
Expand Down Expand Up @@ -1138,7 +1191,12 @@ function write_backend($configpath, $fd, $name, $pool, $backendsettings) {
if (count($servers) > 1) {
$servername .= "_" . $counter;
}
fwrite ($fd, "\tserver\t\t\t" . $servername . " " . $server . "$ssl$cookie$checkinter$checkport$agentcheck $isbackup$weight$maxconn$cafile$crlfile$verifynone$verifyhost$crtfile$server_options{$advanced_txt} {$be['advanced']}\n");
if (is_numeric($be['istemplate'])) {
$istemplate = " {$be['istemplate']}";
fwrite ($fd, "\tserver-template\t\t\t" . $servername . $istemplate . " " . $server . "$ssl$cookie$checkinter$checkport$agentcheck $isbackup$weight$maxconn$cafile$crlfile$verifynone$verifyhost$crtfile$server_options{$advanced_txt} {$be['advanced']}\n");
} else {
fwrite ($fd, "\tserver\t\t\t" . $servername . " " . $server . "$ssl$cookie$checkinter$checkport$agentcheck $isbackup$weight$maxconn$cafile$crlfile$verifynone$verifyhost$crtfile$server_options{$advanced_txt} {$be['advanced']}\n");
}
$counter++;
}
}
Expand Down Expand Up @@ -1829,7 +1887,7 @@ function haproxy_writeconf($configpath) {
$inspectdelay = $acltype['inspect-delay'];
}
if ($acltype['advancedoptions'] != '') {
$advancedextra[$acltype['syntax']] = $acltype['advancedoptions']."\n";
$advancedextra[$acltype['advancedoptions']] = $acltype['advancedoptions'];
}
if ($acltype['require_client_cert']) {
$needs_clientcert[$aclname] = true;
Expand Down Expand Up @@ -1890,6 +1948,9 @@ function haproxy_writeconf($configpath) {
}
$parameter = $backendname;
}
if (!empty($parameter) && !empty($field['prefix'])) {
$parameter = $field['prefix'] . " ". $parameter;
}
$action_cfg = str_replace("{{$fieldname}}", $parameter, $action_cfg);
}
}
Expand Down Expand Up @@ -1917,7 +1978,7 @@ function haproxy_writeconf($configpath) {

if ($actionid == "use_backend") {
if (empty($condition)) {
$config_usedefaultbackends .= "\tdefault_backend {$parameter}{$condition}\n";
$config_usedefaultbackends .= "\tdefault_backend {$parameter}\n";
} else {
if (!empty($actionitem['acl'])){
$config_usebackends .= $action;
Expand Down Expand Up @@ -2459,8 +2520,8 @@ function get_frontend_bindips($frontend) {
if (isset($extaddr['extaddr']) && $extaddr['extaddr'] != "custom") {
$a_ip[] = haproxy_interface_ip($extaddr['extaddr']);
} else {
$iporalias = $extaddr['extaddr_custom'];
$a_ip = haproxy_addressoralias_to_list($iporalias);
$items = haproxy_expand_alias_array($extaddr['extaddr_custom']);
$a_ip = haproxy_filter_alias_array($items, true);
}
foreach($a_ip as $ip) {
$portsnumeric = group_ports(haproxy_portoralias_to_list($extaddr['extaddr_port']));
Expand Down Expand Up @@ -2781,3 +2842,29 @@ function haproxy_find_create_certificate($certificatename) {
$a_cert[] = $cert;
return $cert;
}

function haproxy_config_init(){
global $config;
if (!is_array($config['installedpackages']['haproxy'])) {
$config['installedpackages']['haproxy'] = array();
}
$haproxycfg = &$config['installedpackages']['haproxy'];
if (!is_array($haproxycfg['email_mailers']['item'])) {
$haproxycfg['email_mailers']['item'] = array();
}
if (!is_array($haproxycfg['dns_resolvers']['item'])) {
$haproxycfg['dns_resolvers']['item'] = array();
}
if (!is_array($haproxycfg['ha_backends']['item'])) {
$haproxycfg['ha_backends']['item'] = array();
}
if (!is_array($haproxycfg['ha_pools']['item'])) {
$haproxycfg['ha_pools']['item'] = array();
}
if (!is_array($haproxycfg['ha_pools']['item'])) {
$haproxycfg['ha_pools']['item'] = array();
}
if (!is_array($haproxycfg['files']['item'])) {
$haproxycfg['files']['item'] = array();
}
}
8 changes: 5 additions & 3 deletions net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy/haproxy_htmllist.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,11 @@ class HaproxyHtmlList
}
foreach($fields as $item) {
$itemname = $item['name'];
$value[$itemname] = $_POST[$this->tablename.$itemname.$x];
if ($item['type'] == 'textarea') {
$value[$itemname] = base64_encode($value[$itemname]);
if (!empty($_POST[$this->tablename.$itemname.$x])) {
$value[$itemname] = $_POST[$this->tablename.$itemname.$x];
if ($item['type'] == 'textarea') {
$value[$itemname] = base64_encode($value[$itemname]);
}
}
$add_item |= isset($_POST[$this->tablename.$itemname.$x]);
}
Expand Down
4 changes: 2 additions & 2 deletions net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy/haproxy_socketinfo.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@ function haproxy_get_clients($show_traffic = false){// "show sess"
$session_data = haproxy_socket_command("show sess {$client['sessid']}");
$client['session_data'] = $session_data;

$req = explode(" ",$session_data[12]);
$req = explode(" ",$session_data[13]);
$x = explode("=",$req[7]);
$client['session_datareq'] = $x[1];
$res = explode(" ",$session_data[15]);
$res = explode(" ",$session_data[16]);
$x = explode("=",$res[7]);
$client['session_datares'] = $x[1];
}
Expand Down
44 changes: 44 additions & 0 deletions net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy/haproxy_utils.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,3 +520,47 @@ function haproxy_keyvalue_array($hap_array) {
}
return $result;
}

function haproxy_js_css() {
echo <<<PRE
function getCSSrule(cssID) {
var ss = document.styleSheets;
for (var i=0; i<ss.length; i++) {
var rules;
try {
rules = ss[i].cssRules || ss[i].rules;
} catch(e) {
// some plugins add 3rd party stylesheets, FF throws an SecurityError when trying to access those rules.
if(e.name !== "SecurityError") {
throw e;
}
}
if (rules) {
for (var j=0; j<rules.length; j++) {
if (rules[j].selectorText === cssID) {
return rules[j];
}
}
}
}
return null;
}

function setCSSdisplay(cssID, display) {
rule = getCSSrule(cssID);
if (rule) {
rule.style.display = display ? "" : "none";
}
}

function toggleCSSdisplay(cssID)
{
rule = getCSSrule(cssID);
if (rule) {
rule.style.display = rule.style.display === "none" ? "" : "none";
}
}

PRE;

}
4 changes: 1 addition & 3 deletions net/pfSense-pkg-haproxy-devel/files/usr/local/www/haproxy/haproxy_files.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,9 @@
require_once("haproxy/haproxy_htmllist.inc");
require_once("haproxy/pkg_haproxy_tabs.inc");

haproxy_config_init();
$a_files = &$config['installedpackages']['haproxy']['files']['item'];
if (!is_array($a_files)) $a_files = array();
$a_pools = &$config['installedpackages']['haproxy']['ha_pools']['item'];
if (!is_array($a_pools)) $a_pools = array();


$fields_files = array();
$fields_files[0]['name']="name";
Expand Down
Loading