* Tue Aug 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme

-  use esmith::util:ldap to manipulate ldap entries [SME: 12687]

createlinks

@@ -42,6 +42,5 @@ templates2events("/samba/smb.conf", $event);
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/smbd");
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/nmbd");
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
-event_link('store-ldap-smbpasswd', $event, "06");
 event_link("systemd-reload", $event, "89");
 event_link("systemd-default", $event, "88");

root/etc/e-smith/events/actions/ibay-delete

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/perl
 
 #----------------------------------------------------------------------
-# copyright (C) 1999-2005 Mitel Networks Corporation
+# copyright (C) 2024 Koozali foundation inc.
 #		
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,28 +22,63 @@
 #------------------------------------------------------------
 # Delete the Unix account and files for the ibay.
 #------------------------------------------------------------
+package esmith;
 
-event=$1
-ibay=$2
+use strict;
+use Errno;
+use esmith::ConfigDB;
+use esmith::util;
+use esmith::AccountsDB;
+use utf8;
+use esmith::util::ldap;
 
-if [ -z "$ibay" ]
-then
-    echo ibayName argument missing
-    exit 1
-fi
+my $adb = esmith::AccountsDB->open_ro();
 
-ldapauth=$(/sbin/e-smith/config getprop ldap Authentication || echo disabled)
-x=0 # exit value
+my $conf = esmith::ConfigDB->open_ro or die "Could not open config db";
 
-/bin/rm -rf /home/e-smith/files/ibays/$ibay
-if [ "$ldapauth" != "enabled" ]
-then
-    /usr/sbin/userdel "$ibay" || x=1
-    /usr/sbin/cpu -C/etc/cpu-system.conf userdel "$ibay"
-    /usr/sbin/cpu -C/etc/cpu-system.conf groupdel "$ibay"
-else
-    /usr/sbin/cpu userdel "$ibay" || x=1
-    /usr/sbin/cpu -C/etc/cpu-system.conf groupdel "$ibay" || x=1
-fi
+unless ($conf->get('ldap')->prop('status') eq "enabled" )
+{
+    warn "Not running action script $0, LDAP service not enabled!\n";
+    exit(0);
+}
+
+# prepare LDAP bind
+my $ldap=esmith::util::ldap->new();
+
+my $event = $ARGV [0];
+my $ibay = $ARGV [1];
+
+die "Username argument missing." unless defined ($ibay);
+$a = $adb->get($ibay) || undef;
+unless ( defined $a && $a->prop('type') eq "ibay-deleted" )
+{
+    warn "$ibay is not an Ibay account\n";
+    exit (0);
+}
+
+my $ldapauth = $conf->get('ldap')->prop('Authentication') || 'disabled';
+my $x = 0; # exit value
+
+
+my $discard = `/bin/rm -rf /home/e-smith/files/ibays/$ibay`;
+if ($? != 0)
+    {
+        ( $x = 255, warn "Failed to delete content of ibay $ibay.\n" );
+    }
+
+if ( "$ldapauth" ne "enabled" )
+{
+    $discard = `/usr/sbin/userdel "$ibay"`;
+    if ($? != 0)
+    {
+        ( $x = 255, warn "Failed to delete (unix) account $ibay.\n" );
+    }
+}
+
+my $result = $ldap->ldapdeluser($ibay);
+$result && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to delete (ldap) ibay account $ibay.\n" );
+
+$result = $ldap->ldapdelgroup($ibay);
+$result && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to delete (ldap) group account $ibay.\n" );
 
 exit $x

root/etc/e-smith/events/actions/ibay-modify

@@ -2,6 +2,7 @@
 
 #----------------------------------------------------------------------
 # copyright (C) 1999-2005 Mitel Networks Corporation
+# copyright (C) 2024 Koozali foundation inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,12 +28,18 @@ use esmith::util;
 use esmith::templates;
 use esmith::AccountsDB;
 use esmith::ConfigDB;
+use utf8;
+use esmith::util::ldap;
 
 my $conf = esmith::ConfigDB->open_ro
     or die "Could not open Config DB";
 
 my $ldapauth = $conf->get('ldap')->prop('Authentication') || 'disabled';
 my $x = 0; # exit value
+my $result;
+
+# prepare LDAP bind
+my $ldap=esmith::util::ldap->new();
 
 $ENV{'PATH'} = "/bin";
 
@@ -54,8 +61,9 @@ if ($event eq 'ibay-create')
 # Check the Unix account.
 #------------------------------------------------------------
 
-    # Create the ibay's unique group first
-
+    #------------------------------------------------------------
+    # create unix user and group account, unless we switch to ldap authentication
+    #------------------------------------------------------------
     if ($ldapauth ne 'enabled')
     {
         system(
@@ -85,31 +93,27 @@ if ($event eq 'ibay-create')
         ) == 0 or ( $x = 255, warn "Failed to create (unix) account $ibayName.\n" );
     }
 
-    system(
-        "/usr/sbin/cpu", "-C/etc/cpu-system.conf", "groupadd",
-        "-g",
-        $ibay->prop("Gid"),
-        $ibayName
-    ) == 0 or ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to create (ldap) group $ibayName.\n" );
+    #------------------------------------------------------------
+    # add new ibay group to ldap
+    #------------------------------------------------------------
+    $result = $ldap->ldapgroup($ibay);
+    $result && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to create (ldap) group $ibayName.\n" );
 
