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

acme client package for pfSense, initial commit #89

Closed
wants to merge 14 commits into from
Closed

acme client package for pfSense, initial commit #89

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
05129e8
acme client package for pfSense, initial commit
PiBa-NL Mar 29, 2016
1857302
acme, fix make / install issue
PiBa-NL Mar 31, 2016
44eb3c2
acme, new methods sftp/ftps for deploying webroot challenges to remot…
PiBa-NL Apr 8, 2016
9367254
acme, remove service definition
PiBa-NL Apr 14, 2016
018348f
acme, fix installation names
PiBa-NL Apr 24, 2016
bfff56e
acme, minor fixes + 'php command' ability
PiBa-NL Apr 28, 2016
d5ebdad
acme, changed underlying implementation to Neilpang/acme.sh / updated…
PiBa-NL Dec 22, 2016
29ee7cd
acme, add dns options/scripts from Neilpang/acme.sh into the pfSense-…
PiBa-NL Dec 25, 2016
f0aa9c0
acme, dns-manual option, and fixes for enable/disable setting and wri…
PiBa-NL Dec 26, 2016
cb886a0
acme, automatically also import the certificate chain certificates wi…
PiBa-NL Dec 28, 2016
6c9fa13
acme, use escapeshellarg() for shell commands, provide more sensible …
PiBa-NL Jan 10, 2017
353f3cb
acme, set package file permissions in Makefile using INSTALL_DATA/INS…
PiBa-NL Jan 10, 2017
9372548
acme, fix portlint fatal/warning messages
PiBa-NL Jan 10, 2017
14370e4
acme, fix storing settings for most dns methods, fixed storing keyfil…
PiBa-NL Jan 22, 2017
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
Prev Previous commit
acme, fix storing settings for most dns methods, fixed storing keyfil… 
…e for nsupdate method, improved layout for these extra fields
  • Loading branch information
