From b0613e5b9b1039e607611e174c1a9d299bccd6e6 Mon Sep 17 00:00:00 2001 From: wangyu- Date: Thu, 11 Jan 2018 17:38:01 -0600 Subject: [PATCH] update 3rd party --- third-party/luci-app-udp2raw/Makefile | 23 ++-- .../files/luci/i18n/udp2raw.zh-cn.lmo | Bin 1364 -> 1372 bytes .../files/luci/i18n/udp2raw.zh-cn.po | 4 +- .../files/luci/model/cbi/udp2raw/general.lua | 5 +- .../files/luci/view/udp2raw/dynamiclist.htm | 98 +++++++++++++ .../files/luci/view/udp2raw/status.htm | 39 ++++++ .../files/root/etc/config/udp2raw | 2 +- .../files/root/etc/init.d/udp2raw | 93 ++++++------- .../files/root/etc/init.d/udp2raw.init | 130 ++++++++++++++++++ .../files/root/etc/uci-defaults/luci-udp2raw | 2 - .../luci-app-udp2raw/luci-app-udp2raw1.jpg | Bin 87254 -> 79120 bytes .../luci-app-udp2raw/luci-app-udp2raw2.jpg | Bin 91137 -> 90519 bytes .../luci-app-udp2raw/luci-app-udp2raw3.jpg | Bin 152168 -> 134611 bytes third-party/udp2raw-openwrt-makefile/Makefile | 17 ++- 14 files changed, 335 insertions(+), 78 deletions(-) create mode 100644 third-party/luci-app-udp2raw/files/luci/view/udp2raw/dynamiclist.htm create mode 100644 third-party/luci-app-udp2raw/files/luci/view/udp2raw/status.htm create mode 100644 third-party/luci-app-udp2raw/files/root/etc/init.d/udp2raw.init diff --git a/third-party/luci-app-udp2raw/Makefile b/third-party/luci-app-udp2raw/Makefile index 8ce589e..66541e1 100644 --- a/third-party/luci-app-udp2raw/Makefile +++ b/third-party/luci-app-udp2raw/Makefile @@ -9,17 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-udp2raw PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Jian Chang -PKG_BUILD_PARALLEL:=1 - include $(INCLUDE_DIR)/package.mk -define Package/luci-app-udp2raw +define Package/$(PKG_NAME) SECTION:=luci CATEGORY:=LuCI SUBMENU:=3. Applications @@ -28,7 +26,7 @@ define Package/luci-app-udp2raw DEPENDS:=+udp2raw-tunnel endef -define Package/luci-app-udp2raw/description +define Package/$(PKG_NAME)/description LuCI Support for udp2raw-tunnel. endef @@ -43,28 +41,27 @@ endef define Build/Compile endef -define Package/luci-app-udp2raw/postinst +define Package/$(PKG_NAME)/postinst #!/bin/sh if [ -z "$${IPKG_INSTROOT}" ]; then ( . /etc/uci-defaults/luci-udp2raw ) && rm -f /etc/uci-defaults/luci-udp2raw - rm -rf /tmp/luci-indexcache /tmp/luci-modulecache fi exit 0 endef -define Package/luci-app-udp2raw/conffiles -/etc/config/udp2raw +define Package/$(PKG_NAME)/conffiles + /etc/config/udp2raw endef -define Package/luci-app-udp2raw/install +define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n $(INSTALL_DATA) $(PKG_BUILD_DIR)/udp2raw.*.lmo $(1)/usr/lib/lua/luci/i18n/ $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller $(INSTALL_DATA) ./files/luci/controller/*.lua $(1)/usr/lib/lua/luci/controller/ $(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/udp2raw $(INSTALL_DATA) ./files/luci/model/cbi/udp2raw/*.lua $(1)/usr/lib/lua/luci/model/cbi/udp2raw/ - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/view - $(INSTALL_DATA) ./files/luci/view/*.htm $(1)/usr/lib/lua/luci/view/ + $(INSTALL_DIR) $(1)/usr/lib/lua/luci/view/udp2raw + $(INSTALL_DATA) ./files/luci/view/udp2raw/*.htm $(1)/usr/lib/lua/luci/view/udp2raw/ $(INSTALL_DIR) $(1)/etc/config $(INSTALL_CONF) ./files/root/etc/config/udp2raw $(1)/etc/config/udp2raw $(INSTALL_DIR) $(1)/etc/init.d @@ -73,4 +70,4 @@ define Package/luci-app-udp2raw/install $(INSTALL_BIN) ./files/root/etc/uci-defaults/luci-udp2raw $(1)/etc/uci-defaults/luci-udp2raw endef -$(eval $(call BuildPackage,luci-app-udp2raw)) +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/third-party/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.lmo b/third-party/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.lmo index e25325de0821449545710424e3005f4229cfaf7e..a73a6cf62b3f7afc647f65cdb53850730f7ea31e 100644 GIT binary patch delta 157 zcmcb@b%$$103-9uRXvk~89jNPuAB92&irSK8=lQyI(ZSJ9uot@<_nCw85!qH?qSxD zP|eqP$iTojhk=2?D&8(dnQ`T($w2;-$!D1D8Q)CiVX;?S0hDu`^(6gp^s$l)zTkR0nBBTdo{{UispvoTr D$4)cD delta 200 zcmcb^b%kp~03-8@bxS4(GkUT;pFQ!#^0vt<81**aVBF2fIA!t_W(|q6VY=HH7#Qa; zFff?J+odQouKY9^$iFlB3bQ@qlgT11_K6FCa*nf}rK~Ejnb`xB3jp$Yw#eR({Ih)+F9}kfNT?x{O((sSBy74y$Mu*0m$b%?9wegNw<7IkPWg+=xDmz mku@Fx`+)j0CU0TsmrMYPvVQNac8F^c(gU)805LyM_5%RJPeGUf diff --git a/third-party/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.po b/third-party/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.po index fb20472..92c892b 100644 --- a/third-party/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.po +++ b/third-party/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.po @@ -77,7 +77,7 @@ msgid "Cipher Mode" msgstr "加密方式" msgid "Auth Mode" -msgstr "认证方式" +msgstr "验证方式" msgid "Auto Rule" msgstr "自动规则" @@ -89,7 +89,7 @@ msgid "Keep Rule" msgstr "保持规则" msgid "Monitor iptables and auto re-add if necessary." -msgstr "监视 iptables 并在必要时重新添加规则。" +msgstr "定期检查 iptables 并在必要时重新添加规则。" msgid "seq Mode" msgstr "seq 模式" diff --git a/third-party/luci-app-udp2raw/files/luci/model/cbi/udp2raw/general.lua b/third-party/luci-app-udp2raw/files/luci/model/cbi/udp2raw/general.lua index a4d3430..dbd22e9 100644 --- a/third-party/luci-app-udp2raw/files/luci/model/cbi/udp2raw/general.lua +++ b/third-party/luci-app-udp2raw/files/luci/model/cbi/udp2raw/general.lua @@ -18,13 +18,14 @@ uci:foreach("udp2raw", "servers", function(s) end) m = Map("udp2raw", "%s - %s" %{translate("udp2raw-tunnel"), translate("Settings")}) -m:append(Template("udp2raw_status")) +m:append(Template("udp2raw/status")) s = m:section(NamedSection, "general", "general", translate("General Settings")) s.anonymous = true s.addremove = false -o = s:option(ListValue, "server", translate("Server")) +o = s:option(DynamicList, "server", translate("Server")) +o.template = "udp2raw/dynamiclist" o:value("nil", translate("Disable")) for _, s in ipairs(servers) do o:value(s.name, s.alias) end o.default = "nil" diff --git a/third-party/luci-app-udp2raw/files/luci/view/udp2raw/dynamiclist.htm b/third-party/luci-app-udp2raw/files/luci/view/udp2raw/dynamiclist.htm new file mode 100644 index 0000000..7ee3dc9 --- /dev/null +++ b/third-party/luci-app-udp2raw/files/luci/view/udp2raw/dynamiclist.htm @@ -0,0 +1,98 @@ +<%# + Copyright (C) 2017 Jian Chang + Licensed to the public under the GNU General Public License v3. +-%> + +<%+cbi/valueheader%> + +<%- + local values = self:formvalue(section) + if not values then + values = self:cfgvalue(section) or {self.default} + end + + local function serialize_json(x, cb) + local rv, push = nil, cb + if not push then + rv = { } + push = function(tok) rv[#rv+1] = tok end + end + + if x == nil then + push("null") + elseif type(x) == "table" then + push("[") + for k = 1, #x do + if k > 1 then + push(",") + end + serialize_json(x[k], push) + end + push("]") + else + push('"%s"' % tostring(x):gsub('["%z\1-\31\\]', + function(c) return '\\u%04x' % c:byte(1) end)) + end + + if not cb then + return table.concat(rv, "") + end + end +-%> + +> + + +<%+cbi/valuefooter%> diff --git a/third-party/luci-app-udp2raw/files/luci/view/udp2raw/status.htm b/third-party/luci-app-udp2raw/files/luci/view/udp2raw/status.htm new file mode 100644 index 0000000..964b117 --- /dev/null +++ b/third-party/luci-app-udp2raw/files/luci/view/udp2raw/status.htm @@ -0,0 +1,39 @@ +<% +local function get_udp2raw_version(name) + local info = luci.util.split(luci.sys.exec("%s -h 2>/dev/null" %{name}), "\n") + local version = string.match(info[2], "git version:(%w+)") + local build = string.match(info[2], "build date:(.+)") + return info[1] == "udp2raw-tunnel" and version or "", info[1] == "udp2raw-tunnel" and build or "" +end + +local udp2raw_version, udp2raw_build = get_udp2raw_version("udp2raw") +-%> + +
+ <%:Running Status%> + + + + + + <% if udp2raw_build ~= "" then -%> + + <% end -%> + +
<%:Binary Version%> + <% if udp2raw_version == "" then -%> + <%:Invalid Binary File.%> + <% else -%> + <%=pcdata(udp2raw_version)%> + <%- end %> +
<%:Build Time%><%=pcdata(udp2raw_build)%>
<%:Running Status%><%:Collecting data...%>
+
+ + diff --git a/third-party/luci-app-udp2raw/files/root/etc/config/udp2raw b/third-party/luci-app-udp2raw/files/root/etc/config/udp2raw index 8a27625..eaa58ee 100644 --- a/third-party/luci-app-udp2raw/files/root/etc/config/udp2raw +++ b/third-party/luci-app-udp2raw/files/root/etc/config/udp2raw @@ -1,6 +1,6 @@ config general 'general' - option server 'nil' + list server 'nil' option daemon_user 'root' config servers 'default' diff --git a/third-party/luci-app-udp2raw/files/root/etc/init.d/udp2raw b/third-party/luci-app-udp2raw/files/root/etc/init.d/udp2raw index 3733b66..3c960cc 100644 --- a/third-party/luci-app-udp2raw/files/root/etc/init.d/udp2raw +++ b/third-party/luci-app-udp2raw/files/root/etc/init.d/udp2raw @@ -1,51 +1,56 @@ #!/bin/sh /etc/rc.common START=88 +STOP=15 USE_PROCD=1 -UDP2RAW=udp2raw +NAME=udp2raw _log() { - local level="$1" - local msg="$2" - - logger -p "daemon.${level}" -t "$UDP2RAW" "$msg" + logger -p "daemon.$1" -t "$NAME" "$2" } -gen_client_config_file() { +has_valid_server() { + local server + for server in $@; do + [ "$(uci_get $NAME $server)" = "servers" ] && return 0 + done + return 1 +} + +create_config() { local config_file="$1" echo "# auto-generated config file from /etc/config/udp2raw" > $config_file echo "-c" >> $config_file - echo "-l ${listen_addr}:${listen_port}" >> $config_file && _log "info" "listening on: ${listen_addr}:${listen_port}" - echo "-r ${server_addr}:${server_port}" >> $config_file && _log "info" "remote address: ${server_addr}:${server_port}" + echo "-l ${listen_addr:=127.0.0.1}:${listen_port:=2080}" >> $config_file && _log "info" "listening on: ${listen_addr}:${listen_port}" + echo "-r ${server_addr}:${server_port:=8080}" >> $config_file [ -n "$raw_mode" ] && echo "--raw-mode ${raw_mode}" >> $config_file && _log "info" "raw-mode: ${raw_mode}" [ -n "$key" ] && echo "--key ${key}" >> $config_file - [ -n "$cipher_mode" ] && echo "--cipher-mode ${cipher_mode}" >> $config_file && _log "info" "cipher-mode: ${cipher_mode}" - [ -n "$auth_mode" ] && echo "--auth-mode ${auth_mode}" >> $config_file && _log "info" "auth-mode: ${auth_mode}" + [ -n "$cipher_mode" ] && echo "--cipher-mode ${cipher_mode}" >> $config_file + [ -n "$auth_mode" ] && echo "--auth-mode ${auth_mode}" >> $config_file - [ "$auto_rule" -ne 0 ] && echo "--auto-rule" >> $config_file && _log "info" "auto-rule: true" - [ "$auto_rule" -ne 0 -a "$keep_rule" -ne 0 ] && echo "--keep-rule" >> $config_file && _log "info" "keep-rule: true" + [ $auto_rule -eq 1 ] && echo "--auto-rule" >> $config_file + [ $auto_rule -eq 1 -a $keep_rule -eq 1 ] && echo "--keep-rule" >> $config_file - [ -n "$seq_mode" ] && echo "--seq-mode ${seq_mode}" >> $config_file && _log "info" "seq-mode: ${seq_mode}" - [ -n "$lower_level" ] && echo "--lower-level ${lower_level}" >> $config_file && _log "info" "lower-level: ${lower_level}" + [ -n "$seq_mode" ] && echo "--seq-mode ${seq_mode}" >> $config_file + [ -n "$lower_level" ] && echo "--lower-level ${lower_level}" >> $config_file [ -n "$source_ip" ] && echo "--source-ip ${source_ip}" >> $config_file [ -n "$source_port" ] && echo "--source-port ${source_port}" >> $config_file [ -n "$log_level" ] && echo "--log-level ${log_level}" >> $config_file echo "--disable-color" >> $config_file - _log "info" "running from ${daemon_user} user" } validate_config_section() { - uci_validate_section "$UDP2RAW" general "$1" \ + uci_validate_section "$NAME" general "$1" \ 'server:uciname' \ 'daemon_user:string:root' } validate_server_section() { - uci_validate_section "$UDP2RAW" servers "$1" \ + uci_validate_section "$NAME" servers "$1" \ 'server_addr:host' \ 'server_port:port:8080' \ 'listen_addr:ipaddr:127.0.0.1' \ @@ -63,59 +68,49 @@ validate_server_section() { 'log_level:range(0,6)' } -start_udp2raw_instance() { - local section="$1" +start_instance() { + local server="$1" - if ! validate_config_section "$section" ; then - _log "err" "Config validate failed." - return 1 - fi - - if [ -z "$server" ] || [ "$server" = "nil" ]; then + if [ -z "$server" -o "$server" == "nil" ]; then return 0 elif ! validate_server_section "$server"; then _log "err" "Server config validation failed." return 1 - elif [ -z "$server_addr" ]; then + fi + + /sbin/validate_data "ipaddr" "$server_addr" >/dev/null 2>&1 + [ $? -ne 0 ] && server_addr=$(nslookup "$server_addr" | \ + sed -n 's/^Address[[:space:]]*[0-9]*:[[:space:]]*\(\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\)$/\1/p') + if [ -z "$server_addr" ]; then _log "err" "Server address validation failed." return 1 fi - is_ipv6_address() { - echo "$1" | grep -q ":" - } - - is_ipv6_address "$server_addr" && server_addr="[${server_addr}]" - is_ipv6_address "$listen_addr" && listen_addr="[${listen_addr}]" - - _log "notice" "udp2raw-tunnel start." [ -d /var/etc ] || mkdir -p /var/etc - local config_file=/var/etc/${UDP2RAW}.${server}.conf - - if ! ( gen_client_config_file "$config_file" ); then - _log "err" "Can't create config file". - return 1 - fi + local config_file="/var/etc/${NAME}.${server}.conf" + create_config "$config_file" || return 1 procd_open_instance procd_set_param command /usr/bin/udp2raw procd_append_param command --conf-file "$config_file" procd_set_param respawn procd_set_param file "$config_file" - procd_set_param user "$daemon_user" - procd_set_param pidfile /var/run/${UDP2RAW}.${server}.pid + [ -n "$daemon_user" ] && procd_set_param user "$daemon_user" && _log "info" "running from ${daemon_user} user" + procd_set_param pidfile "/var/run/${NAME}.${server}.pid" procd_close_instance } service_triggers() { - procd_add_reload_trigger "$UDP2RAW" + procd_add_reload_trigger "$NAME" } start_service() { - config_load "$UDP2RAW" - config_foreach start_udp2raw_instance "general" -} - -stop_service() { - _log "notice" "udp2raw-tunnel stop." + if ! validate_config_section "general" ; then + _log "err" "Config validate failed." + return 1 + fi + has_valid_server $server || return 1 + for srv in $server; do + start_instance $srv + done } diff --git a/third-party/luci-app-udp2raw/files/root/etc/init.d/udp2raw.init b/third-party/luci-app-udp2raw/files/root/etc/init.d/udp2raw.init new file mode 100644 index 0000000..7232d5f --- /dev/null +++ b/third-party/luci-app-udp2raw/files/root/etc/init.d/udp2raw.init @@ -0,0 +1,130 @@ +#!/bin/sh /etc/rc.common + +START=88 +STOP=15 + +NAME=udp2raw + +_log() { + logger -p "daemon.$1" -t "$NAME" "$2" +} + +has_valid_server() { + local server + for server in $@; do + [ "$(uci_get $NAME $server)" = "servers" ] && return 0 + done + return 1 +} + +create_config() { + local config_file="$1" + echo "# auto-generated config file from /etc/config/udp2raw" > $config_file + + echo "-c" >> $config_file + echo "-l ${listen_addr:=127.0.0.1}:${listen_port:=2080}" >> $config_file + echo "-r ${server_addr}:${server_port:=8080}" >> $config_file + + [ -n "$raw_mode" ] && echo "--raw-mode ${raw_mode}" >> $config_file + [ -n "$key" ] && echo "--key ${key}" >> $config_file + [ -n "$cipher_mode" ] && echo "--cipher-mode ${cipher_mode}" >> $config_file + [ -n "$auth_mode" ] && echo "--auth-mode ${auth_mode}" >> $config_file + + [ $auto_rule -eq 1 ] && echo "--auto-rule" >> $config_file + [ $auto_rule -eq 1 -a $keep_rule -eq 1 ] && echo "--keep-rule" >> $config_file + + [ -n "$seq_mode" ] && echo "--seq-mode ${seq_mode}" >> $config_file + [ -n "$lower_level" ] && echo "--lower-level ${lower_level}" >> $config_file + [ -n "$source_ip" ] && echo "--source-ip ${source_ip}" >> $config_file + [ -n "$source_port" ] && echo "--source-port ${source_port}" >> $config_file + + [ -n "$log_level" ] && echo "--log-level ${log_level}" >> $config_file + echo "--disable-color" >> $config_file +} + +validate_config_section() { + local ret=$(/sbin/validate_data "$NAME" general "$1" \ + 'server:uciname' \ + 'daemon_user:string:root' \ + 2> /dev/null) + [ $? -ne 0 ] && return 1 + eval "$ret" +} + +validate_server_section() { + local ret=$(/sbin/validate_data "$NAME" servers "$1" \ + 'server_addr:host' \ + 'server_port:port:8080' \ + 'listen_addr:ipaddr:127.0.0.1' \ + 'listen_port:port:2080' \ + 'raw_mode:or("faketcp", "udp", "icmp"):faketcp' \ + 'key:string' \ + 'cipher_mode:or("aes128cbc", "xor", "none"):aes128cbc' \ + 'auth_mode:or("md5", "crc32", "simple", "none"):md5' \ + 'auto_rule:bool:1' \ + 'keep_rule:bool:0' \ + 'seq_mode:range(0,4)' \ + 'lower_level:string' \ + 'source_ip:ipaddr' \ + 'source_port:port' \ + 'log_level:range(0,6)' \ + 2> /dev/null) + [ $? -ne 0 ] && return 1 + eval "$ret" +} + +start_instance() { + local server="$1" + + if [ -z "$server" -o "$server" == "nil" ]; then + return 0 + elif ! validate_server_section "$server"; then + _log "err" "Server config validation failed." + return 1 + fi + + /sbin/validate_data "ipaddr" "$server_addr" >/dev/null 2>&1 + [ $? -ne 0 ] && server_addr=$(nslookup "$server_addr" | \ + sed -n 's/^Address[[:space:]]*[0-9]*:[[:space:]]*\(\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\)$/\1/p') + if [ -z "$server_addr" ]; then + _log "err" "Server address validation failed." + return 1 + fi + + [ -d /var/etc ] || mkdir -p /var/etc + local config_file="/var/etc/${NAME}.${server}.conf" + create_config "$config_file" || return 1 + [ -d "/var/log/${NAME}" ] || mkdir -p "/var/log/${NAME}" + + /usr/bin/udp2raw --conf-file "$config_file" >> "/var/log/${NAME}/${NAME}.${server}.log" & + echo $! > "/var/run/${NAME}.${server}.pid" + return 0 +} + +start() { + pgrep "/usr/bin/${NAME}" >/dev/null 2>&1 && return + + if ! validate_config_section "general" ; then + _log "err" "Config validate failed." + return 1 + fi + has_valid_server $server || return 1 + for srv in $server; do + start_instance $srv + done +} + +stop() { + local pids=$(pgrep "/usr/bin/${NAME}" 2> /dev/null) + [ $? -ne 0 ] && return + for pid in $pids; do + kill $pid >/dev/null 2>&1 + done + return 0 +} + +restart() { + stop + sleep 1 + start +} diff --git a/third-party/luci-app-udp2raw/files/root/etc/uci-defaults/luci-udp2raw b/third-party/luci-app-udp2raw/files/root/etc/uci-defaults/luci-udp2raw index c04688e..d8d7b7e 100644 --- a/third-party/luci-app-udp2raw/files/root/etc/uci-defaults/luci-udp2raw +++ b/third-party/luci-app-udp2raw/files/root/etc/uci-defaults/luci-udp2raw @@ -8,11 +8,9 @@ uci -q batch <<-EOF >/dev/null EOF general=$(uci -q get udp2raw.@general[-1]) - if [ -z "$general" ]; then uci -q add udp2raw general fi - if [ ."$general" != ."general" ]; then uci -q batch <<-EOF >/dev/null rename udp2raw.@general[-1]="general" diff --git a/third-party/luci-app-udp2raw/luci-app-udp2raw1.jpg b/third-party/luci-app-udp2raw/luci-app-udp2raw1.jpg index b44fbd5c88acc6b669a213ea1096d5f7e2f7be5f..8369c26c65e4d84bbae07d8048de9a884b1d5295 100644 GIT binary patch literal 79120 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