chore: age encryption support

Author: vernesong

luci-app-openclash/luasrc/controller/openclash.lua

@@ -95,6 +95,8 @@ function index()
 	entry({"admin", "services", "openclash", "config_file_save"}, call("action_config_file_save"))
 	entry({"admin", "services", "openclash", "upload_config"}, call("action_upload_config"))
 	entry({"admin", "services", "openclash", "add_subscription"}, call("action_add_subscription"))
+	entry({"admin", "services", "openclash", "generate_age_key"}, call("action_generate_age_key"))
+	entry({"admin", "services", "openclash", "add_age_config"}, call("action_add_age_config"))
 	entry({"admin", "services", "openclash", "upload_overwrite"}, call("action_upload_overwrite"))
 	entry({"admin", "services", "openclash", "overwrite_subscribe_info"}, call("action_overwrite_subscribe_info"))
 	entry({"admin", "services", "openclash", "overwrite_file_list"}, call("action_overwrite_file_list"))
@@ -3343,20 +3345,19 @@ function action_add_subscription()
 	local keyword = luci.http.formvalue("keyword") or ""
 	local ex_keyword = luci.http.formvalue("ex_keyword") or ""
 	local de_ex_keyword = luci.http.formvalue("de_ex_keyword") or ""
-
 	luci.http.prepare_content("application/json")
 
-	if not name or not address then
+	if not name then
 		luci.http.write_json({
 			status = "error",
-			message = "Missing name or address parameter"
+			message = "Missing name parameter"
 		})
 		return
 	end
 
 	local is_valid_url = false
 
-	if sub_convert == "1" then
+	if address and address ~= "" and sub_convert == "1" then
 		local prefixed_http_pattern = "^[^,%s]+,https?://.+"
 		local encoded_prefixed_http_pattern = "^[^%%%s]+%%2[Cc]https?%%3[Aa]%%2[Ff]%%2[Ff].+"
 
@@ -3391,10 +3392,12 @@ function action_add_subscription()
 				is_valid_url = true
 			end
 		end
-	else
+	elseif address and address ~= "" then
 		if string.find(address, "^https?://") and not string.find(address, "\n") and not string.find(address, "|") then
 			is_valid_url = true
 		end
+	else
+		is_valid_url = true
 	end
 
 	if not is_valid_url then
@@ -3452,7 +3455,11 @@ function action_add_subscription()
 
 	if section_id then
 		uci:set("openclash", section_id, "name", name)
-		uci:set("openclash", section_id, "address", normalized_address)
+		if normalized_address and normalized_address ~= "" then
+			uci:set("openclash", section_id, "address", normalized_address)
+		else
+			uci:delete("openclash", section_id, "address")
+		end
 		uci:set("openclash", section_id, "sub_ua", sub_ua)
 		uci:set("openclash", section_id, "sub_convert", sub_convert)
 		if sub_convert == "1" then
@@ -4000,6 +4007,15 @@ function action_get_subscribe_data()
 		end
 	end)
 
+	uci:foreach("openclash", "config_age_secret", function(a)
+		if a.name == filename then
+			if a.secret then data.config_age_secret = a.secret end
+			if a.public then data.config_age_public = a.public end
+			if a.algo then data.config_age_algo = a.algo end
+			return false
+		end
+	end)
+
 	luci.http.prepare_content("application/json")
 	luci.http.write_json(data)
 end
@@ -4013,3 +4029,71 @@ function action_get_subscribe_info_data()
 	luci.http.prepare_content("application/json")
 	luci.http.write_json(get_sub_url(filename))
 end
