From 84aa1ae766f73c8eeca1cbcf674c73437a9db317 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Wed, 24 Jan 2018 12:35:29 +0100
Subject: [PATCH] security/shadowsocks: minor update (#514)

---
 .../OPNsense/Shadowsocks/forms/general.xml    | 10 ++++++++--
 .../models/OPNsense/Shadowsocks/General.xml   | 19 +++++++++++++++++--
 .../OPNsense/Shadowsocks/shadowsocks.conf     |  2 +-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/forms/general.xml b/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/forms/general.xml
index 532291e27..34de189f1 100644
--- a/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/forms/general.xml
+++ b/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/forms/general.xml
@@ -1,9 +1,9 @@
 <form>
     <field>
         <id>general.enabled</id>
-        <label>Enable ShadowSocks Proxy</label>
+        <label>Enable ShadowSocks Server</label>
         <type>checkbox</type>
-        <help>This will activate the ShadowSocks Proxy service.</help>
+        <help>This will activate the ShadowSocks Server. This lets people around the world connect via ss-local to your server.</help>
     </field>
     <field>
         <id>general.serveraddress</id>
@@ -29,4 +29,10 @@
         <type>text</type>
         <help>Password to authenticate against the server.</help>
     </field>
+    <field>
+        <id>general.cipher</id>
+        <label>Cipher</label>
+        <type>dropdown</type>
+        <help>Choose the cipher to use for encryption.</help>
+    </field>    
 </form>
diff --git a/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/General.xml b/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/General.xml
index 2b79eb87c..4a9319706 100644
--- a/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/General.xml
+++ b/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/General.xml
@@ -7,10 +7,9 @@
             <default>0</default>
             <Required>Y</Required>
         </enabled>
-        <serveraddress type="TextField">
+        <serveraddress type="HostnameField">
             <default>127.0.0.1</default>
             <Required>Y</Required>
-            <mask>/\S*/</mask>
             <ValidationMessage>Please provide a valid hostname or IP address.</ValidationMessage>
         </serveraddress>
         <serverport type="IntegerField">
@@ -31,5 +30,21 @@
             <default>password</default>
             <Required>N</Required>
         </password>
+        <cipher type="OptionField">
+            <default>AES-256-CFB</default>
+            <Required>Y</Required>
+            <OptionValues>
+                <aes-256-cfb>AES-256-CFB</aes-256-cfb>
+                <aes-256-gcm>AES-256-GCM</aes-256-gcm>
+                <aes-256-ctr>AES-256-CTR</aes-256-ctr>
+                <aes-192-cfb>AES-192-CFB</aes-192-cfb>
+                <aes-192-gcm>AES-192-GCM</aes-192-gcm>
+                <aes-192-ctr>AES-192-CTR</aes-192-ctr>
+                <aes-128-cfb>AES-128-CFB</aes-128-cfb>
+                <aes-128-gcm>AES-128-GCM</aes-128-gcm>
+                <aes-128-ctr>AES-128-CTR</aes-128-ctr>
+                <chacha20-ietf-poly1305>ChaCha20-IETF-Poly1305</chacha20-ietf-poly1305>
+            </OptionValues>
+        </cipher>
     </items>
 </model>
diff --git a/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/shadowsocks.conf b/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/shadowsocks.conf
index bbf3807bd..ebe3fccc5 100644
--- a/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/shadowsocks.conf
+++ b/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/shadowsocks.conf
@@ -5,6 +5,6 @@
     "local_port":{{ OPNsense.shadowsocks.general.localport }},
     "password":"{{ OPNsense.shadowsocks.general.password }}",
     "timeout":60,
-    "method":"chacha20-ietf-poly1305"
+    "method":"{{ OPNsense.shadowsocks.general.cipher }}"
 }
 {% endif %}