kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Match type more broadly for vhost when searching subdomains

This commit is contained in:
Kienan Stewart 2018-07-11 17:27:52 -04:00
parent 166b1b4f40
commit 541ce25460
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bureau/class/m_ssl.php
View File

@ -567,14 +567,22 @@ SELECT ?,?,?, FROM_UNIXTIME(?), FROM_UNIXTIME(?), ?, ?, sslcsr FROM certificate
return; // nothing to do : this domain type does not involve Vhosts return; // nothing to do : this domain type does not involve Vhosts
} }
// The 'vhost' type is overloaded with -http, -https, and -both.
// If the type starts with vhost, we should match vhost%
// Generally, only 'vhost' is used since the overloads are not enabled
// for use in the interface.
$type_match = $type;
if (substr($type, 0, 5) == 'vhost') {
$type_match = 'vhost%';
}
if ($action == "postinst") { if ($action == "postinst") {
$msg->log("ssl", "update_domain:CREATE($action,$type,$fqdn)"); $msg->log("ssl", "update_domain:CREATE($action,$type,$fqdn)");
$offset = 0; $offset = 0;
$found = false; $found = false;
do { // try each subdomain (strtok-style) and search them in sub_domaines table: do { // try each subdomain (strtok-style) and search them in sub_domaines table:
$db->query( $db->query(
"SELECT * FROM sub_domaines WHERE sub=? AND domaine=? AND web_action NOT IN ('','OK') AND type=?", "SELECT * FROM sub_domaines WHERE sub=? AND domaine=? AND web_action NOT IN ('','OK') AND type LIKE ?",
array(substr($fqdn, 0, $offset), substr($fqdn, $offset + ($offset != 0)), $type) array(substr($fqdn, 0, $offset), substr($fqdn, $offset + ($offset != 0)), $type_match)
); );
if ($db->next_record()) { if ($db->next_record()) {
$found = true; $found = true;