nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-01-21 07:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

shadowsocks: Change default configuration

Browse Source 
- Reduce password length to encourage users to use the auto-generated one
instead of setting a new one.

- Don't set mode to tcp_and_udp: 1) upstream default to TCP only, leave the
decision to upstream. 2) firewalld service file only allows TCP. Without editing
the firewalld configuration, this change is incorrect.

- Don't set timeout. This values matches with the upstream default.. Leave this
to upstream.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Nektarios Katakis <iam@nektarioskatakis.xyz>
This commit is contained in:
Sunil Mohan Adapa 2020-03-17 10:54:26 -07:00 committed by Nektarios Katakis
parent af713d23fd
commit 744308a501
No known key found for this signature in database
GPG Key ID: 9CA475E691EBCF76
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
actions/shadowsocks
View File

@ -7,10 +7,10 @@ Helper script for configuring Shadowsocks.
import argparse
import json
import os
import sys
from shutil import move
import random
import string
import sys
from shutil import move
from plinth import action_utils
from plinth.modules import shadowsocks
@ -46,30 +46,25 @@ def subcommand_setup(_):
# if existing configuration from version 1 which is normal file
# move it to new location.
if (
not os.path.islink(SHADOWSOCKS_CONFIG_SYMLINK) and
os.path.isfile(SHADOWSOCKS_CONFIG_SYMLINK)
):
if (not os.path.islink(SHADOWSOCKS_CONFIG_SYMLINK)
and os.path.isfile(SHADOWSOCKS_CONFIG_SYMLINK)):
move(SHADOWSOCKS_CONFIG_SYMLINK, SHADOWSOCKS_CONFIG_ACTUAL)
else:
# new install
if not os.path.isfile(SHADOWSOCKS_CONFIG_ACTUAL):
initial_config = {
"server": "127.0.0.1",
"mode": "tcp_and_udp",
"server_port": 8388,
"local_port": 1080,
"password": ''.join(
random.choice(string.ascii_letters) for i in range(20)),
"timeout": 60,
"method": "chacha20-ietf-poly1305"
}
open(SHADOWSOCKS_CONFIG_ACTUAL, 'w').write(
json.dumps(initial_config))
if not os.path.islink(SHADOWSOCKS_CONFIG_SYMLINK):
os.symlink(SHADOWSOCKS_CONFIG_ACTUAL, SHADOWSOCKS_CONFIG_SYMLINK)
if not os.path.isfile(SHADOWSOCKS_CONFIG_ACTUAL):
password = ''.join(
random.choice(string.ascii_letters) for _ in range(12))
initial_config = {
'server': '127.0.0.1',
'server_port': 8388,
'local_port': 1080,
'password': password,
'method': 'chacha20-ietf-poly1305'
}
_merge_config(initial_config)
def subcommand_get_config(_):
"""Read and print Shadowsocks configuration."""
@ -79,11 +74,8 @@ def subcommand_get_config(_):
sys.exit(1)
def subcommand_merge_config(_):
"""Configure Shadowsocks."""
config = sys.stdin.read()
config = json.loads(config)
def _merge_config(config):
"""Write merged configuration into file."""
try:
current_config = open(SHADOWSOCKS_CONFIG_SYMLINK, 'r').read()
current_config = json.loads(current_config)
@ -95,6 +87,12 @@ def subcommand_merge_config(_):
new_config = json.dumps(new_config, indent=4, sort_keys=True)
open(SHADOWSOCKS_CONFIG_SYMLINK, 'w').write(new_config)
def subcommand_merge_config(_):
"""Configure Shadowsocks."""
config = sys.stdin.read()
config = json.loads(config)
_merge_config(config)
action_utils.service_restart(shadowsocks.managed_services[0])