Fix for #336

moloch-- · Jan 28, 2020 · e6c4196 · e6c4196
1 parent 8868c04
commit e6c4196
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/handlers/PublicHandlers.py b/handlers/PublicHandlers.py
@@ -133,7 +133,7 @@ def successful_login(self, user):
     def failed_login(self):
         """ Called if username/password is invalid """
         ip = self.request.remote_ip
-        logging.info("[BAN HAMMER] Failed login attempt from: %s" % ip)
+        logging.info("*** Failed login attempt from: %s" % ip)
         failed_logins = self.application.settings["failed_logins"]
         if ip in failed_logins:
             failed_logins[ip] += 1

diff --git a/models/RegistrationToken.py b/models/RegistrationToken.py
@@ -56,4 +56,4 @@ def count(cls):
     @classmethod
     def by_value(cls, value):
         """ Returns a the object with value of value """
-        return dbsession.query(cls).filter_by(value=str(value)).first()
+        return dbsession.query(cls).filter_by(value=encode(value)).first()
diff --git a/setup/__init__.py b/setup/__init__.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = "3.3.6"
+__version__ = "3.3.7"
diff --git a/templates/admin/home.html b/templates/admin/home.html
@@ -192,7 +192,7 @@ <h3>{{_("Automatic Ban")}}</h3>
 
         </div>
     </div>
-    {% if user.password == "$p5k2$2bad$hvCaKAvO$77kHcM6nYQO5RK057xsaVTJPO64XArGu" %}
+    {% if user.validate_password("rootthebox") %}
     <div class="span8 alert alert-warning">
         <a class="close" data-dismiss="alert" href="#">&times;</a>
         <h4 class="alert-heading">{{ _("WARNING") }}</h4>