|
@@ -34,7 +34,7 @@ HIDDEN_SERVICE_PATH='/var/lib/tor/hidden_service_'
|
34
|
34
|
ONION_SERVICES_FILE=/etc/torrc.d/${PROJECT_NAME}
|
35
|
35
|
|
36
|
36
|
function torrc_migrate {
|
37
|
|
- if [ -f $ONION_SERVICES_FILE ]; then
|
|
37
|
+ if [ -f "$ONION_SERVICES_FILE" ]; then
|
38
|
38
|
if grep -q "#%include /etc/torrc.d" /etc/tor/torrc; then
|
39
|
39
|
sed -i 's|#%include /etc/torrc.d|%include /etc/torrc.d|g' /etc/tor/torrc
|
40
|
40
|
systemctl restart tor
|
|
@@ -45,9 +45,9 @@ function torrc_migrate {
|
45
|
45
|
|
46
|
46
|
mkdir /etc/torrc.d
|
47
|
47
|
|
48
|
|
- grep "HiddenServiceDir\\|HiddenServiceVersion\\|HiddenServicePort" /etc/tor/torrc | grep -v "#HiddenServiceDir" >> $ONION_SERVICES_FILE
|
|
48
|
+ grep "HiddenServiceDir\\|HiddenServiceVersion\\|HiddenServicePort" /etc/tor/torrc | grep -v "#HiddenServiceDir" >> "$ONION_SERVICES_FILE"
|
49
|
49
|
|
50
|
|
- if ! grep "HiddenServiceVersion" $ONION_SERVICES_FILE; then
|
|
50
|
+ if ! grep "HiddenServiceVersion" "$ONION_SERVICES_FILE"; then
|
51
|
51
|
systemctl restart tor
|
52
|
52
|
return
|
53
|
53
|
fi
|
|
@@ -121,17 +121,17 @@ function remove_onion_service {
|
121
|
121
|
nick="$3"
|
122
|
122
|
|
123
|
123
|
if [ ${#nick} -gt 0 ]; then
|
124
|
|
- sed -i "/stealth ${nick}/d" $ONION_SERVICES_FILE
|
|
124
|
+ sed -i "/stealth ${nick}/d" "$ONION_SERVICES_FILE"
|
125
|
125
|
fi
|
126
|
|
- sed -i "/hidden_service_${onion_service_name}/,+1 d" $ONION_SERVICES_FILE
|
127
|
|
- sed -i "/hidden_service_${onion_service_name}_mobile/,+1 d" $ONION_SERVICES_FILE
|
128
|
|
- sed -i "/127.0.0.1:${onion_service_port_to}/d" $ONION_SERVICES_FILE
|
|
126
|
+ sed -i "/hidden_service_${onion_service_name}/,+1 d" "$ONION_SERVICES_FILE"
|
|
127
|
+ sed -i "/hidden_service_${onion_service_name}_mobile/,+1 d" "$ONION_SERVICES_FILE"
|
|
128
|
+ sed -i "/127.0.0.1:${onion_service_port_to}/d" "$ONION_SERVICES_FILE"
|
129
|
129
|
if [ "$3" ]; then
|
130
|
|
- sed -i "/127.0.0.1:${3}/d" $ONION_SERVICES_FILE
|
|
130
|
+ sed -i "/127.0.0.1:${3}/d" "$ONION_SERVICES_FILE"
|
131
|
131
|
if [ "$4" ]; then
|
132
|
|
- sed -i "/127.0.0.1:${4}/d" $ONION_SERVICES_FILE
|
|
132
|
+ sed -i "/127.0.0.1:${4}/d" "$ONION_SERVICES_FILE"
|
133
|
133
|
if [ "$5" ]; then
|
134
|
|
- sed -i "/127.0.0.1:${5}/d" $ONION_SERVICES_FILE
|
|
134
|
+ sed -i "/127.0.0.1:${5}/d" "$ONION_SERVICES_FILE"
|
135
|
135
|
fi
|
136
|
136
|
fi
|
137
|
137
|
fi
|
|
@@ -164,16 +164,16 @@ function add_onion_service {
|
164
|
164
|
USE_V2_ONION_ADDRESS=
|
165
|
165
|
exit 877367
|
166
|
166
|
fi
|
167
|
|
- if ! grep -q "hidden_service_${onion_service_name}" $ONION_SERVICES_FILE; then
|
168
|
|
- echo "HiddenServiceDir ${HIDDEN_SERVICE_PATH}${onion_service_name}/" >> $ONION_SERVICES_FILE
|
|
167
|
+ if ! grep -q "hidden_service_${onion_service_name}" "$ONION_SERVICES_FILE"; then
|
|
168
|
+ echo "HiddenServiceDir ${HIDDEN_SERVICE_PATH}${onion_service_name}/" >> "$ONION_SERVICES_FILE"
|
169
|
169
|
if [ ! $USE_V2_ONION_ADDRESS ]; then
|
170
|
|
- echo 'HiddenServiceVersion 3' >> $ONION_SERVICES_FILE
|
|
170
|
+ echo 'HiddenServiceVersion 3' >> "$ONION_SERVICES_FILE"
|
171
|
171
|
else
|
172
|
|
- echo 'HiddenServiceVersion 2' >> $ONION_SERVICES_FILE
|
|
172
|
+ echo 'HiddenServiceVersion 2' >> "$ONION_SERVICES_FILE"
|
173
|
173
|
fi
|
174
|
|
- echo "HiddenServicePort ${onion_service_port_from} 127.0.0.1:${onion_service_port_to}" >> $ONION_SERVICES_FILE
|
|
174
|
+ echo "HiddenServicePort ${onion_service_port_from} 127.0.0.1:${onion_service_port_to}" >> "$ONION_SERVICES_FILE"
|
175
|
175
|
if [ ${#onion_stealth_name} -gt 0 ]; then
|
176
|
|
- echo "HiddenServiceAuthorizeClient stealth ${onion_stealth_name}" >> $ONION_SERVICES_FILE
|
|
176
|
+ echo "HiddenServiceAuthorizeClient stealth ${onion_stealth_name}" >> "$ONION_SERVICES_FILE"
|
177
|
177
|
fi
|
178
|
178
|
fi
|
179
|
179
|
|