From 157292694b393b720ee237a963cd0eaa67ae2f5c Mon Sep 17 00:00:00 2001 From: Xingwang Liao Date: Tue, 9 Apr 2019 18:27:56 +0800 Subject: [PATCH] chore: Format code Signed-off-by: Xingwang Liao --- luasrc/model/cbi/frpc/common.lua | 48 ++--- luasrc/model/cbi/frpc/rules.lua | 2 +- luasrc/model/cbi/frpc/servers.lua | 2 +- luasrc/view/frpc/status_header.htm | 28 +-- root/etc/init.d/frpc | 326 ++++++++++++++--------------- root/etc/uci-defaults/40_luci-frpc | 4 +- 6 files changed, 205 insertions(+), 205 deletions(-) diff --git a/luasrc/model/cbi/frpc/common.lua b/luasrc/model/cbi/frpc/common.lua index a4a34fd..effaed3 100644 --- a/luasrc/model/cbi/frpc/common.lua +++ b/luasrc/model/cbi/frpc/common.lua @@ -12,31 +12,31 @@ local server_table = { } uci:foreach("frpc", "server", function(s) if s.alias then server_table[s[".name"]] = s.alias - elseif s.server_addr and s.server_port then - local ip = s.server_addr - if s.server_addr:find(":") then - ip = "[%s]" % s.server_addr - end + elseif s.server_addr and s.server_port then + local ip = s.server_addr + if s.server_addr:find(":") then + ip = "[%s]" % s.server_addr + end server_table[s[".name"]] = "%s:%s" % { ip, s.server_port } end end) local function frpc_version() - local file = uci:get("frpc", "main", "client_file") + local file = uci:get("frpc", "main", "client_file") - if not file or file == "" or not fs.stat(file) then - return "%s" % translate("Invalid client file") - end + if not file or file == "" or not fs.stat(file) then + return "%s" % translate("Invalid client file") + end - if not fs.access(file, "rwx", "rx", "rx") then - fs.chmod(file, 755) - end + if not fs.access(file, "rwx", "rx", "rx") then + fs.chmod(file, 755) + end - local version = util.trim(sys.exec("%s -v 2>/dev/null" % file)) - if version == "" then - return "%s" % translate("Can't get client version") - end - return translatef("Version: %s", version) + local version = util.trim(sys.exec("%s -v 2>/dev/null" % file)) + if version == "" then + return "%s" % translate("Can't get client version") + end + return translatef("Version: %s", version) end m = Map("frpc", "%s - %s" % { translate("Frpc"), translate("Common Settings") }, @@ -68,11 +68,11 @@ for k, v in pairs(server_table) do end o = s:taboption("general", ListValue, "run_user", translate("Run daemon as user"), - translate("Leave blank to use default user")) + translate("Leave blank to use default user")) o:value("") local user for user in util.execi("cat /etc/passwd | cut -d':' -f1") do - o:value(user) + o:value(user) end o = s:taboption("general", Flag, "enable_logging", translate("Enable logging")) @@ -96,13 +96,13 @@ o.datatype = "uinteger" o.placeholder = '3' o = s:taboption("advanced", Value, "pool_count", translate("Pool count"), - translate("Connections will be established in advance, default value is zero")) + translate("Connections will be established in advance, default value is zero")) o.datatype = "uinteger" o.defalut = '0' o.placeholder = '0' o = s:taboption("advanced", Value, "user", translate("Proxy user"), - translate("Your proxy name will be changed to {user}.{proxy}")) + translate("Your proxy name will be changed to {user}.{proxy}")) o = s:taboption("advanced", Flag, "login_fail_exit", translate("Login fail exit")) o.enabled = "true" @@ -111,17 +111,17 @@ o.defalut = o.enabled o.rmempty = false o = s:taboption("advanced", ListValue, "protocol", translate("Protocol"), - translate("Communication protocol used to connect to server, default is tcp")) + translate("Communication protocol used to connect to server, default is tcp")) o:value("tcp", "TCP") o:value("kcp", "KCP") o:value("websocket", "Websocket") o.default = "tcp" o = s:taboption("advanced", Value, "http_proxy", translate("HTTP proxy"), - translate("Connect frps by http proxy or socks5 proxy, format: [protocol]://[user]:[passwd]@[ip]:[port]")) + translate("Connect frps by http proxy or socks5 proxy, format: [protocol]://[user]:[passwd]@[ip]:[port]")) o = s:taboption("advanced", Flag, "tls_enable", translate("TLS enable"), - translate("If true, Frpc will connect Frps by TLS")) + translate("If true, Frpc will connect Frps by TLS")) o.enabled = "true" o.disabled = "false" diff --git a/luasrc/model/cbi/frpc/rules.lua b/luasrc/model/cbi/frpc/rules.lua index 5b98ff8..e68118b 100644 --- a/luasrc/model/cbi/frpc/rules.lua +++ b/luasrc/model/cbi/frpc/rules.lua @@ -31,7 +31,7 @@ end o = s:option(DummyValue, "type", translate("Type")) o.cfgvalue = function (...) - local v = Value.cfgvalue(...) + local v = Value.cfgvalue(...) return v and v:upper() or "?" end diff --git a/luasrc/model/cbi/frpc/servers.lua b/luasrc/model/cbi/frpc/servers.lua index 1eb76a2..415a268 100644 --- a/luasrc/model/cbi/frpc/servers.lua +++ b/luasrc/model/cbi/frpc/servers.lua @@ -39,7 +39,7 @@ end o = s:option(DummyValue, "tcp_mux", translate("TCP Mux")) o.cfgvalue = function (...) - local v = Value.cfgvalue(...) + local v = Value.cfgvalue(...) return v == "true" and translate("True") or translate("False") end diff --git a/luasrc/view/frpc/status_header.htm b/luasrc/view/frpc/status_header.htm index 5363d29..f1b8925 100644 --- a/luasrc/view/frpc/status_header.htm +++ b/luasrc/view/frpc/status_header.htm @@ -8,22 +8,22 @@ -%>
-

