automated creation of Friendica basic account

diff --git a/ldapauth.tgz b/ldapauth.tgz
index 7dd3d6c427335979974f62e0cf6539bd60cd3ec8..62ff161abc5b090d3e32cdd9c22521b41e0b0354 100755 (executable)
Binary files a/ldapauth.tgz and b/ldapauth.tgz differ

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index b87f669d5f5c7b0895c7784344a5507b3ef816a4..2c8f3effd189f4d1a5316fa0c7d0cb997b91d089 100755 (executable)
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -2,8 +2,9 @@
 /**
  * Name: LDAP Authenticate
  * Description: Authenticate a user against an LDAP directory
- * Version: 1.0
+ * Version: 1.1
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ * Author: aymhce
  */
  
 /**
@@ -17,8 +18,9 @@
  *
  * Optionally authenticates only if a member of a given group in the directory.
  *
- * The person must have registered with Friendica using the normal registration 
+ * By default, the person must have registered with Friendica using the normal registration 
  * procedures in order to have a Friendica user record, contact, and profile.
+ * However, it's possible with an option to automate the creation of a Friendica basic account.
  *
  * Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site
  * ldap.conf file to the signing cert for your LDAP server. 
@@ -31,6 +33,7 @@
  *
  */
 
+require_once('include/user.php');
 
 
 function ldapauth_install() {
@@ -44,19 +47,13 @@ function ldapauth_uninstall() {
 
 
 function ldapauth_hook_authenticate($a,&$b) {
-       if(ldapauth_authenticate($b['username'],$b['password'])) {
-               $results = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
-                               dbesc($b['username'])
-               );
-               if(count($results)) {
-                               $b['user_record'] = $results[0];
-                               $b['authenticated'] = 1;
-               }
+       if(ldapauth_authenticate($b['username'],$b['password']) && is_existing_account($b['username'])) {
+               $b['user_record'] = $results[0];
+               $b['authenticated'] = 1;
        }
        return;
 }
 
-
 function ldapauth_authenticate($username,$password) {
 
     $ldap_server   = get_config('ldapauth','ldap_server');
@@ -65,7 +62,15 @@ function ldapauth_authenticate($username,$password) {
     $ldap_searchdn = get_config('ldapauth','ldap_searchdn');
     $ldap_userattr = get_config('ldapauth','ldap_userattr');
     $ldap_group    = get_config('ldapauth','ldap_group');
-
+       $ldap_autocreateaccount = get_config('ldapauth','ldap_autocreateaccount');
+       $ldap_autocreateaccount_emailattribute = get_config('ldapauth','ldap_autocreateaccount_emailattribute');
+       $ldap_autocreateaccount_nameattribute = get_config('ldapauth','ldap_autocreateaccount_nameattribute');
+
+       if(! strlen($ldap_autocreateaccount_emailattribute))
+               $ldap_autocreateaccount_emailattribute = "mail";
+       if(! strlen($ldap_autocreateaccount_nameattribute))
+               $ldap_autocreateaccount_nameattribute = "givenName";
+       
     if(! ((strlen($password))
             && (function_exists('ldap_connect'))
             && (strlen($ldap_server))))
@@ -98,9 +103,14 @@ function ldapauth_authenticate($username,$password) {
 
     if(! @ldap_bind($connect,$dn,$password))
         return false;
+               
+       $emailarray = @ldap_get_values($connect, $id, $ldap_autocreateaccount_emailattribute);
+       $namearray = @ldap_get_values($connect, $id, $ldap_autocreateaccount_nameattribute);
 
-    if(! strlen($ldap_group))
+    if(! strlen($ldap_group)){
+               ldap_autocreateaccount($ldap_autocreateaccount,$username,$password,$emailarray[0],$namearray[0]);
         return true;
+       }
 
     $r = @ldap_compare($connect,$ldap_group,'member',$dn);
     if ($r === -1) {
@@ -126,5 +136,30 @@ function ldapauth_authenticate($username,$password) {
         return false;
     }
 
+       ldap_autocreateaccount($ldap_autocreateaccount,$username,$password,$emailarray[0],$namearray[0]);
     return true;
 }
+
+function ldap_autocreateaccount($ldap_autocreateaccount,$username,$password,$email,$name) {
+       if($ldap_autocreateaccount == "true" && !is_existing_account($username)){
+               if (strlen($email) > 0 && strlen($name) > 0){
+                       $arr = array('username'=>$name,'nickname'=>$username,'email'=>$email,'password'=>$password,'verified'=>1);
+                       $result = create_user($arr);
+                       if ($result['success']){
+                               logger("ldapauth: account " . $username . " created");
+                       }else{
+                               logger("ldapauth: account " . $username . " was not created ! : " . implode($result));
+                       }
+               }else{
+                       logger("ldapauth: unable to create account, no email or nickname found");
+               }
+       }
+}
+
+function is_existing_account($username){
+       $results = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",$username);
+       if(count($results)) {
+               return true;
+       }
+       return false;
+}