Merge pull request #217 from frankhommers/master

Ability to change listener host.
pfn · Jun 13, 2015 · 3a29380 · 3a29380
2 parents ad7e8eb + fca3ab8
commit 3a29380
Show file tree

Hide file tree

Showing 4 changed files with 148 additions and 78 deletions.
diff --git a/KeePassHttp/ConfigOpt.cs b/KeePassHttp/ConfigOpt.cs
@@ -15,6 +15,7 @@ public class ConfigOpt
         const string ReturnStringFieldsKey = "KeePassHttp_ReturnStringFields";
         const string SortResultByUsernameKey = "KeePassHttp_SortResultByUsername";
         const string ListenerPortKey = "KeePassHttp_ListenerPort";
+        const string ListenerHostKey = "KeePassHttp_ListenerHost";
 
         public ConfigOpt(AceCustomConfig config)
         {
@@ -80,5 +81,11 @@ public long ListenerPort
             get { return _config.GetLong(ListenerPortKey, KeePassHttpExt.DEFAULT_PORT); }
             set { _config.SetLong(ListenerPortKey, value); }
         }
+
+        public string ListenerHost
+        {
+            get { return _config.GetString(ListenerHostKey, KeePassHttpExt.DEFAULT_HOST); }
+            set { _config.SetString(ListenerHostKey, value); }
+        }
     }
 }
diff --git a/KeePassHttp/KeePassHttp.cs b/KeePassHttp/KeePassHttp.cs
@@ -43,11 +43,11 @@ public sealed partial class KeePassHttpExt : Plugin
         private IPluginHost host;
         private HttpListener listener;
         public const int DEFAULT_PORT = 19455;
+        public const string DEFAULT_HOST = "localhost";
         /// <summary>
         /// TODO make configurable
         /// </summary>
-        private int port = DEFAULT_PORT;
-        private const string HTTP_PREFIX = "http://localhost:";
+        private const string HTTP_SCHEME = "http://";
         //private const string HTTPS_PREFIX = "https://localhost:";
         //private int HTTPS_PORT = DEFAULT_PORT + 1;
         private Thread httpThread;
@@ -201,7 +201,7 @@ public override bool Initialize(IPluginHost host)
 
                     var configOpt = new ConfigOpt(this.host.CustomConfig);
 
-                    listener.Prefixes.Add(HTTP_PREFIX + configOpt.ListenerPort.ToString() + "/");
+                    listener.Prefixes.Add(HTTP_SCHEME + configOpt.ListenerHost + ":" + configOpt.ListenerPort.ToString() + "/");
                     //listener.Prefixes.Add(HTTPS_PREFIX + HTTPS_PORT + "/");
                     listener.Start();
 

diff --git a/KeePassHttp/OptionsForm.Designer.cs b/KeePassHttp/OptionsForm.Designer.cs