Skip to content

Fix: Not fetching the wildcard domain when creating CSR #5

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

Open
YumeChaan wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix: Not fetching the wildcard domain when creating CSR #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
552a252
Allow custom common name for CSR generation and support wildcard domains
YumeChaan May 27, 2026
3b8b8d3
fix: copilot - add grid structure and for/id to common name field
YumeChaan Jun 10, 2026
b2ab424
fix: copilot - use lang key for common name placeholder
YumeChaan Jun 10, 2026
5528f3d
use filter_var for with_config bool in HandleCSRCreation
YumeChaan Jun 10, 2026
7ad9055
fix: copilot - use filter_var for with_config and fix wildcard SAN in…
YumeChaan Jun 10, 2026
9fdbdf7
pre-fill common name field with order domain
YumeChaan Jun 10, 2026
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
18 changes: 11 additions & 7 deletions modules/servers/openprovider_ssl/classes/HandleCSRCreation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,23 @@ public function handleCSRCreation($vars)
$data = html_entity_decode($whmcs->get_req_var("data"));
parse_str($data, $dataArray);

$commonName = !empty($dataArray['common_name'])
? trim($dataArray['common_name'])
: $vars['domain'];

$postData = [
"bits" => (int) 4098,
"common_name" => $vars['domain'],
"bits" => (int) 4096,
"common_name" => $commonName,
"country" => $dataArray['country'],
"email" => $dataArray['email'],
"locality" => $dataArray['locality'],
"organization" => $dataArray['organization'],
"signature_hash_algorithm" => $dataArray['signature_hash_algorithm'],
"state" => $dataArray['state'],
"unit" => $dataArray['unit'],
"with_config" => (bool)$dataArray['with_config'],
"with_config" => filter_var($dataArray['with_config'], FILTER_VALIDATE_BOOLEAN),
"subject_alternative_name" => [
"www.".$vars['domain'],
str_starts_with($commonName, '*.') ? $commonName : 'www.' . $commonName,
],
];
$baseUrl = $this->helper->getBaseUrl();
Expand All @@ -63,10 +67,10 @@ public function handleCSRCreation($vars)
exit;
}

return $this->generateHTML($csrCustomFieldId);
return $this->generateHTML($csrCustomFieldId, false, $vars['domain']);
}

private function generateHTML($csrCustomFieldId, $isAdmin = false)
private function generateHTML($csrCustomFieldId, $isAdmin = false, $domain = '')
{
global $CONFIG, $LANG;

Expand Down Expand Up @@ -120,7 +124,7 @@ function copyTexts() {
});
</script>';
}
$html .= $this->helper->createCsrTokenHtml($countries, $LANG);
$html .= $this->helper->createCsrTokenHtml($countries, $LANG, '', $domain);

return $html;
}
Expand Down
6 changes: 3 additions & 3 deletions modules/servers/openprovider_ssl/hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
parse_str($data, $dataArray);

$postData = [
"bits" => (int) 4098,
"bits" => (int) 4096,
"common_name" => $dataArray['common_name'],
"country" => $dataArray['country'],
"email" => $dataArray['email'],
Comment thread
YumeChaan marked this conversation as resolved.
Comment thread
YumeChaan marked this conversation as resolved.
Expand All @@ -161,9 +161,9 @@
"signature_hash_algorithm" => $dataArray['signature_hash_algorithm'],
"state" => $dataArray['state'],
"unit" => $dataArray['unit'],
"with_config" => (bool)$dataArray['with_config'],
"with_config" => filter_var($dataArray['with_config'], FILTER_VALIDATE_BOOLEAN),
"subject_alternative_name" => [
"www.".$dataArray['common_name'],
str_starts_with($dataArray['common_name'], '*.') ? $dataArray['common_name'] : 'www.' . $dataArray['common_name'],
],
];
$baseUrl = $helper->getBaseUrl();
Expand Down
1 change: 1 addition & 0 deletions modules/servers/openprovider_ssl/lang/english.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
$_ADDONLANG["country"] = "Country";
$_ADDONLANG["select_country"] = "Select Country";
$_ADDONLANG["common_name"] = "Common Name (Domain)";
$_ADDONLANG["common_name_text"] = "example.com or *.example.com";
$_ADDONLANG["email"] = "Email Address";
$_ADDONLANG["sha2"] = "SHA-2";
$_ADDONLANG["sha1"] = "SHA-1";
Expand Down
20 changes: 9 additions & 11 deletions modules/servers/openprovider_ssl/lib/Helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public function adminButton($LANG)
return $html;
}

public function createCsrTokenHtml($clientcountries, $LANG, $action = '')
public function createCsrTokenHtml($clientcountries, $LANG, $action = '', $domain = '')
{
try {
$html = '';
Expand Down Expand Up @@ -319,16 +319,14 @@ public function createCsrTokenHtml($clientcountries, $LANG, $action = '')
<input type="email" id="email" name="email" placeholder="' . $LANG['email_text'] . '" value="" >
</div>
</div>';
if ($action == 'yes') {
$html .= '<div class="col-md-6">
<div class="csr_token_content_main">
<label for="common_name">' . $LANG['common_name'] . '</label>
</div>
<div class="input-div">
<input type="text" id="common_name" placeholder="' . $LANG['common_name'] . '" name="common_name" value="" >
</div>
</div>';
}
$html .= '<div class="col-md-6">
<div class="csr_token_content_main">
<label for="common_name">' . $LANG['common_name'] . '</label>
</div>
<div class="input-div">
<input type="text" id="common_name" name="common_name" class="form-control" placeholder="' . $LANG['common_name_text'] . '" value="' . htmlspecialchars($domain) . '" >
</div>
</div>';

$html .= '<div class="col-md-6">
<div class="csr_token_content_main">
Expand Down