From e9057e9a37fbaf267711b40ad6b12d32082cbd7b Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 25 Aug 2023 15:40:31 +0200
Subject: [PATCH] Fix shadowsocks password support

---
 shadowsocks-libev/files/shadowsocks-libev.init | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/shadowsocks-libev/files/shadowsocks-libev.init b/shadowsocks-libev/files/shadowsocks-libev.init
index 094e1fdbd..7c7e39d6e 100644
--- a/shadowsocks-libev/files/shadowsocks-libev.init
+++ b/shadowsocks-libev/files/shadowsocks-libev.init
@@ -27,14 +27,17 @@ ss_mkjson_server_conf() {
 
 ss_mkjson_server_conf_() {
 	[ -n "$server_port" ] || return 1
+	[ -z "$method" ] || json_add_string method "$method"
 	[ -z "$server" ] || json_add_string server "$server"
 	json_add_int server_port "$server_port"
-	[ -z "$method" ] || json_add_string method "$method"
 	[ -z "$key" ] || {
 		key="$(echo $key | sed 's/+/-/g; s/\//_/g;')"
 		json_add_string key "$key"
 	}
-	[ -z "$password" ] || json_add_string password "$password"
+	[ -z "$password" ] || {
+		password="$(echo $password | sed 's/+/-/g; s/\//_/g;')"
+		json_add_string password "$password"
+	}
 	[ -z "$password" ] && [ -z "$key" ] && return 1
 	[ -z "$plugin" ] || json_add_string plugin "$plugin"
 	[ -z "$plugin_opts" ] || json_add_string plugin_opts "$plugin_opts"