-    system(
-        "/usr/sbin/cpu", "-C/etc/cpu-system.conf", "useradd",
-        "-u",
-        $ibay->prop("Uid"),
-        "-g",
-        $ibay->prop("Gid"),
-        "-c",
-        $ibay->prop("Name"),
-        "-d",
-        "/home/e-smith/files/ibays/$ibayName/files",
-        "-G",
-        "shared,"
-        . $ibay->prop("Group"),
-        "-s",
-        "/bin/false",
-        "$ibayName"
-    ) == 0 or ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to create (ldap) account $ibayName.\n" );
+    #------------------------------------------------------------
+    # add new ibay user to ldap and lock password
+    #------------------------------------------------------------
+    $result = $ldap->ldapuser($ibay);
+    $result && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to create (ldap) account $ibayName.\n" );
 
+    #------------------------------------------------------------
+    # Loop to add new user to groups  "shared,". $ibay->prop("Group")
+    #------------------------------------------------------------
+    foreach my $grp ( 'shared', $ibay->prop("Group") )  {
+        my @groupMembers = ($ibayName);
+        $result = $ldap->ldapaddgroupmembers($grp,\@groupMembers);
+        # error code 20 is entry already exits.
+        $result &&  ( $result != 20 ) && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to add (ldap) account $ibayName to supplementary group $grp.\n" );
+    }
     #------------------------------------------------------------
     # Create the ibay files and set the password.
     #------------------------------------------------------------
@@ -130,15 +134,12 @@ if ($event eq 'ibay-create')
             or ( $x = 255, warn "Error locking (unix) account $ibayName" );
     }
 
-    system("/usr/sbin/cpu", "-C/etc/cpu-system.conf", "usermod", "-L", $ibayName) == 0
-        or ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Error locking (ldap) account $ibayName" );
 }
 elsif ($event eq 'ibay-modify' and $ibayName ne 'Primary')
 {
     #------------------------------------------------------------
     # Modify ibay description in /etc/passwd using "usermod"
     #------------------------------------------------------------
-
     if ($ldapauth ne 'enabled')
     {
         system("/usr/sbin/usermod", "-c", $ibay->prop("Name"),
@@ -146,9 +147,22 @@ elsif ($event eq 'ibay-modify' and $ibayName ne 'Primary')
             or ( $x = 255, warn "Failed to modify (unix) account $ibayName.\n" );
     }
 
-    system("/usr/sbin/cpu", "-C/etc/cpu-system.conf", "usermod", "-c", $ibay->prop("Name"),
-    "-G", "shared," . $ibay->prop("Group"), "$ibayName") == 0
-        or ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to modify (ldap) account $ibayName.\n" );
+    #------------------------------------------------------------
+    # Modify ibay description in ldap"
+    #------------------------------------------------------------
+    $result = $ldap->ldapuser($ibay);
+    $result && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to create (ldap) account $ibayName.\n" );
+
+    #------------------------------------------------------------
+    # Loop to add new user to groups  "shared,". $ibay->prop("Group")
+    #------------------------------------------------------------
+    foreach my $grp ( 'shared', $ibay->prop("Group") )  {
+        my @groupMembers = ($ibayName);
+        $result = $ldap->ldapaddgroupmembers($grp,\@groupMembers);
+        # error code 20 is entry already exits.
+        $result &&  ( $result != 20 ) && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to add (ldap) account $ibayName to supplementary group $grp.\n" );
+    }
+
 }
 
 #------------------------------------------------------------

smeserver-ibays.spec

@@ -4,7 +4,7 @@ Summary: smeserver server and gateway - ibays module
 %define name smeserver-ibays
 Name: %{name}
 %define version 11.0.0
-%define release 5
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,13 +13,13 @@ Source: %{name}-%{version}.tar.xz
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-Requires: smeserver-base >= 4.13.15-76
+Requires: smeserver-lib >= 11.0.0-7
+Requires: smeserver-base 
 Requires: perl(CGI::FormMagick)
-Requires: smeserver-formmagick >= 1.4.0-12
-#Conflicts: e-smith-apache < 0.1.1
-Requires: smeserver-apache >= 2.6.0-19
+Requires: smeserver-formmagick 
+Requires: smeserver-apache 
 BuildRequires: perl, perl(Test::Inline)
-BuildRequires: smeserver-devtools >= 1.11.0-03
+BuildRequires: smeserver-devtools 
 AutoReqProv: no
 
 
@@ -28,7 +28,13 @@ Provides: e-smith-ibays
 smeserver server and gateway software - ibays module.
 
 %changelog
-* Sat Apr 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme
+* Tue Aug 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme
+-  use esmith::util:ldap to manipulate ldap entries [SME: 12687]
+
+* Sat May 18 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme
+- edit LDAP entries using Net::LDAP rather than cpu [SME: 12687]
+
+* Sat Apr 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-6.sme
 - fix path for store-ldap-smbpasswd  [SME: 12614]
 
 * Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-4.sme