Module: check_mk
Branch: master
Commit: d2aa46ddfb9304c2a68aa5d73eed93fcbb94443b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2aa46ddfb9304…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Oct 24 15:24:58 2018 +0200
Renamed encrypt_password() to hash_password()
Change-Id: Icdab894dc9cbb2b1e26d3bd1f7b9c4a3de69767b
---
cmk/gui/plugins/userdb/htpasswd.py | 2 +-
cmk/gui/plugins/webapi/webapi.py | 6 +++---
cmk/gui/userdb.py | 2 +-
cmk/gui/wato/__init__.py | 1 -
cmk/gui/wato/pages/users.py | 6 +++---
cmk/gui/wato/user_profile.py | 4 ++--
omd/packages/omd/omd | 4 ++--
tests/unit/cmk/gui/test_userdb_htpasswd_connector.py | 6 +++---
8 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/cmk/gui/plugins/userdb/htpasswd.py b/cmk/gui/plugins/userdb/htpasswd.py
index aa07889..4f2d46d 100644
--- a/cmk/gui/plugins/userdb/htpasswd.py
+++ b/cmk/gui/plugins/userdb/htpasswd.py
@@ -101,7 +101,7 @@ class Htpasswd(object):
#
# For best compatibility in all mentioned situations we use the sha256_crypt
# scheme.
-def encrypt_password(password):
+def hash_password(password):
return sha256_crypt.hash(password)
diff --git a/cmk/gui/plugins/webapi/webapi.py b/cmk/gui/plugins/webapi/webapi.py
index 4a7609f..2501b80 100644
--- a/cmk/gui/plugins/webapi/webapi.py
+++ b/cmk/gui/plugins/webapi/webapi.py
@@ -37,7 +37,7 @@ import cmk.gui.watolib as watolib
from cmk.gui.i18n import _
from cmk.gui.globals import html
from cmk.gui.exceptions import MKUserError, MKAuthException, MKException
-from cmk.gui.plugins.userdb.htpasswd import encrypt_password
+from cmk.gui.plugins.userdb.htpasswd import hash_password
from cmk.gui.plugins.webapi import (
APICallCollection,
@@ -510,7 +510,7 @@ def action_add_users(request):
for user_id, values in users_from_request.items():
user_template = userdb.new_user_template("htpasswd")
if "password" in values:
- values["password"] =
encrypt_password(values["password"])
+ values["password"] = hash_password(values["password"])
values["serial"] = 1
user_template.update(values)
@@ -553,7 +553,7 @@ def action_edit_users(request):
new_password = settings.get("set_attributes",
{}).get("password")
if new_password:
- user_attrs["password"] = encrypt_password(new_password)
+ user_attrs["password"] = hash_password(new_password)
user_attrs["serial"] = user_attrs.get("serial", 0) + 1
edit_user_objects[user_id] = {"attributes": user_attrs,
"is_new_user": False}
diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py
index 36fac8d..6756dba 100644
--- a/cmk/gui/userdb.py
+++ b/cmk/gui/userdb.py
@@ -934,7 +934,7 @@ def create_cmk_automation_user():
'alias' : u"Check_MK Automation - used for calling
web services",
'contactgroups' : [],
'automation_secret' : secret,
- 'password' :
cmk.gui.plugins.userdb.htpasswd.encrypt_password(secret),
+ 'password' :
cmk.gui.plugins.userdb.htpasswd.hash_password(secret),
'roles' : ['admin'],
'locked' : False,
'serial' : 0,
diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py
index 8715412..4ab60ad 100644
--- a/cmk/gui/wato/__init__.py
+++ b/cmk/gui/wato/__init__.py
@@ -132,7 +132,6 @@ from cmk.gui.exceptions import MKGeneralException, MKUserError,
MKAuthException,
from cmk.gui.log import logger
from cmk.gui.valuespec import *
from cmk.gui.display_options import display_options
-from cmk.gui.plugins.userdb.htpasswd import encrypt_password
from cmk.gui.plugins.wato.utils.base_modes import WatoMode, WatoWebApiMode
from cmk.gui.wato.pages.global_settings import GlobalSettingsMode, EditGlobalSettingMode
diff --git a/cmk/gui/wato/pages/users.py b/cmk/gui/wato/pages/users.py
index 72ca9fa..60ed7ae 100644
--- a/cmk/gui/wato/pages/users.py
+++ b/cmk/gui/wato/pages/users.py
@@ -41,7 +41,7 @@ import cmk.gui.forms as forms
import cmk.gui.background_job as background_job
import cmk.gui.gui_background_job as gui_background_job
from cmk.gui.htmllib import HTML
-from cmk.gui.plugins.userdb.htpasswd import encrypt_password
+from cmk.gui.plugins.userdb.htpasswd import hash_password
from cmk.gui.log import logger
from cmk.gui.exceptions import MKUserError
from cmk.gui.i18n import _, _u
@@ -482,7 +482,7 @@ class ModeEditUser(WatoMode):
if auth_method == "secret":
secret = html.var("_auth_secret", "").strip()
user_attrs["automation_secret"] = secret
- user_attrs["password"] = encrypt_password(secret)
+ user_attrs["password"] = hash_password(secret)
increase_serial = True # password changed, reflect in auth serial
else:
@@ -503,7 +503,7 @@ class ModeEditUser(WatoMode):
del user_attrs["password"] # which was the encrypted
automation password!
if password:
- user_attrs["password"] = encrypt_password(password)
+ user_attrs["password"] = hash_password(password)
user_attrs["last_pw_change"] = int(time.time())
increase_serial = True # password changed, reflect in auth serial
diff --git a/cmk/gui/wato/user_profile.py b/cmk/gui/wato/user_profile.py
index 4ae52a0..9626993 100644
--- a/cmk/gui/wato/user_profile.py
+++ b/cmk/gui/wato/user_profile.py
@@ -35,7 +35,7 @@ import cmk.gui.config as config
import cmk.gui.watolib as watolib
import cmk.gui.forms as forms
import cmk.gui.login as login
-from cmk.gui.plugins.userdb.htpasswd import encrypt_password
+from cmk.gui.plugins.userdb.htpasswd import hash_password
from cmk.gui.exceptions import MKUserError, MKGeneralException, MKAuthException
from cmk.gui.i18n import _, _u
from cmk.gui.globals import html
@@ -187,7 +187,7 @@ def page_user_profile(change_pw=False):
raise MKUserError("password2", _("The both new
passwords do not match."))
watolib.verify_password_policy(password)
- users[config.user.id]['password'] =
encrypt_password(password)
+ users[config.user.id]['password'] = hash_password(password)
users[config.user.id]['last_pw_change'] = int(time.time())
if change_pw:
diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd
index b812e94..81cfccb 100644
--- a/omd/packages/omd/omd
+++ b/omd/packages/omd/omd
@@ -737,7 +737,7 @@ def calculate_admin_password(options):
def set_admin_password(pw):
- file("%s/etc/htpasswd" % g_sitedir,
"w").write("cmkadmin:%s\n" % encrypt_password(pw))
+ file("%s/etc/htpasswd" % g_sitedir,
"w").write("cmkadmin:%s\n" % hash_password(pw))
def file_owner_verify(path, user_id, group_id):
@@ -4478,7 +4478,7 @@ def random_password():
return ''.join(random.choice(string.ascii_letters + string.digits) for i in
range(8))
-def encrypt_password(password):
+def hash_password(password):
return sha256_crypt.hash(password)
#.
diff --git a/tests/unit/cmk/gui/test_userdb_htpasswd_connector.py
b/tests/unit/cmk/gui/test_userdb_htpasswd_connector.py
index ad905c0..c43c907 100644
--- a/tests/unit/cmk/gui/test_userdb_htpasswd_connector.py
+++ b/tests/unit/cmk/gui/test_userdb_htpasswd_connector.py
@@ -47,11 +47,11 @@ def test_htpasswd_save(htpasswd_file):
== saved_file.open(encoding="utf-8").read()
-def test_encrypt_password():
- hashed_pw = htpasswd.encrypt_password("blä")
+def test_hash_password():
+ hashed_pw = htpasswd.hash_password("blä")
assert sha256_crypt.verify(u"blä", hashed_pw)
- hashed_pw = htpasswd.encrypt_password(u"blä")
+ hashed_pw = htpasswd.hash_password(u"blä")
assert sha256_crypt.verify("blä", hashed_pw)