Implemented correct bcrypt hashing for jenkins users.
diff --git a/_modules/jenkins_hash.py b/_modules/jenkins_hash.py
index 6796bbd..cf9a9d6 100644
--- a/_modules/jenkins_hash.py
+++ b/_modules/jenkins_hash.py
@@ -1,9 +1,6 @@
-import hashlib
-import random
-import string
+import bcrypt
+
def encode_password(password):
- salt = ''.join(random.SystemRandom().choice(string.ascii_letters)
- for i in range(6))
- hash_ = hashlib.sha256("%s{%s}" % (password, salt)).hexdigest()
- return "%s:%s" % (salt, hash_)
\ No newline at end of file
+ if isinstance(password, str):
+ return bcrypt.hashpw(password, bcrypt.gensalt(prefix=b"2a"))
diff --git a/jenkins/map.jinja b/jenkins/map.jinja
index eb8fbbc..27c33bd 100644
--- a/jenkins/map.jinja
+++ b/jenkins/map.jinja
@@ -1,7 +1,7 @@
{% set master = salt['grains.filter_by']({
'Debian': {
- 'pkgs': ['jenkins'],
+ 'pkgs': ['jenkins','python-bcrypt'],
'service': 'jenkins',
'config': '/etc/default/jenkins',
'home': '/var/lib/jenkins',