Allow blacklist to be disabled

There might be multiple clients using a single IP (e.g. NAT), which
can make the blacklist do more harm than good. So add a setting to
disable it if needed.

1 files changed, 7 insertions, 0 deletions

diff --git a/common/rfb/Blacklist.cxx b/common/rfb/Blacklist.cxx
index 243d173d..86917c14 100644
--- a/common/rfb/Blacklist.cxx
+++ b/common/rfb/Blacklist.cxx
@@ -20,6 +20,10 @@
 
 using namespace rfb;
 
+BoolParameter enabled("UseBlacklist",
+                      "Temporarily reject connections from a host if it "
+                      "repeatedly fails to authenticate.",
+                      true);
 IntParameter threshold("BlacklistThreshold",
                        "The number of unauthenticated connection attempts "
                        "allowed from any individual host before that host "
@@ -44,6 +48,9 @@ Blacklist::~Blacklist() {
 }
 
 bool Blacklist::isBlackmarked(const char* name) {
+  if (!enabled)
+    return false;
+
   BlacklistMap::iterator i = blm.find(name);
   if (i == blm.end()) {
     // Entry is not already black-marked.