luci-base: add system cert bundle detection
authorDavid Lam <david@thedavid.net>
Thu, 16 Jan 2020 09:15:40 +0000 (01:15 -0800)
committerJo-Philipp Wich <jo@mein.io>
Sun, 19 Jan 2020 19:10:49 +0000 (20:10 +0100)
Add detection mechanism for system cert CA bundle installed by the
ca-bundle package. Used by LuCI to detect whether the "Use system
certificates" certificate validation option should be enabled.

Signed-off-by: David Lam <david@thedavid.net>
(cherry picked from commit 27b21c2a6262a8c383c783e98320746f22fe8f6f)

modules/luci-base/root/usr/libexec/rpcd/luci

index 56cb7bc85dd04b87390c154ac49e8d96a5d7a042..75afd27a0008ece2ea3a24efee7a61b4f13704fb 100755 (executable)
@@ -216,6 +216,7 @@ local methods = {
                        rv.sysntpd       = fs.readlink("/usr/sbin/ntpd") and true
                        rv.ipv6          = fs.access("/proc/net/ipv6_route")
                        rv.dropbear      = fs.access("/usr/sbin/dropbear")
+                       rv.cabundle      = fs.access("/etc/ssl/certs/ca-certificates.crt")
 
                        local wifi_features = { "eap", "11n", "11ac", "11r", "11w", "acs", "sae", "owe", "suiteb192" }