+
+function action_generate_age_key()
+	local algo = luci.http.formvalue("algo") or "keygen"
+	local cmd = string.format("%s age %s", meta_core_path, (algo == "pq" and "keygen-pq" or "keygen"))
+	local out = luci.sys.exec(cmd .. " 2>/dev/null")
+	local secret = out:match("(AGE%-SECRET%-KEY%-%S+)")
+	local public = out:match("# public key: ([^\n\r]+)")
+	luci.http.prepare_content("application/json")
+	if not secret then
+		luci.http.write_json({status = "error", message = "Failed to generate age key", output = out})
+		return
+	end
+	luci.http.write_json({status = "success", secret = secret, public = public})
+end
+
+function action_add_age_config()
+	local name = luci.http.formvalue("name")
+	local age_secret = luci.http.formvalue("age_secret") or ""
+	local age_public = luci.http.formvalue("age_public") or ""
+	local age_algo = luci.http.formvalue("age_algo") or ""
+
+	luci.http.prepare_content("application/json")
+
+	if not name or name == "" then
+		luci.http.write_json({status = "error", message = "Missing name parameter"})
+		return
+	end
+
+	local age_section_id = nil
+	uci:foreach("openclash", "config_age_secret", function(s)
+		if s.name == name then
+			age_section_id = s['.name']
+			return false
+		end
+	end)
+
+	if not age_section_id and (age_secret ~= "" or age_public ~= "" or age_algo ~= "") then
+		age_section_id = uci:add("openclash", "config_age_secret")
+		if age_section_id then
+			uci:set("openclash", age_section_id, "name", name)
+		end
+	end
+
+	if age_section_id then
+		if (age_secret == "" and age_public == "") then
+			uci:delete("openclash", age_section_id)
+		else
+			if age_secret and age_secret ~= "" then
+				uci:set("openclash", age_section_id, "secret", age_secret)
+			else
+				uci:delete("openclash", age_section_id, "secret")
+			end
+			if age_public and age_public ~= "" then
+				uci:set("openclash", age_section_id, "public", age_public)
+			else
+				uci:delete("openclash", age_section_id, "public")
+			end
+			if age_algo and age_algo ~= "" then
+				uci:set("openclash", age_section_id, "algo", age_algo)
+			else
+				uci:delete("openclash", age_section_id, "algo")
+			end
+		end
+		uci:commit("openclash")
+	end
+
+	luci.http.write_json({status = "success"})
+end

luci-app-openclash/luasrc/model/cbi/openclash/config-overwrite.lua

@@ -205,14 +205,14 @@ custom_fallback_filter.wrap = "off"
 custom_fallback_filter:depends("custom_fallback_filter", "1")
 
 function custom_fallback_filter.cfgvalue(self, section)
-	return NXFS.readfile("/etc/openclash/custom/openclash_custom_fallback_filter.yaml") or ""
+	return fs.readfile("/etc/openclash/custom/openclash_custom_fallback_filter.yaml") or ""
 end
 function custom_fallback_filter.write(self, section, value)
 	if value then
 		value = value:gsub("\r\n?", "\n")
-		local old_value = NXFS.readfile("/etc/openclash/custom/openclash_custom_fallback_filter.yaml")
+		local old_value = fs.readfile("/etc/openclash/custom/openclash_custom_fallback_filter.yaml")
 		if value ~= old_value then
-			NXFS.writefile("/etc/openclash/custom/openclash_custom_fallback_filter.yaml", value)
+			fs.writefile("/etc/openclash/custom/openclash_custom_fallback_filter.yaml", value)
 		end
 	end
 end
@@ -237,14 +237,14 @@ custom_fake_black.wrap = "off"
 custom_fake_black:depends("custom_fakeip_filter", "1")
 
 function custom_fake_black.cfgvalue(self, section)
-	return NXFS.readfile("/etc/openclash/custom/openclash_custom_fake_filter.list") or ""
+	return fs.readfile("/etc/openclash/custom/openclash_custom_fake_filter.list") or ""
 end
 function custom_fake_black.write(self, section, value)
 	if value then
 		value = value:gsub("\r\n?", "\n")
-		local old_value = NXFS.readfile("/etc/openclash/custom/openclash_custom_fake_filter.list")
+		local old_value = fs.readfile("/etc/openclash/custom/openclash_custom_fake_filter.list")
 		if value ~= old_value then
-			NXFS.writefile("/etc/openclash/custom/openclash_custom_fake_filter.list", value)
+			fs.writefile("/etc/openclash/custom/openclash_custom_fake_filter.list", value)
 		end
 	end
 end
@@ -261,14 +261,14 @@ custom_domain_dns_policy.wrap = "off"
 custom_domain_dns_policy:depends("custom_name_policy", "1")
 
 function custom_domain_dns_policy.cfgvalue(self, section)
-	return NXFS.readfile("/etc/openclash/custom/openclash_custom_domain_dns_policy.list") or ""
+	return fs.readfile("/etc/openclash/custom/openclash_custom_domain_dns_policy.list") or ""
 end
 function custom_domain_dns_policy.write(self, section, value)
 	if value then
 		value = value:gsub("\r\n?", "\n")
-		local old_value = NXFS.readfile("/etc/openclash/custom/openclash_custom_domain_dns_policy.list")
+		local old_value = fs.readfile("/etc/openclash/custom/openclash_custom_domain_dns_policy.list")
 		if value ~= old_value then
-			NXFS.writefile("/etc/openclash/custom/openclash_custom_domain_dns_policy.list", value)
+			fs.writefile("/etc/openclash/custom/openclash_custom_domain_dns_policy.list", value)
 		end
 	end
 end
@@ -284,14 +284,14 @@ custom_proxy_server_dns_policy.wrap = "off"
 custom_proxy_server_dns_policy:depends("custom_proxy_server_policy", "1")
 
 function custom_proxy_server_dns_policy.cfgvalue(self, section)
