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

luci-app-acme Migrate to ES6 #7534

Merged
merged 2 commits into from
Jan 7, 2025
Merged

luci-app-acme Migrate to ES6 #7534

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c4edee
luci-app-acme: Migrate to ES6 syntax.
stokito Dec 29, 2024
23ee0bf
luci-app-acme: fix _handleCheckService() signature
stokito Dec 29, 2024
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
49 changes: 26 additions & 23 deletions applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,24 @@
'require view';

return view.extend({
load: function() {
return L.resolveDefault(fs.list('/etc/ssl/acme/'), []).then(function(entries) {
var certs = [];
for (var i = 0; i < entries.length; i++) {
if (entries[i].type == 'file' && entries[i].name.match(/\.key$/)) {
certs.push(entries[i]);
load() {
return Promise.all([
L.resolveDefault(fs.list('/etc/ssl/acme/'), []).then(files => {
let certs = [];
for (let f of files) {
if (f.type == 'file' && f.name.match(/\.key$/)) {
certs.push(f);
}
}
}
return certs;
});
return certs;
}),
]);
},

render: function (certs) {
render(data) {
let certs = data[0];
let wikiUrl = 'https://github.com/acmesh-official/acme.sh/wiki/';
var wikiInstructionUrl = wikiUrl + 'dnsapi';
let wikiInstructionUrl = wikiUrl + 'dnsapi';
let m, s, o;

m = new form.Map("acme", _("ACME certificates"),
Expand All @@ -39,14 +42,14 @@ return view.extend({
o = s.option(form.Value, "account_email", _("Account email"),
_('Email address to associate with account key.') + '<br/>' +
_('If a certificate wasn\'t renewed in time then you\'ll receive a notice at 20 days before expiry.')
)
);
o.rmempty = false;
o.datatype = "minlength(1)";

o = s.option(form.Flag, "debug", _("Enable debug logging"));
o.rmempty = false;

s = m.section(form.GridSection, "cert", _("Certificate config"))
s = m.section(form.GridSection, "cert", _("Certificate config"));
s.anonymous = false;
s.addremove = true;
s.nodescriptions = true;
Expand Down Expand Up @@ -93,7 +96,7 @@ return view.extend({
o.depends("validation_method", "dns");
// List of supported DNS API. Names are same as file names in acme.sh for easier search.
// May be outdated but not changed too often.
o.value('', '')
o.value('', '');
o.value('dns_acmedns', 'ACME DNS API github.com/joohoi/acme-dns');
o.value('dns_acmeproxy', 'ACME Proxy github.com/mdbraber/acmeproxy');
o.value('dns_1984hosting', '1984.is');
Expand Down Expand Up @@ -231,7 +234,7 @@ return view.extend({
o.value('dns_zone', 'Zone.ee');
o.value('dns_zonomi', 'Zonomi.com');
o.modalonly = true;
o.onchange = L.bind(_handleCheckService, o, s);
o.onchange = _handleCheckService;

o = s.taboption('challenge_dns', form.DummyValue, '_wiki_url', _('See instructions'), '');
o.rawhtml = true;
Expand Down Expand Up @@ -444,7 +447,7 @@ return view.extend({
o = s.taboption('challenge_dns', form.DynamicList, 'credentials', _('DNS API credentials'),
_("The credentials for the DNS API mode selected above. " +
"See https://github.com/acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required by each API. " +
"Add multiple entries here in KEY=VAL shell variable format to supply multiple credential variables."))
"Add multiple entries here in KEY=VAL shell variable format to supply multiple credential variables."));
o.datatype = "list(string)";
o.depends("validation_method", "dns");
o.modalonly = true;
Expand Down Expand Up @@ -485,7 +488,7 @@ return view.extend({
o.optional = true;
o.modalonly = true;
o.cfgvalue = function(section_id) {
var keylength = uci.get('acme', section_id, 'keylength');
let keylength = uci.get('acme', section_id, 'keylength');
if (keylength) {
// migrate the old keylength to a new keytype
switch (keylength) {
Expand Down Expand Up @@ -525,16 +528,16 @@ return view.extend({

return m.render();
}
})
});


function _addDnsProviderField(s, provider, env, title, desc) {
let o = s.taboption('challenge_dns', form.Value, '_credentials_' + env, _(title),
_(desc));
o.depends('dns', provider);
o.modalonly = true;
o.cfgvalue = function (section_id, stored_val) {
var creds = this.map.data.get(this.map.config, section_id, 'credentials');
o.cfgvalue = function (section_id) {
let creds = this.map.data.get(this.map.config, section_id, 'credentials');
return _extractParamValue(creds, env);
};
o.write = function (section_id, value) { };
Expand Down Expand Up @@ -591,12 +594,12 @@ function _parseKeyValueListToMap(paramsKeyVals) {
return map;
}

function _handleCheckService(c, event, curVal, newVal) {
function _handleCheckService(event, section_id, newVal) {
document.getElementById('wikiInstructionUrl').href = 'https://github.com/acmesh-official/acme.sh/wiki/dnsapi#' + newVal;
}

function _renderCerts(certs) {
var table = E('table', {'class': 'table cbi-section-table', 'id': 'certificates_table'}, [
let table = E('table', {'class': 'table cbi-section-table', 'id': 'certificates_table'}, [
E('tr', {'class': 'tr table-titles'}, [
E('th', {'class': 'th'}, _('Main Domain')),
E('th', {'class': 'th'}, _('Private Key')),
Expand All @@ -605,7 +608,7 @@ function _renderCerts(certs) {
])
]);

var rows = certs.map(function (cert) {
let rows = certs.map(function (cert) {
let domain = cert.name.substring(0, cert.name.length - 4);
let issueDate = new Date(cert.mtime * 1000).toLocaleDateString();
return [
Expand Down
Loading