浏览代码

Add clacks from control panel

Bob Mottram 7 年前
父节点
当前提交
d96c098141
共有 2 个文件被更改,包括 45 次插入9 次删除
  1. 2
    0
      src/freedombone-app-vpn
  2. 43
    9
      src/freedombone-controlpanel

+ 2
- 0
src/freedombone-app-vpn 查看文件

542
     echo "accept = $VPN_TLS_PORT" >> $prefix/etc/stunnel/stunnel.conf
542
     echo "accept = $VPN_TLS_PORT" >> $prefix/etc/stunnel/stunnel.conf
543
     echo 'connect = localhost:1194' >> $prefix/etc/stunnel/stunnel.conf
543
     echo 'connect = localhost:1194' >> $prefix/etc/stunnel/stunnel.conf
544
     echo 'cert = /etc/stunnel/stunnel.pem' >> $prefix/etc/stunnel/stunnel.conf
544
     echo 'cert = /etc/stunnel/stunnel.pem' >> $prefix/etc/stunnel/stunnel.conf
545
+    echo 'protocol = socks' >> $prefix/etc/stunnel/stunnel.conf
545
 
546
 
546
     sed -i 's|ENABLED=.*|ENABLED=1|g' $prefix/etc/default/stunnel4
547
     sed -i 's|ENABLED=.*|ENABLED=1|g' $prefix/etc/default/stunnel4
547
 
548
 
550
     echo "accept = $STUNNEL_PORT" >> $prefix/etc/stunnel/stunnel-client.conf
551
     echo "accept = $STUNNEL_PORT" >> $prefix/etc/stunnel/stunnel-client.conf
551
     echo "connect = $DEFAULT_DOMAIN_NAME:$VPN_TLS_PORT" >> $prefix/etc/stunnel/stunnel-client.conf
552
     echo "connect = $DEFAULT_DOMAIN_NAME:$VPN_TLS_PORT" >> $prefix/etc/stunnel/stunnel-client.conf
552
     echo 'cert = stunnel.pem' >> $prefix/etc/stunnel/stunnel-client.conf
553
     echo 'cert = stunnel.pem' >> $prefix/etc/stunnel/stunnel-client.conf
554
+    echo 'protocol = socks' >> $prefix/etc/stunnel/stunnel-client.conf
553
 
555
 
554
     echo '[Unit]' > $prefix/etc/systemd/system/stunnel.service
556
     echo '[Unit]' > $prefix/etc/systemd/system/stunnel.service
555
     echo 'Description=SSL tunnel for network daemons' >> $prefix/etc/systemd/system/stunnel.service
557
     echo 'Description=SSL tunnel for network daemons' >> $prefix/etc/systemd/system/stunnel.service

+ 43
- 9
src/freedombone-controlpanel 查看文件

2102
     ${PROJECT_NAME}-wifi --disable $disable_wifi
2102
     ${PROJECT_NAME}-wifi --disable $disable_wifi
2103
 }
2103
 }
2104
 
2104
 
2105
+function add_clacks {
2106
+    clacks=
2107
+
2108
+    data=$(tempfile 2>/dev/null)
2109
+    trap "rm -f $data" 0 1 2 5 15
2110
+    dialog --title $"Add Clacks Overhead" \
2111
+           --backtitle $"Freedombone Control Panel" \
2112
+           --inputbox $"" 7 60 2>$data
2113
+    sel=$?
2114
+    case $sel in
2115
+        0)
2116
+            clacks=$(<$data)
2117
+            if [ ${#clacks} -gt 1 ]; then
2118
+
2119
+                WEB_FILES=/etc/nginx/sites-available/*
2120
+                for f in $WEB_FILES
2121
+                do
2122
+                    if grep -q "X-Clacks-Overhead" $f; then
2123
+                        sed -i "s|X-Clacks-Overhead .*|X-Clacks-Overhead \"GNU $clacks\";|g" $f
2124
+                    else
2125
+                        sed -i "/X-Content-Type-Options/a add_header X-Clacks-Overhead \"GNU $clacks\";" $f
2126
+                    fi
2127
+                done
2128
+
2129
+                dialog --title $"Add Clacks Overhead" \
2130
+                       --msgbox $"\nAdded for $clacks" 10 60
2131
+            fi
2132
+            ;;
2133
+    esac
2134
+    rm $data
2135
+}
2136
+
2105
 function menu_wifi {
2137
 function menu_wifi {
2106
     if [[ "$(wifi_exists)" == "0" ]]; then
2138
     if [[ "$(wifi_exists)" == "0" ]]; then
2107
         dialog --title $"Wifi" \
2139
         dialog --title $"Wifi" \
2191
         trap "rm -f $data" 0 1 2 5 15
2223
         trap "rm -f $data" 0 1 2 5 15
2192
         dialog --backtitle $"Freedombone Control Panel" \
2224
         dialog --backtitle $"Freedombone Control Panel" \
2193
                --title $"Control Panel" \
2225
                --title $"Control Panel" \
2194
-               --radiolist $"Choose an operation:" 29 70 21 \
2226
+               --radiolist $"Choose an operation:" 30 70 22 \
2195
                1 $"About this system" off \
2227
                1 $"About this system" off \
2196
                2 $"Passwords" off \
2228
                2 $"Passwords" off \
2197
                3 $"Backup and Restore" off \
2229
                3 $"Backup and Restore" off \
2209
                15 $"Change the name of this system" off \
2241
                15 $"Change the name of this system" off \
2210
                16 $"Set a static local IP address" off \
2242
                16 $"Set a static local IP address" off \
2211
                17 $"Wifi menu" off \
2243
                17 $"Wifi menu" off \
2212
-               18 $"Check for updates" off \
2213
-               19 $"Power off the system" off \
2214
-               20 $"Restart the system" off \
2215
-               21 $"Exit" on 2> $data
2244
+               18 $"Add Clacks" off \
2245
+               19 $"Check for updates" off \
2246
+               20 $"Power off the system" off \
2247
+               21 $"Restart the system" off \
2248
+               22 $"Exit" on 2> $data
2216
         sel=$?
2249
         sel=$?
2217
         case $sel in
2250
         case $sel in
2218
             1) exit 1;;
2251
             1) exit 1;;
2242
             15) change_system_name;;
2275
             15) change_system_name;;
2243
             16) set_static_IP;;
2276
             16) set_static_IP;;
2244
             17) menu_wifi;;
2277
             17) menu_wifi;;
2245
-            18) check_for_updates;;
2246
-            19) shut_down_system;;
2247
-            20) restart_system;;
2248
-            21) break;;
2278
+            18) add_clacks;;
2279
+            19) check_for_updates;;
2280
+            20) shut_down_system;;
2281
+            21) restart_system;;
2282
+            22) break;;
2249
         esac
2283
         esac
2250
     done
2284
     done
2251
 }
2285
 }