-	return NXFS.readfile("/etc/openclash/custom/openclash_custom_proxy_server_dns_policy.list") or ""
+	return fs.readfile("/etc/openclash/custom/openclash_custom_proxy_server_dns_policy.list") or ""
 end
 function custom_proxy_server_dns_policy.write(self, section, value)
 	if value then
 		value = value:gsub("\r\n?", "\n")
-		local old_value = NXFS.readfile("/etc/openclash/custom/openclash_custom_proxy_server_dns_policy.list")
+		local old_value = fs.readfile("/etc/openclash/custom/openclash_custom_proxy_server_dns_policy.list")
 		if value ~= old_value then
-			NXFS.writefile("/etc/openclash/custom/openclash_custom_proxy_server_dns_policy.list", value)
+			fs.writefile("/etc/openclash/custom/openclash_custom_proxy_server_dns_policy.list", value)
 		end
 	end
 end
@@ -307,14 +307,14 @@ custom_hosts.wrap = "off"
 custom_hosts:depends("custom_host", "1")
 
 function custom_hosts.cfgvalue(self, section)
-	return NXFS.readfile("/etc/openclash/custom/openclash_custom_hosts.list") or ""
+	return fs.readfile("/etc/openclash/custom/openclash_custom_hosts.list") or ""
 end
 function custom_hosts.write(self, section, value)
 	if value then
 		value = value:gsub("\r\n?", "\n")
-		local old_value = NXFS.readfile("/etc/openclash/custom/openclash_custom_hosts.list")
+		local old_value = fs.readfile("/etc/openclash/custom/openclash_custom_hosts.list")
 		if value ~= old_value then
-			NXFS.writefile("/etc/openclash/custom/openclash_custom_hosts.list", value)
+			fs.writefile("/etc/openclash/custom/openclash_custom_hosts.list", value)
 		end
 	end
 end
@@ -374,14 +374,14 @@ sniffer_custom.rows = 20
 sniffer_custom.wrap = "off"
 
 function sniffer_custom.cfgvalue(self, section)
-	return NXFS.readfile("/etc/openclash/custom/openclash_custom_sniffer.yaml") or ""
+	return fs.readfile("/etc/openclash/custom/openclash_custom_sniffer.yaml") or ""
 end
 function sniffer_custom.write(self, section, value)
 	if value then
 		value = value:gsub("\r\n?", "\n")
-		local old_value = NXFS.readfile("/etc/openclash/custom/openclash_custom_sniffer.yaml")
+		local old_value = fs.readfile("/etc/openclash/custom/openclash_custom_sniffer.yaml")
 		if value ~= old_value then
-			NXFS.writefile("/etc/openclash/custom/openclash_custom_sniffer.yaml", value)
+			fs.writefile("/etc/openclash/custom/openclash_custom_sniffer.yaml", value)
 		end
 	end
 end
@@ -466,14 +466,14 @@ custom_rules.rows = 20
 custom_rules.wrap = "off"
 
 function custom_rules.cfgvalue(self, section)
-	return NXFS.readfile("/etc/openclash/custom/openclash_custom_rules.list") or ""
+	return fs.readfile("/etc/openclash/custom/openclash_custom_rules.list") or ""
 end
 function custom_rules.write(self, section, value)
 	if value then
 		value = value:gsub("\r\n?", "\n")
-		local old_value = NXFS.readfile("/etc/openclash/custom/openclash_custom_rules.list")
+		local old_value = fs.readfile("/etc/openclash/custom/openclash_custom_rules.list")
 		if value ~= old_value then
-			NXFS.writefile("/etc/openclash/custom/openclash_custom_rules.list", value)
+			fs.writefile("/etc/openclash/custom/openclash_custom_rules.list", value)
 		end
 	end
 end
@@ -486,14 +486,14 @@ custom_rules_2.rows = 20
 custom_rules_2.wrap = "off"
 
 function custom_rules_2.cfgvalue(self, section)
-	return NXFS.readfile("/etc/openclash/custom/openclash_custom_rules_2.list") or ""
+	return fs.readfile("/etc/openclash/custom/openclash_custom_rules_2.list") or ""
 end
 function custom_rules_2.write(self, section, value)
 	if value then
 		value = value:gsub("\r\n?", "\n")
-		local old_value = NXFS.readfile("/etc/openclash/custom/openclash_custom_rules_2.list")
+		local old_value = fs.readfile("/etc/openclash/custom/openclash_custom_rules_2.list")
 		if value ~= old_value then
-			NXFS.writefile("/etc/openclash/custom/openclash_custom_rules_2.list", value)
+			fs.writefile("/etc/openclash/custom/openclash_custom_rules_2.list", value)
 		end
 	end
 end