From b4dae10a900de1ff9f2568e26de0df51ebb44cbd Mon Sep 17 00:00:00 2001
From: Fabian Franz <franz.fabian.94@gmail.com>
Date: Wed, 22 Nov 2017 17:39:52 +0100
Subject: [PATCH] security/tor: fix control socket issue

---
 security/tor/Makefile                              |  2 +-
 .../mvc/app/models/OPNsense/Tor/General.xml        |  2 +-
 security/tor/src/opnsense/scripts/tor/tor_diag     | 14 +++++++++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/security/tor/Makefile b/security/tor/Makefile
index 59ce57587..4cde9ce9d 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=          tor
-PLUGIN_VERSION=       1.2
+PLUGIN_VERSION=       1.3
 PLUGIN_COMMENT=       The Onion Router
 PLUGIN_DEPENDS=       tor ruby
 PLUGIN_MAINTAINER=    franz.fabian.94@gmail.com
diff --git a/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/General.xml b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/General.xml
index 82bc0d222..fe9b9f3b5 100644
--- a/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/General.xml
+++ b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/General.xml
@@ -19,7 +19,7 @@
     </socks_listen_port>
     <control_port type="IntegerField">
       <default>9051</default>
-      <MinimumValue>0</MinimumValue>
+      <MinimumValue>1</MinimumValue>
       <Required>N</Required>
       <MaximumValue>65535</MaximumValue>
       <ValidationMessage>A valid Port number must be specified.</ValidationMessage>
diff --git a/security/tor/src/opnsense/scripts/tor/tor_diag b/security/tor/src/opnsense/scripts/tor/tor_diag
index 65c2c0765..266644ce0 100755
--- a/security/tor/src/opnsense/scripts/tor/tor_diag
+++ b/security/tor/src/opnsense/scripts/tor/tor_diag
@@ -36,11 +36,23 @@ $TOR_DEBUG = false
 
 config = REXML::Document.new(File.new("/conf/config.xml"))
 $TOR_PASSWORD = config.elements['opnsense/OPNsense/tor/general/control_port_password'].text
+$TOR_CONTROL_PORT = 9051
+if port = config.elements['opnsense/OPNsense/tor/general/control_port']&.text&.to_i
+  if port > 0
+    $TOR_CONTROL_PORT = port
+  else
+    puts '{"error":"invalid control port found"}'
+    exit
+  end
+else
+  puts '{"error":"no control port found"}'
+  exit
+end
 
 class TorCTL
 
   def initialize
-    @tor = TCPSocket.new("127.0.0.1", 9051)
+    @tor = TCPSocket.new("127.0.0.1", $TOR_CONTROL_PORT)
     send_query("AUTHENTICATE \"#{$TOR_PASSWORD}\"")
   end