Merge pull request #12 from YunoHost-Apps/testing

Use own "LDAPBackend" to setup new PyInventory users

conf/ynh_pyinventory_settings.py

@@ -58,11 +58,12 @@ AUTH_LDAP_USER_ATTR_MAP = {
     'email': 'mail',
 }
 
-# This is the default, but I like to be explicit.
 AUTH_LDAP_ALWAYS_UPDATE_USER = True
 
-# Use LDAP group membership to calculate group permissions.
-AUTH_LDAP_FIND_GROUP_PERMS = True
+# Don't use LDAP group membership to calculate group permissions
+AUTH_LDAP_FIND_GROUP_PERMS = False
+
+AUTH_LDAP_GROUP_TYPE = 'normal user'  # Same as: inventory.permissions.NORMAL_USER_GROUP_NAME
 
 # Cache distinguished names and group memberships for an hour to minimize LDAP traffic
 AUTH_LDAP_CACHE_TIMEOUT = 3600

conf/ynh_sso_ldap_backend.py

@@ -0,0 +1,17 @@
+from django_auth_ldap.backend import LDAPBackend
+from inventory.permissions import get_or_create_normal_user_group
+
+
+class PyInventoryYunohostLdapBackend(LDAPBackend):
+    def get_or_build_user(self, username, ldap_user):
+        user, built = super().get_or_build_user(username, ldap_user)
+
+        if built:
+            user.is_staff = True
+            user.is_superuser = False
+            user.save()
+
+            pyinventory_user_group = get_or_create_normal_user_group()[0]
+            user.groups.set([pyinventory_user_group])
+
+        return user, built

manifest.json

@@ -5,7 +5,7 @@
 	"description": {
 		"en": "Web based management to catalog things including state and location etc."
 	},
-	"version": "0.8.1~ynh5",
+	"version": "0.8.1~ynh6",
 	"url": "https://github.com/jedie/PyInventory",
 	"license": "GPL-3.0",
 	"maintainer": {

scripts/install

@@ -157,6 +157,7 @@ ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
 
 touch "$final_path/local_settings.py"
 
+cp "../conf/ynh_sso_ldap_backend.py" "$final_path/ynh_sso_ldap_backend.py"
 cp "../conf/ynh_urls.py" "$final_path/ynh_urls.py"
 
 #=================================================

scripts/upgrade

@@ -147,6 +147,7 @@ ynh_store_file_checksum --file="$settings"
 
 touch "$final_path/local_settings.py"
 
+cp "../conf/ynh_sso_ldap_backend.py" "$final_path/ynh_sso_ldap_backend.py"
 cp "../conf/ynh_urls.py" "$final_path/ynh_urls.py"
 
 #=================================================