💐 Sync 2026-03-26 23:55:15

baidupcs-go/Makefile

@@ -6,8 +6,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=BaiduPCS-Go
-PKG_VERSION:=4.0.0
-PKG_RELEASE:=1
+PKG_VERSION:=4.0.1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/qjfoidnh/BaiduPCS-Go/tar.gz/v$(PKG_VERSION)?

luci-proto-openvpn/Makefile

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2026 OpenWRT
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Support for OpenVPN
+LUCI_DEPENDS:=+openvpn
+LUCI_PKGARCH:=all
+
+PKG_LICENSE:=Apache-2.0
+
+include $(TOPDIR)/feeds/luci/luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature

luci-proto-openvpn/root/usr/share/rpcd/acl.d/luci-proto-openvpn.json

@@ -0,0 +1,28 @@
+{
+	"luci-proto-openvpn": {
+		"description": "Grant access to LuCI openvpn procedures",
+		"read": {
+			"file": {
+				"/bin/mkdir -p /etc/openvpn/*": [ "exec" ],
+				"/etc/openvpn/*": [ "read" ]
+			},
+			"ubus": {
+				"luci.openvpn": [
+					"*"
+				]
+			},
+			"uci": [ "network" ]
+		},
+		"write": {
+			"file": {
+				"/etc/openvpn/*": [ "write", "remove" ]
+			},
+			"ubus": {
+				"luci.openvpn": [
+					"*"
+				]
+			},
+			"uci": [ "network" ]
+		}
+	}
+}

luci-proto-openvpn/root/usr/share/rpcd/ucode/luci.openvpn.uc

@@ -0,0 +1,104 @@
+#!/usr/bin/env ucode
+
+'use strict';
+
+import { stdin, access, chmod, dirname, basename, open, popen, glob, lsdir, readfile, readlink, error, mkdir } from 'fs';
+import { cursor } from 'uci';
+import { connect } from 'ubus';
+
+
+const openvpn_dir = '/etc/openvpn';
+
+function shellquote(s) {
+	return `'${replace(s, "'", "'\\''")}'`;
+}
+
+function command(cmd) {
+	return trim(popen(cmd)?.read?.('all'));
+}
+
+function makedirs(path) {
+	const parts = split(path, '/');
+	const grow = [];
+	for(let i = 0; i < length(parts); i++) {
+		push(grow, parts[i]);
+		mkdir(join('/', grow));
+	}
+	return join('/', grow);
+}
+
+function keyDir(ifname, kt) {
+	return `${openvpn_dir}/${ifname}/${kt}`;
+}
+
+const methods = {
+	generateKey: {
+		args: { keytype: 'keytype', ifname: 'ifname', server_key: 'server_key', cl_meta: 'c_metadata' },
+		call: function(req) {
+			const kt = req.args?.keytype;
+			const ifname = req.args?.ifname || 'unnamed';
+			const ts = time();
+
+			if (!kt) return { error: 'missing keytype' };
+
+			let dir;
+			let outfile = `${ifname}_${kt}_${ts}.key`;
+
+			let mkpath = makedirs(`${keyDir(ifname, kt)}`);
+			let path = `${mkpath}/${outfile}`;
+
+			// find openvpn binary
+			const openvpn = trim(popen('command -v openvpn 2>/dev/null')?.read?.('all'));
+			if (!length(openvpn)) return { error: 'openvpn binary not found' };
+
+			let cmd;
+			if (kt == 'tls-crypt-v2-client') {
+				// client generation needs server key
+				let server_key = req.args?.server_key;
+				if (!server_key) {
+					// try to pick latest server key for same interface
+					const serverDir = `${keyDir(ifname, 'tls-crypt-v2-server')}`;
+					const list = lsdir(serverDir);
+					if (length(list) > 0) server_key = serverDir + '/' + list[-1];
+				} else {
+					server_key = `${keyDir(ifname, 'tls-crypt-v2-server')}/${req.args?.server_key}`;
+				}
+
+				if (!server_key) return { error: 'missing server_key for tls-crypt-v2-client' };
+
+				// denote which server key this client key is derived from in the name
+				path = `${mkpath}/${ifname}_${kt}_${ts}-${req.args?.server_key}`;
+				cmd = `${openvpn} --tls-crypt-v2 ${shellquote(server_key)} --genkey tls-crypt-v2-client ${shellquote(path)} ${req.args?.cl_meta} 2>/dev/null`;
+			} else {
+				// basic genkey
+				cmd = `${openvpn} --genkey ${kt} ${shellquote(path)} 2>/dev/null`;
+			}
+
+			const out = popen(cmd)?.read?.('all') || '';
+
+			// ensure permissions
+			chmod(path, 0o600);
+
+			let content = '';
+			try { content = readfile(path); } catch (e) { /* ignore */ }
+
+			if (!length(content)) {
+				return { error: 'failed to generate key', cmd_output: out };
+			}
+
+			return { path, filename: outfile, content };
+		}
+	},
+
+	getSKeys: {
+		args: { ifname: 'ifname' },
+		call: function(req) {
+			const serverDir = `${keyDir(req.args?.ifname, 'tls-crypt-v2-server')}`;
+			const list = lsdir(serverDir);
+
+			return { skeys: list, path: serverDir };
+		}
+	}
+};
+
+return { 'luci.openvpn': methods };