him411/wlan-ap-Telecominfraproject
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-12-16 08:59:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

est_client: switch to dig for CAA lookups and improve logging

Browse Source 
Replace resolv module usage with dig command for CAA record lookups
to simplify DNS query handling. Reorganise cert_prefix_determine() to
prioritise controller-specific FQDN from cloud.json before checking
discovery method.

Add extensive debug logging throughout to aid troubleshooting of EST
enrollment process, including curl commands and exit codes.

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin 2025-11-25 07:31:08 +01:00
parent 0ce1a987da
commit 371edb568f
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
feeds/tip/cloud_discovery/files/usr/bin/est_client
View File

@ -3,7 +3,6 @@
'use strict';
import { ulog_open, ulog, ULOG_SYSLOG, ULOG_STDIO, LOG_DAEMON, LOG_INFO } from 'log';
import { query } from 'resolv';
import * as fs from 'fs';
import * as libuci from 'uci';
@ -13,22 +12,26 @@ let est_server = 'est.certificates.open-lan.org';
let cert_prefix = 'operational';
function cert_prefix_determine() {
let cloud_config = fs.readfile('/tmp/cloud.json');
if (cloud_config) {
let cloud = json(cloud_config);
if (cloud?.dhcp_server) {
let fqdn = split(cloud.dhcp_server, ':')[0];
ulog(LOG_INFO, `Using controller-specific cert prefix from cloud.json: ${fqdn}\n`);
return fqdn;
}
}
let discovery_method = trim(fs.readfile('/tmp/discovery.method') || 'OpenLAN');
ulog(LOG_INFO, `Discovery method from file: ${discovery_method}\n`);
if (discovery_method == 'OpenLAN') {
ulog(LOG_INFO, 'Using operational cert prefix\n');
return 'operational';
}
let cloud_config = fs.readfile('/tmp/cloud.json');
if (!cloud_config)
return 'operational';
let cloud = json(cloud_config);
if (!cloud || !cloud.dhcp_server)
return 'operational';
let fqdn = split(cloud.dhcp_server, ':')[0];
return fqdn;
ulog(LOG_INFO, 'Using operational cert prefix as fallback\n');
return 'operational';
}
function discover_est_server_via_caa() {
@ -47,19 +50,17 @@ function discover_est_server_via_caa() {
ulog(LOG_INFO, `Attempting CAA lookup for controller FQDN: ${controller_fqdn}\n`);
let result = query([controller_fqdn], { type: ['CAA'] });
let pipe = fs.popen(`dig @localhost ${controller_fqdn} CAA +short | cut -d'"' -f2`);
let est_server = pipe.read('all');
pipe.close();
if (!result || !result[controller_fqdn] || !result[controller_fqdn].CAA)
if (!est_server)
return null;
let caa_records = result[controller_fqdn].CAA;
for (let record in caa_records) {
if (record.tag == 'issue') {
let est_server = trim(record.value, '" ');
ulog(LOG_INFO, `Found EST server via CAA: ${est_server}\n`);
return est_server;
}
est_server = trim(est_server);
if (est_server) {
ulog(LOG_INFO, `Found EST server via CAA: ${est_server}\n`);
return est_server;
}
return null;
@ -156,11 +157,13 @@ function call_est_server(path, cert, target) {
if (generate_csr(cert))
return 1;
set_est_server();
set_est_server();
let ret = system('curl -m 10 -X POST https://' + est_server + '/.well-known/est/' + path + ' -d @/tmp/csr.nohdr.p10 -H "Content-Type: application/pkcs10" --cert ' + cert + ' --key /etc/ucentral/key.pem --cacert /etc/ucentral/insta.pem -o /tmp/operational.nohdr.p7');
let curl_cmd = 'curl -m 10 -X POST https://' + est_server + '/.well-known/est/' + path + ' -d @/tmp/csr.nohdr.p10 -H "Content-Type: application/pkcs10" --cert ' + cert + ' --key /etc/ucentral/key.pem --cacert /etc/ucentral/insta.pem -o /tmp/operational.nohdr.p7';
ulog(LOG_INFO, `Executing: ${curl_cmd}\n`);
let ret = system(curl_cmd);
if (ret) {
ulog(LOG_INFO, 'Failed to request operational certificate\n');
ulog(LOG_INFO, `Failed to request operational certificate (exit code: ${ret})\n`);
return 1;
}
ulog(LOG_INFO, 'EST succeeded\n');
@ -171,12 +174,14 @@ function call_est_server(path, cert, target) {
function simpleenroll() {
cert_prefix = cert_prefix_determine();
ulog(LOG_INFO, `Checking for certificate: /etc/ucentral/${cert_prefix}.pem\n`);
if (fs.stat('/etc/ucentral/' + cert_prefix + '.pem')) {
ulog(LOG_INFO, 'Operational certificate is present\n');
return 0;
}
ulog(LOG_INFO, 'Operational certificate not found, enrolling...\n');
if (call_est_server('simpleenroll', '/etc/ucentral/cert.pem', '/etc/ucentral/' + cert_prefix + '.pem'))
return 1;
@ -214,11 +219,13 @@ function load_operational_ca() {
set_est_server();
let ret = system('curl -m 10 -X GET https://' + est_server + '/.well-known/est/cacerts --cert /etc/ucentral/' + cert_prefix + '.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/insta.pem -o /tmp/' + cert_prefix + '.ca.nohdr.p7');
let curl_cmd = 'curl -m 10 -X GET https://' + est_server + '/.well-known/est/cacerts --cert /etc/ucentral/' + cert_prefix + '.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/insta.pem -o /tmp/' + cert_prefix + '.ca.nohdr.p7';
ulog(LOG_INFO, `Executing: ${curl_cmd}\n`);
let ret = system(curl_cmd);
if (!ret)
ret = p7_too_pem('/tmp/' + cert_prefix + '.ca.nohdr.p7', '/etc/ucentral/' + cert_prefix + '.ca');
if (ret) {
ulog(LOG_INFO, 'Failed to load CA\n');
ulog(LOG_INFO, `Failed to load CA (exit code: ${ret})\n`);
return 1;
}
system('cat /etc/ucentral/openlan.pem >> /etc/ucentral/' + cert_prefix + '.ca');