Changes added to be compatible with the new octoprint version.

Tested with version 1.8.6
Check for added settings version with pop to remove from dict.
passwordHash for users added to fullfill signature_key_for_user check.
passwordHash is generated after each successful ldap check with used password.
Added fresh parameter for find_user function to ensure compatibility.

octoprint_auth_ldap/group_manager.py

@@ -151,6 +151,7 @@ def _load(self):
             try:
                 with io.open(self._groupfile, 'rt', encoding='utf-8') as f:
                     data = yaml.safe_load(f)
+                    version = data.pop("_version", 1)
 
                 if "groups" not in data:
                     groups = data

octoprint_auth_ldap/user.py

@@ -11,6 +11,7 @@ class LDAPUser(User):
     def __init__(
             self,
             username,
+            passwordHash=None,
             active=True,
             permissions=None,
             groups=None,
@@ -21,7 +22,7 @@ def __init__(
         User.__init__(
             self,
             username=username,
-            passwordHash=None,
+            passwordHash=passwordHash,
             active=active,
             permissions=permissions,
             groups=groups,

octoprint_auth_ldap/user_manager.py

@@ -5,6 +5,7 @@
 import os
 
 import yaml
+from passlib import pwd
 from ldap.filter import filter_format
 from octoprint.access.users import FilebasedUserManager, User, UserAlreadyExists
 from octoprint.util import atomic_write
@@ -27,7 +28,7 @@ def __init__(self, plugin, ldap, **kwargs):
     def group_manager(self):
         return self._group_manager
 
-    def find_user(self, userid=None, apikey=None, session=None):
+    def find_user(self, userid=None, apikey=None, session=None, fresh=False):
         self.logger.debug("Search for userid=%s, apiKey=%s, session=%s" % (userid, apikey, session))
         user = FilebasedUserManager.find_user(self, userid=userid, apikey=apikey, session=session)
         user, userid = self._find_user_with_transformation(apikey, session, user, userid)
@@ -80,7 +81,7 @@ def _find_user_with_transformation(self, apikey, session, user, userid):
 
     def add_user(self,
                  username,
-                 password=None,
+                 password=pwd.genword(entropy=52, length=20),
                  active=False,
                  permissions=None,
                  groups=None,
@@ -112,6 +113,7 @@ def add_user(self,
 
             self._users[username] = LDAPUser(
                 username=username,
+                passwordHash=LDAPUserManager.create_password_hash(password, settings=self._settings),
                 active=active,
                 permissions=permissions,
                 groups=groups,
@@ -133,6 +135,8 @@ def check_password(self, username, password):
                 client = self.ldap.get_client(user.distinguished_name, password)
                 authenticated = client is not None
                 self.logger.debug("%s was %sauthenticated" % (user.get_name(), "" if authenticated else "not "))
+                if authenticated:
+                    user._passwordHash = LDAPUserManager.create_password_hash(password, settings=self._settings)
                 return authenticated
             else:
                 self.logger.debug("%s is inactive or no longer a member of required groups" % user.get_id())
@@ -158,6 +162,8 @@ def _load(self):
             self._customized = True
             with io.open(self._userfile, 'rt', encoding='utf-8') as f:
                 data = yaml.safe_load(f)
+                version = data.pop("_version", 1)
+
                 for name, attributes in data.items():
                     permissions = self._to_permissions(*attributes.get("permissions", []))
                     groups = attributes.get("groups", {