@PiBa-NL
PiBa-NL committed Jan 22, 2017
commit 14370e4c3ce1aa399efd45fe5615661fe2195e22
60 changes: 30 additions & 30 deletions security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,61 +109,61 @@ $acme_domain_validation_method['dns_ali'] = array(name => "DNS-Aliyuncs",
));
$acme_domain_validation_method['dns_aws'] = array(name => "DNS-Amazon Route53",
'fields' => array(
'AWS_ACCESS_KEY_ID' => array('name'=>"AWS_ACCESS_KEY_ID",'columnheader'=>"Id",'type'=>"textbox",
'AWS_ACCESS_KEY_ID' => array('name'=>"aws_access_key_id",'columnheader'=>"Id",'type'=>"textbox",
'description' =>"Fill in the API Id"
),
'AWS_SECRET_ACCESS_KEY' => array('name'=>"AWS_SECRET_ACCESS_KEY",'columnheader'=>"Key",'type'=>"textbox",
'AWS_SECRET_ACCESS_KEY' => array('name'=>"aws_secret_access_key",'columnheader'=>"Key",'type'=>"textbox",
'description' =>"Fill in the API Key"
)
));
$acme_domain_validation_method['dns_cf'] = array(name => "DNS-Cloudflare",
'fields' => array(
'CF_Key' => array('name'=>"CF_Key",'columnheader'=>"Key",'type'=>"textbox",
'CF_Key' => array('name'=>"cf_key",'columnheader'=>"Key",'type'=>"textbox",
'description' =>"Fill in the API Key"
),
'CF_Email' => array('name'=>"CF_Email",'columnheader'=>"Email",'type'=>"textbox",
'CF_Email' => array('name'=>"cf_email",'columnheader'=>"Email",'type'=>"textbox",
'description' =>"Fill in the API Emailadress"
)
));
$acme_domain_validation_method['dns_cx'] = array(name => "DNS-Cloudxns",
'fields' => array(
'CX_Key' => array('name'=>"CX_Key",'columnheader'=>"Key",'type'=>"textbox",
'CX_Key' => array('name'=>"cx_key",'columnheader'=>"Key",'type'=>"textbox",
'description' =>"Fill in the API Key"
),
'CX_Secret' => array('name'=>"CX_Secret",'columnheader'=>"Secret",'type'=>"textbox",
'CX_Secret' => array('name'=>"cx_secret",'columnheader'=>"Secret",'type'=>"textbox",
'description' =>"Fill in the API Secret"
)
));
$acme_domain_validation_method['dns_dp'] = array(name => "DNS-Dnspod.cn",
'fields' => array(
'DP_Id' => array('name'=>"DP_Id",'columnheader'=>"Id",'type'=>"textbox",
'DP_Id' => array('name'=>"dp_id",'columnheader'=>"Id",'type'=>"textbox",
'description' =>"Fill in the API Id"
),
'DP_Key' => array('name'=>"DP_Key",'columnheader'=>"Key",'type'=>"textbox",
'DP_Key' => array('name'=>"dp_key",'columnheader'=>"Key",'type'=>"textbox",
'description' =>"Fill in the API Key"
)
));
$acme_domain_validation_method['dns_gd'] = array(name => "DNS-Godaddy",
'fields' => array(
'GD_Key' => array('name'=>"GD_Key",'columnheader'=>"Key",'type'=>"textbox",
'GD_Key' => array('name'=>"gd_key",'columnheader'=>"Key",'type'=>"textbox",
'description' =>"Fill in the API Key"
),
'GD_Secret' => array('name'=>"GD_Secret",'columnheader'=>"Secret",'type'=>"textbox",
'GD_Secret' => array('name'=>"gd_secret",'columnheader'=>"Secret",'type'=>"textbox",
'description' =>"Fill in the API Secret"
)
));
$acme_domain_validation_method['dns_ispconfig'] = array(name => "DNS-ISPConfig",
'fields' => array(
'ISPC_User' => array('name'=>"ISPC_User",'columnheader'=>"User",'type'=>"textbox",
'ISPC_User' => array('name'=>"ispc_user",'columnheader'=>"User",'type'=>"textbox",
'description' =>"Fill in the remoteUser"
),
'ISPC_Password' => array('name'=>"ISPC_Password",'columnheader'=>"Password",'type'=>"textbox",
'ISPC_Password' => array('name'=>"ispc_password",'columnheader'=>"Password",'type'=>"textbox",
'description' =>"Fill in the remotePassword"
),
'ISPC_Api' => array('name'=>"ISPC_Api",'columnheader'=>"Api",'type'=>"textbox",
'ISPC_Api' => array('name'=>"ispc_api",'columnheader'=>"Api",'type'=>"textbox",
'description' =>"Fill in the https://ispc.domain.tld:8080/remote/json.php"
),
'ISPC_Api_Insecure' => array('name'=>"ISPC_Api_Insecure",'columnheader'=>"Secure",'type'=>"textbox",
'ISPC_Api_Insecure' => array('name'=>"ispc_api_insecure",'columnheader'=>"Secure",'type'=>"textbox",
'description' =>"Fill in the Set 1 for insecure and 0 for secure -> difference is whether ssl cert is checked for validity (0) or whether it is just accepted (1)"
)
));
Expand All @@ -180,58 +180,58 @@ $acme_domain_validation_method['dns_lexicon'] = array(name => "DNS-Lexicon",
));*/
$acme_domain_validation_method['dns_luadns'] = array(name => "DNS-Luadns",
'fields' => array(
'LUA_Key' => array('name'=>"LUA_Key",'columnheader'=>"Key",'type'=>"textbox",
'LUA_Key' => array('name'=>"lua_key",'columnheader'=>"Key",'type'=>"textbox",
'description' =>"Fill in the API Key"
),
'LUA_Email' => array('name'=>"LUA_Email",'columnheader'=>"Email",'type'=>"textbox",
'LUA_Email' => array('name'=>"lua_email",'columnheader'=>"Email",'type'=>"textbox",
'description' =>"Fill in the API Emailadress"
)
));
$acme_domain_validation_method['dns_me'] = array(name => "DNS-DNSMadeEasy",
'fields' => array(
'ME_Key' => array('name'=>"ME_Key",'columnheader'=>"Key",'type'=>"textbox",
'ME_Key' => array('name'=>"me_key",'columnheader'=>"Key",'type'=>"textbox",
'description' =>"Fill in the API Key"
),
'ME_Secret' => array('name'=>"ME_Secret",'columnheader'=>"Secret",'type'=>"textbox",
'ME_Secret' => array('name'=>"me_secret",'columnheader'=>"Secret",'type'=>"textbox",
'description' =>"Fill in the API Secret"
)
));
$acme_domain_validation_method['dns_nsupdate'] = array(name => "DNS-NSupdate",
'fields' => array(
'NSUPDATE_SERVER' => array('name'=>"NSUPDATE_SERVER",'columnheader'=>"Key",'type'=>"textbox",
'description' =>"Fill in the API Key"
'NSUPDATE_SERVER' => array('name'=>"nsupdate_server",'columnheader'=>"Key",'type'=>"textbox",
'description' =>"Fill in the NSUpdate target server"
),
'NSUPDATE_KEY' => array('name'=>"NSUPDATE_KEY",'columnheader'=>"Id",'type'=>"textarea",
'description' =>"Fill in the API Id"
'NSUPDATE_KEY' => array('name'=>"nsupdate_key",'columnheader'=>"Id",'type'=>"textarea",
'description' =>"Fill in the NSUpdate KEY"
)
));
$acme_domain_validation_method['dns_ovh'] = array(name => "DNS-ovh / kimsufi / soyoustart / runabove",
'fields' => array(
'OVH_AK' => array('name'=>"OVH_AK",'columnheader'=>"Application Key",'type'=>"textbox",
'OVH_AK' => array('name'=>"ovh_ak",'columnheader'=>"Application Key",'type'=>"textbox",
'description' =>"Fill in the Application Key"
),
'OVH_AS' => array('name'=>"OVH_AS",'columnheader'=>"Application Secret",'type'=>"textbox",
'OVH_AS' => array('name'=>"ovh_as",'columnheader'=>"Application Secret",'type'=>"textbox",
'description' =>"Fill in the Application Secret"
),
'OVH_CK' => array('name'=>"OVH_CK",'columnheader'=>"Consumer Key",'type'=>"textbox",
'OVH_CK' => array('name'=>"ovh_ck",'columnheader'=>"Consumer Key",'type'=>"textbox",
'description' =>"Fill in the Consumer Key"
),
'OVH_END_POINT' => array('name'=>"OVH_END_POINT",'columnheader'=>"Endpoint",'type'=>"textbox",
'OVH_END_POINT' => array('name'=>"ovh_end_point",'columnheader'=>"Endpoint",'type'=>"textbox",
'description' =>"Fill in one of: ovh-eu/ovh-ca/kimsufi-eu/kimsufi-ca/soyoustart-eu/soyoustart-ca/runabove-ca"
)
));
$acme_domain_validation_method['pdns'] = array(name => "DNS-PowerDNS",
'fields' => array(
'PDNS_Url' => array('name'=>"PDNS_Url",'columnheader'=>"URL",'type'=>"textbox",
'PDNS_Url' => array('name'=>"pdns_url",'columnheader'=>"URL",'type'=>"textbox",
'description' =>"Fill in the URL http://ns.example.com:8081"
),
'PDNS_ServerId' => array('name'=>"PDNS_ServerId",'columnheader'=>"ServerID",'type'=>"textbox",
'PDNS_ServerId' => array('name'=>"pdns_serverid",'columnheader'=>"ServerID",'type'=>"textbox",
'description' =>"Fill in the ServerId localhost"
),
'PDNS_Token' => array('name'=>"PDNS_Token",'columnheader'=>"Token",'type'=>"textbox",
'PDNS_Token' => array('name'=>"pdns_token",'columnheader'=>"Token",'type'=>"textbox",
'description' =>"Fill in the Token 0123456789ABCDEF"
),
'PDNS_Ttl' => array('name'=>"PDNS_Ttl",'columnheader'=>"TTL",'type'=>"textbox",
'PDNS_Ttl' => array('name'=>"pdns_ttl",'columnheader'=>"TTL",'type'=>"textbox",
'description' =>"Fill in the TTL 60"
)
));
Expand Down
12 changes: 6 additions & 6 deletions security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme_htmllist.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,14 @@ class HtmlList
$checked = $itemvalue=='yes' ? " checked" : "";
$result .= "<input onclick='html_listitem_change(\"{$this->tablename}\",\"{$itemname}\",\"{$counter}\",this);' name='$itemnamenr' id='$itemnamenr' type='checkbox'$checked value='yes' />";
} elseif ($itemtype == "textarea") {
$result .= "<textarea class='nowrap' name='$itemnamenr' id='$itemnamenr' cols='{$item['size']}' rows='10'>";
$result .= "<textarea class='form-control nowrap' name='$itemnamenr' id='$itemnamenr' cols='{$item['size']}' rows='10'>";
$result .= htmlspecialchars(base64_decode($itemvalue));
$result .= "</textarea>";
} elseif ($itemtype == "fixedtext") {
$result .= $item['text'];
} else {
$itemvalue = htmlspecialchars($itemvalue, ENT_QUOTES);
$result .= "<input name='$itemnamenr' id='$itemnamenr' type='text' value='{$itemvalue}' />";
$result .= "<input class='form-control' name='$itemnamenr' id='$itemnamenr' type='text' value='{$itemvalue}' />";
}
} else {
if ($itemtype == "select") {
Expand Down Expand Up @@ -181,7 +181,7 @@ class HtmlList
} else {
$itemvalue = $value[$this->keyfield];
}
$key = "<input name='{$tablename}_key{$counter}' id='{$tablename}_key{$counter}' class='hidden' value='{$itemvalue}'>";
$key = "<input name='{$tablename}_key{$counter}' id='{$tablename}_key{$counter}' class='form-control hidden' value='{$itemvalue}'>";
} else {
$key = "";
}
Expand Down Expand Up @@ -244,7 +244,7 @@ class HtmlList
}
$result .= "
<td class='action-icons'>
<input name='{$tablename}_rowindex[]' id='{$tablename}_rowindex{$counter}' class='hidden' value='{$counter}' />
<input name='{$tablename}_rowindex[]' id='{$tablename}_rowindex{$counter}' class='form-control hidden' value='{$counter}' />
<a onclick='deleteRow({$counter}, \"{$tablename}\"); return false;' >".acmeicon('delete','delete entry')."</a>
<a onclick='dupRow({$counter}, \"{$tablename}\"); return false;' >".acmeicon('clone','duplicate entry')."</a>
";
Expand Down Expand Up @@ -299,7 +299,7 @@ EOT
}
$result .= "</div>";
$result .= "<div id='htmltable_{$tablename}_{$counter}_details_edit' class='hidden'>";
$result .= "<table class='tabcont' style='border-collapse:collapse' border='1' cellspacing='0' >";
$result .= "<table class='table table-hover table-striped table-condensed' style='border-collapse:collapse' border='1' cellspacing='0' >";
foreach($itemdetails as $item) {
$itemname = $item['name'];
$result .= "<tr id='tr_edititemdetails_{$counter}_{$itemname}'>";
Expand Down Expand Up @@ -375,7 +375,7 @@ function acme_htmllist_js(){
"' id='" + tableId + field['name'] + rowId +
"'><\/input> ";
} else if(field['type'] === 'textarea') {
result="<textarea class='nowrap' cols='" + field['size'] + "' rows='15' name='" + tableId + field['name'] + rowId +
result="<textarea class='form-control nowrap' cols='" + field['size'] + "' rows='15' name='" + tableId + field['name'] + rowId +
"' id='" + tableId + field['name'] + rowId +
"'><\/textarea> ";
} else if(field['type'] === 'select') {
Expand Down
7 changes: 7 additions & 0 deletions security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme_sh.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@ class acme_sh {
$reloadfile = "{$this->acmeconf}reloadcmd.sh";
file_put_contents($reloadfile, $reloadcmd);
chmod($reloadfile, 0755);

if ($api == "dns_nsupdate") {
$keyfile = "{$certpath}nsupdate.key";
$nsupdatekey = base64_decode($envvariables['NSUPDATE_KEY']);
file_put_contents($keyfile, $nsupdatekey);
$envvariables['NSUPDATE_KEY'] = $keyfile;
}

$hookcontent_httpapi = <<<EOF
pfSenseacme_add() {
Expand Down
2 changes: 1 addition & 1 deletion security/pfSense-pkg-acme/files/usr/local/www/acme/acme_generalsettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
$section->addInput(new \Form_Checkbox(
'enable',
'',
'Enable Acme client renewal job. This will configure cron to renew certificates once a day at 3:16. Keeping track of the last succesfull renewal and the number of days set after to renew again. When renewal happens a service can be restarted or a shell script run to load the new certificate for services that need it, if needed this needs to be configured as a action under the certificate aettings.',
'Enable Acme client renewal job. This will configure cron to renew certificates once a day at 3:16. Keeping track of the last succesfull renewal and the number of days set after to renew again. When renewal happens a service can be restarted or a shell script run to load the new certificate for services that need it, if needed this needs to be configured as a action under the certificate settings.',
$pconfig['enable']
));

Expand Down