- <%:Collecting data...%> -

+

+ <%:Collecting data...%> +

diff --git a/root/etc/init.d/frpc b/root/etc/init.d/frpc index 33390ef..5dcff73 100755 --- a/root/etc/init.d/frpc +++ b/root/etc/init.d/frpc @@ -11,117 +11,117 @@ NAME="frpc" CONFIG_FOLDER="/var/etc/$NAME" _log() { - local level="$1" ; shift - local msg="$@" - logger -p "daemon.$level" -t "$NAME" "$msg" + local level="$1" ; shift + local msg="$@" + logger -p "daemon.$level" -t "$NAME" "$msg" - echo "[$level] $msg" >&2 + echo "[$level] $msg" >&2 } _info() { - _log "info" $@ + _log "info" $@ } _err() { - _log "err" $@ + _log "err" $@ } append_options() { - local file="$1" ; shift - local o v - for o in "$@" ; do - v="$(eval echo "\$$o")" - if [ -n "$v" ] ; then + local file="$1" ; shift + local o v + for o in "$@" ; do + v="$(eval echo "\$$o")" + if [ -n "$v" ] ; then # add brackets when ipv6 address if ( echo "$o" | grep -qE 'addr|ip' ) && ( echo "$v" | grep -q ':' ) ; then v="[$v]" fi - echo "${o} = $v" >>"$file" - fi - done + echo "${o} = $v" >>"$file" + fi + done } append_setting() { - local file="$1" ; shift + local file="$1" ; shift local s="$1" if [ -n "$s" ] ; then echo "$s" >>"$file" - fi + fi } frpc_scetion_validate() { - uci_validate_section "$NAME" "frpc" "$1" \ - 'enabled:bool:0' \ - 'server:uci("frpc", "@server")' \ - 'client_file:file:/usr/bin/frpc' \ - 'run_user:string' \ - 'enable_logging:bool:0' \ - 'log_file:file:/var/log/frpc.log' \ - 'log_level:or("trace", "debug", "info", "warn", "error"):warn' \ - 'log_max_days:uinteger:3' \ - 'pool_count:uinteger:0' \ - 'user:string' \ - 'login_fail_exit:or("true", "false"):true' \ - 'protocol:or("tcp", "kcp", "websocket"):tcp' \ - 'http_proxy:string' \ - 'tls_enable:or("true", "false")' \ - 'dns_server:host' \ - 'heartbeat_interval:uinteger:30' \ - 'heartbeat_timeout:uinteger:90' \ - 'admin_addr:host' \ - 'admin_port:port' \ - 'admin_user:string' \ - 'admin_pwd:string' + uci_validate_section "$NAME" "frpc" "$1" \ + 'enabled:bool:0' \ + 'server:uci("frpc", "@server")' \ + 'client_file:file:/usr/bin/frpc' \ + 'run_user:string' \ + 'enable_logging:bool:0' \ + 'log_file:file:/var/log/frpc.log' \ + 'log_level:or("trace", "debug", "info", "warn", "error"):warn' \ + 'log_max_days:uinteger:3' \ + 'pool_count:uinteger:0' \ + 'user:string' \ + 'login_fail_exit:or("true", "false"):true' \ + 'protocol:or("tcp", "kcp", "websocket"):tcp' \ + 'http_proxy:string' \ + 'tls_enable:or("true", "false")' \ + 'dns_server:host' \ + 'heartbeat_interval:uinteger:30' \ + 'heartbeat_timeout:uinteger:90' \ + 'admin_addr:host' \ + 'admin_port:port' \ + 'admin_user:string' \ + 'admin_pwd:string' } server_section_validate() { - uci_validate_section "$NAME" "server" "$1" \ - 'alias:string' \ - 'server_addr:host' \ - 'server_port:port' \ - 'token:string' \ - 'tcp_mux:or("true", "false"):true' + uci_validate_section "$NAME" "server" "$1" \ + 'alias:string' \ + 'server_addr:host' \ + 'server_port:port' \ + 'token:string' \ + 'tcp_mux:or("true", "false"):true' } rule_section_validate() { - uci_validate_section "$NAME" "rule" "$1" \ - 'disabled:bool:0' \ - 'name:string' \ - 'type:or("tcp", "udp", "http", "https", "stcp", "xtcp")' \ - 'plugin:string' \ - 'plugin_unix_path:file' \ - 'plugin_user:string' \ - 'plugin_passwd:string' \ - 'plugin_local_path:file' \ - 'plugin_strip_prefix:string' \ - 'plugin_http_user:string' \ - 'plugin_http_passwd:string' \ - 'local_ip:host' \ - 'local_port:port' \ - 'remote_port:or(port, portrange)' \ - 'use_encryption:or("true", "false"):false' \ - 'use_compression:or("true", "false"):false' \ - 'role:string' \ - 'server_name:string' \ - 'sk:string' \ - 'bind_addr:host' \ - 'bind_port:port' \ - 'http_user:string' \ - 'http_pwd:string' \ - 'subdomain:string' \ - 'custom_domains:string' \ - 'locations:string' \ - 'host_header_rewrite:string' \ - 'group:string' \ - 'group_key:string' \ - 'health_check_type:or("tcp", "http")' \ - 'health_check_url:string' \ - 'health_check_timeout_s:uinteger' \ - 'health_check_max_failed:uinteger' \ - 'health_check_interval_s:uniteger' \ - 'extra_options:list(string)' + uci_validate_section "$NAME" "rule" "$1" \ + 'disabled:bool:0' \ + 'name:string' \ + 'type:or("tcp", "udp", "http", "https", "stcp", "xtcp")' \ + 'plugin:string' \ + 'plugin_unix_path:file' \ + 'plugin_user:string' \ + 'plugin_passwd:string' \ + 'plugin_local_path:file' \ + 'plugin_strip_prefix:string' \ + 'plugin_http_user:string' \ + 'plugin_http_passwd:string' \ + 'local_ip:host' \ + 'local_port:port' \ + 'remote_port:or(port, portrange)' \ + 'use_encryption:or("true", "false"):false' \ + 'use_compression:or("true", "false"):false' \ + 'role:string' \ + 'server_name:string' \ + 'sk:string' \ + 'bind_addr:host' \ + 'bind_port:port' \ + 'http_user:string' \ + 'http_pwd:string' \ + 'subdomain:string' \ + 'custom_domains:string' \ + 'locations:string' \ + 'host_header_rewrite:string' \ + 'group:string' \ + 'group_key:string' \ + 'health_check_type:or("tcp", "http")' \ + 'health_check_url:string' \ + 'health_check_timeout_s:uinteger' \ + 'health_check_max_failed:uinteger' \ + 'health_check_interval_s:uniteger' \ + 'extra_options:list(string)' } client_file_validate() { @@ -135,118 +135,118 @@ client_file_validate() { } add_rule_extra_option() { - append_setting "$2" "$1" + append_setting "$2" "$1" } add_frpc_rule() { - local section="$1" - local file="$2" - - if ! rule_section_validate "$section" ; then - _err "Rule section validate failed: \"$section\"" - return 1 - fi - - if [ "x$disabled" = "x1" ] ; then - return 0 - fi - - if [ -z "$name" ] ; then - _err "Rule's name is required: \"$section\"" - return 1 - fi - - echo "[$name]" >>"$file" - - append_options "$file" \ - "type" "plugin" "plugin_unix_path" "plugin_user" "plugin_passwd" "plugin_local_path" \ - "plugin_strip_prefix" "plugin_http_user" "plugin_http_passwd" "local_ip" "local_port" \ - "remote_port" "use_encryption" "use_compression" "role" "server_name" "bind_addr" \ - "bind_port" "sk" "http_user" "http_pwd" "subdomain" "custom_domains" "locations" \ - "host_header_rewrite" "group" "group_key" "health_check_type" "health_check_url" \ - "health_check_timeout_s" "health_check_max_failed" "health_check_interval_s" - - config_list_foreach "$section" "extra_options" add_rule_extra_option "$file" + local section="$1" + local file="$2" + + if ! rule_section_validate "$section" ; then + _err "Rule section validate failed: \"$section\"" + return 1 + fi + + if [ "x$disabled" = "x1" ] ; then + return 0 + fi + + if [ -z "$name" ] ; then + _err "Rule's name is required: \"$section\"" + return 1 + fi + + echo "[$name]" >>"$file" + + append_options "$file" \ + "type" "plugin" "plugin_unix_path" "plugin_user" "plugin_passwd" "plugin_local_path" \ + "plugin_strip_prefix" "plugin_http_user" "plugin_http_passwd" "local_ip" "local_port" \ + "remote_port" "use_encryption" "use_compression" "role" "server_name" "bind_addr" \ + "bind_port" "sk" "http_user" "http_pwd" "subdomain" "custom_domains" "locations" \ + "host_header_rewrite" "group" "group_key" "health_check_type" "health_check_url" \ + "health_check_timeout_s" "health_check_max_failed" "health_check_interval_s" + + config_list_foreach "$section" "extra_options" add_rule_extra_option "$file" } create_config_file() { - local config_file="$1" - local tmp_file="$(mktemp /tmp/frpc-XXXXXX)" + local config_file="$1" + local tmp_file="$(mktemp /tmp/frpc-XXXXXX)" - echo "[common]" > "$tmp_file" + echo "[common]" > "$tmp_file" - append_options "$tmp_file" \ - "server_addr" "server_port" "token" + append_options "$tmp_file" \ + "server_addr" "server_port" "token" - if [ "x$enable_logging" = "x1" ] ; then - if [ -z "$log_file" ]; then - log_file="/var/log/frpc.log" - fi + if [ "x$enable_logging" = "x1" ] ; then + if [ -z "$log_file" ]; then + log_file="/var/log/frpc.log" + fi - append_options "$tmp_file" \ - "log_file" "log_level" "log_max_days" + append_options "$tmp_file" \ + "log_file" "log_level" "log_max_days" - if [ -f "$log_file" ] ; then - echo > "$log_file" - else - local log_folder="$(dirname "$log_file")" + if [ -f "$log_file" ] ; then + echo > "$log_file" + else + local log_folder="$(dirname "$log_file")" - if [ ! -d "$log_folder" ] ; then - mkdir -p "$log_folder" - fi - fi + if [ ! -d "$log_folder" ] ; then + mkdir -p "$log_folder" + fi + fi - if [ -n "$run_user" ] && ( user_exists "$run_user" ) ; then - chmod 644 "$log_file" - chown "$run_user" "$log_file" + if [ -n "$run_user" ] && ( user_exists "$run_user" ) ; then + chmod 644 "$log_file" + chown "$run_user" "$log_file" else run_user="" - fi - fi + fi + fi - append_options "$tmp_file" \ - "pool_count" "tcp_mux" "user" "login_fail_exit" "protocol" "tls_enable" \ - "admin_addr" "admin_port" "admin_user" "admin_pwd" "dns_server" \ - "heartbeat_interval" "heartbeat_timeout" + append_options "$tmp_file" \ + "pool_count" "tcp_mux" "user" "login_fail_exit" "protocol" "tls_enable" \ + "admin_addr" "admin_port" "admin_user" "admin_pwd" "dns_server" \ + "heartbeat_interval" "heartbeat_timeout" - config_foreach add_frpc_rule "rule" "$tmp_file" + config_foreach add_frpc_rule "rule" "$tmp_file" - sed '/^$/d' "$tmp_file" >"$config_file" + sed '/^$/d' "$tmp_file" >"$config_file" - if [ "$?" = "0" ] ; then - rm -f "$tmp_file" - fi + if [ "$?" = "0" ] ; then + rm -f "$tmp_file" + fi } start_instance() { - local section="$1" + local section="$1" - if ! frpc_scetion_validate "$section" ; then - _err "Config validate failed." - return 1 - fi + if ! frpc_scetion_validate "$section" ; then + _err "Config validate failed." + return 1 + fi - if [ "x$enabled" != "x1" ] ; then - _info "Instance \"$section\" disabled." - return 1 - fi + if [ "x$enabled" != "x1" ] ; then + _info "Instance \"$section\" disabled." + return 1 + fi if [ -z "$client_file" ] || ( ! client_file_validate "$client_file" ) ; then _err "Client file not valid." return 1 fi - if [ -z "$server" ] || [ "$server" = "nil" ] ; then - _err "No server selected for instance: \"$section\"." - return 1 - elif ! server_section_validate "$server" ; then - _err "Server config validate failed: \"$server\"" - return 1 - fi + if [ -z "$server" ] || [ "$server" = "nil" ] ; then + _err "No server selected for instance: \"$section\"." + return 1 + elif ! server_section_validate "$server" ; then + _err "Server config validate failed: \"$server\"" + return 1 + fi - test -d "$CONFIG_FOLDER" || mkdir -p "$CONFIG_FOLDER" + test -d "$CONFIG_FOLDER" || mkdir -p "$CONFIG_FOLDER" - local config_file="$CONFIG_FOLDER/frpc.$section.ini" + local config_file="$CONFIG_FOLDER/frpc.$section.ini" create_config_file "$config_file" @@ -269,10 +269,10 @@ start_instance() { } service_triggers() { - procd_add_reload_trigger "$NAME" + procd_add_reload_trigger "$NAME" } start_service() { - config_load "$NAME" - config_foreach start_instance "frpc" + config_load "$NAME" + config_foreach start_instance "frpc" } diff --git a/root/etc/uci-defaults/40_luci-frpc b/root/etc/uci-defaults/40_luci-frpc index b1faf24..49b5633 100755 --- a/root/etc/uci-defaults/40_luci-frpc +++ b/root/etc/uci-defaults/40_luci-frpc @@ -10,11 +10,11 @@ EOF frpc=$(uci -q get frpc.@frpc[-1]) if [ -z "$frpc" ]; then - uci -q add frpc frpc + uci -q add frpc frpc fi if [ "x$frpc" != "xmain" ]; then - uci -q batch <<-EOF >/dev/null + uci -q batch <<-EOF >/dev/null rename frpc.@frpc[-1]="main" set frpc.main.enabled="0" commit frpc