diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile
index 835ae327e7..c98a25f683 100644
--- a/package/lean/luci-app-ssr-plus/Makefile
+++ b/package/lean/luci-app-ssr-plus/Makefile
@@ -11,6 +11,14 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks
bool "Include Shadowsocks New Version"
default y if x86_64
+config PACKAGE_$(PKG_NAME)_INCLUDE_Simple_obfs
+ bool "Include Shadowsocks simple-obfs plugin"
+ default y if x86_64
+
+config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin
+ bool "Include Shadowsocks v2ray plugin"
+ default y if x86_64
+
config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray
bool "Include V2ray"
default y if x86_64
@@ -40,6 +48,8 @@ define Package/luci-app-ssr-plus
PKGARCH:=all
DEPENDS:=+shadowsocksr-libev-alt +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +pdnsd-alt +wget +lua \
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-redir \
+ +PACKAGE_$(PKG_NAME)_INCLUDE_Simple_obfs:simple-obfs \
+ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin:v2ray-plugin \
+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \
+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:trojan \
+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:ipt2socks \
diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
index 5b03959844..81d25ccecd 100644
--- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
+++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
@@ -164,6 +164,15 @@ for _, v in ipairs(encrypt_methods_ss) do o:value(v) end
o.rmempty = true
o:depends("type", "ss")
+-- Shadowsocks Plugin
+o = s:option(Value, "plugin", "Plugin")
+o.rmempty = true
+o:depends("type", "ss")
+
+o = s:option(Value, "plugin_opts", "Plugin Opts")
+o.rmempty = true
+o:depends("type", "ss")
+
o = s:option(ListValue, "protocol", translate("Protocol"))
for _, v in ipairs(protocol) do o:value(v) end
o.rmempty = true
diff --git a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm
index 8136c0f5cf..4dcff12ef5 100644
--- a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm
+++ b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm
@@ -137,30 +137,73 @@
s.innerHTML = "导入ShadowsocksR配置信息成功";
return false;
} else if (ssu[0] == "ss") {
+
+ var url0, param = "";
+ var sipIndex = ssu[1].indexOf("@");
var ploc = ssu[1].indexOf("#");
if (ploc > 0) {
url0 = ssu[1].substr(0, ploc);
param = ssu[1].substr(ploc + 1);
} else {
- url0 = ssu[1]
+ url0 = ssu[1];
}
- var sstr = b64decsafe(url0);
- document.getElementById('cbid.shadowsocksr.' + sid + '.type').value = "ss";
- document.getElementById('cbid.shadowsocksr.' + sid + '.type').dispatchEvent(event);
- var team = sstr.split('@');
- console.log(param);
- var part1 = team[0].split(':');
- var part2 = team[1].split(':');
- document.getElementById('cbid.shadowsocksr.' + sid + '.server').value = part2[0];
- document.getElementById('cbid.shadowsocksr.' + sid + '.server_port').value = part2[1];
- document.getElementById('cbid.shadowsocksr.' + sid + '.password').value = part1[1];
- document.getElementById('cbid.shadowsocksr.' + sid + '.encrypt_method_ss').value = part1[0];
- if (param != undefined) {
- document.getElementById('cbid.shadowsocksr.' + sid + '.alias').value = decodeURI(param);
+
+ if (sipIndex != -1) {
+ // SIP002
+ var userInfo = b64decsafe(url0.substr(0, sipIndex));
+ var temp = url0.substr(sipIndex + 1).split("/?");
+ var serverInfo = temp[0].split(":");
+ var server = serverInfo[0];
+ var port = serverInfo[1];
+ var method, password, plugin, pluginOpts;
+ if (temp[1]) {
+ var pluginInfo = decodeURIComponent(temp[1]);
+ var pluginIndex = pluginInfo.indexOf(";");
+ var pluginNameInfo = pluginInfo.substr(0, pluginIndex);
+ plugin = pluginNameInfo.substr(pluginNameInfo.indexOf("=") + 1)
+ pluginOpts = pluginInfo.substr(pluginIndex + 1);
+ }
+
+ var userInfoSplitIndex = userInfo.indexOf(":");
+ if (userInfoSplitIndex != -1) {
+ method = userInfo.substr(0, userInfoSplitIndex);
+ password = userInfo.substr(userInfoSplitIndex + 1);
+ }
+ document.getElementById('cbid.shadowsocksr.' + sid + '.type').value = "ss";
+ document.getElementById('cbid.shadowsocksr.' + sid + '.type').dispatchEvent(event);
+ document.getElementById('cbid.shadowsocksr.' + sid + '.server').value = server;
+ document.getElementById('cbid.shadowsocksr.' + sid + '.server_port').value = port;
+ document.getElementById('cbid.shadowsocksr.' + sid + '.password').value = password || "";
+ document.getElementById('cbid.shadowsocksr.' + sid + '.encrypt_method_ss').value = method || "";
+ document.getElementById('cbid.shadowsocksr.' + sid + '.plugin').value = plugin || "";
+ document.getElementById('cbid.shadowsocksr.' + sid + '.plugin_opts').value = pluginOpts || "";
+
+ if (param != undefined) {
+ document.getElementById('cbid.shadowsocksr.' + sid + '.alias').value = decodeURI(param);
+ }
+ s.innerHTML = "导入Shadowsocks配置信息成功";
+ } else {
+ var sstr = b64decsafe(url0);
+ document.getElementById('cbid.shadowsocksr.' + sid + '.type').value = "ss";
+ document.getElementById('cbid.shadowsocksr.' + sid + '.type').dispatchEvent(event);
+ var team = sstr.split('@');
+ console.log(param);
+ var part1 = team[0].split(':');
+ var part2 = team[1].split(':');
+ document.getElementById('cbid.shadowsocksr.' + sid + '.server').value = part2[0];
+ document.getElementById('cbid.shadowsocksr.' + sid + '.server_port').value = part2[1];
+ document.getElementById('cbid.shadowsocksr.' + sid + '.password').value = part1[1];
+ document.getElementById('cbid.shadowsocksr.' + sid + '.encrypt_method_ss').value = part1[0];
+ document.getElementById('cbid.shadowsocksr.' + sid + '.plugin').value = "";
+ document.getElementById('cbid.shadowsocksr.' + sid + '.plugin_opts').value = "";
+ if (param != undefined) {
+ document.getElementById('cbid.shadowsocksr.' + sid + '.alias').value = decodeURI(param);
+ }
+ s.innerHTML = "导入Shadowsocks配置信息成功";
}
- s.innerHTML = "导入Shadowsocks配置信息成功";
return false;
} else if (ssu[0] == "trojan") {
+ var url0, param = "";
var ploc = ssu[1].indexOf("#");
if (ploc > 0) {
url0 = ssu[1].substr(0, ploc);
diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
index c82ea6eb9b..9c56c23ab5 100755
--- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
+++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
@@ -102,6 +102,13 @@ if [ "$stype" == "ss" ] ;then
"fast_open": $fastopen
}
EOF
+ local plugin=$(uci_get_by_name $1 plugin)
+ if [ -n $plugin ] && [ $plugin == "simple-obfs" ]; then
+ plugin="obfs-local"
+ fi
+ if [ -n "$plugin" -a -x "/usr/bin/$plugin" ]; then
+ sed -i "s@$hostip\",@$hostip\",\n\"plugin\": \"$plugin\",\n\"plugin_opts\": \"$(uci_get_by_name $1 plugin_opts)\",@" $config_file
+ fi
elif [ "$stype" == "ssr" ] ;then
cat <<-EOF >$config_file
{
diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
old mode 100644
new mode 100755
index 8b9b759543..effb5d5d16
--- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
+++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
@@ -210,6 +210,8 @@ local function processData(szType, content)
result.server_port = content.port
result.password = content.password
result.encrypt_method_ss = content.encryption
+ result.plugin = content.plugin
+ result.plugin_opts = content.plugin_options
result.alias = "[" .. content.airport .. "] " .. content.remarks
end
if not result.alias then