Security fix (sqli)

[mirrors/Kyberia-bloodline.git] / wwwroot / inc / eventz / login.inc

diff --git a/wwwroot/inc/eventz/login.inc b/wwwroot/inc/eventz/login.inc
index f293e1d09025f74cd87d4968f8ba10234accdb32..dab5d22a7d0a18dc6ac65ebe44b179cbbcdc3fe0 100644 (file)
--- a/wwwroot/inc/eventz/login.inc
+++ b/wwwroot/inc/eventz/login.inc
@@ -1,14 +1,17 @@
 <?php
 function login() {
-// lockout capatibility
-// with ldap sync
-// <h1> This is da default one</h1>
-    require(INCLUDE_DIR.'ldap.inc');
 
     global $db,$error,$node_id;
     $login = mysql_real_escape_string($_POST['login']);
-    $password = $_POST['password'];
-    $hash = md5($password);
+    $password = $_POST['password']; // Not SQLi but be carefull
+    $password_hash_algos=array('sha256','sha1','md5'); //List of supported algos can be obtained using: php -r 'print_r(hash_algos());'
+
+    $hash_query='(';
+    foreach($password_hash_algos as $algo) {
+      $hash_query.="password='".hash($algo, $password)."' OR ";
+    }
+    $hash_query.='false )';
+
     $login_type = $_POST['login_type'];
     $referer = $_SERVER['HTTP_REFERER'];
 
@@ -17,25 +20,25 @@ function login() {
         return false;
     }
 
-    switch ($login_type) {
-        case "name":
-            $q = "select * from users where login='$login'";
-            $set = $db->query($q);
-            $set->next();
-            $user_id = $set->getString('user_id');
-            $user_name = $set->getString('login');
-        break;
-        case "id":
-            $q="select * from users where user_id='$login'";
-            $set=$db->query($q);
-            $set->next();
-            $user_id=$set->getString('user_id');
-            $user_name=$set->getString('login');
-        break;
-    }
-
-    $ldap_response=LDAPuser::auth($user_id,$password);
-    if ($set->getString('password') != $hash and !$ldap_response) {
+       switch ($login_type) {
+               case "name":
+                       $q = "select * from users where login='$login' and $hash_query";
+                       break;
+               case "base36id":
+                       $login = base_convert($login, 36, 10);
+               case "id":
+                       $login=intval($login); //HA! if it is number, escape_string is not enough
+                       $q="select * from users where user_id='$login' and $hash_query";
+                       break;
+       }
+
+       $set = $db->query($q);
+       $set->next();
+       $user_id = $set->getString('user_id');
+       $user_name = $set->getString('login');
+       $xmpp = strtolower($set->getString('xmpp'));
+
+    if (!$set) { //XXX test
         $error="Zadal si nespravne uzivatelske meno [alebo id] alebo heslo. Rob so sebou nieco";
         return false;
     }
@@ -53,11 +56,11 @@ Prajem prijemnu odvykacku:-)";
             return false;
         }
 
-//ldap replicate
-// LDAPuser::ldap_mysql_sync($user_name,$user_id,$password);
+//     Login sucessfull
 
+       // prevent session fixation
+       session_regenerate_id(); 
 
-//
         $cube_vector=$set->getString('cube_vector');
 
         // saves friends list as an array into user session
@@ -90,7 +93,6 @@ where node_access.user_id='$user_id' and node_bookmark='yes' order by node_name"
             $_SESSION['fook'][$fookset->getString('node_parent')]=true;
         }
 
-        LDAPuser::replicate($user_name,$user_id,$password);
 
         //save bookstyle into user session
         $q="select node_content from nodes where node_parent=19 and external_link='session://bookstyl' and node_creator='$user_id'";
@@ -109,12 +111,16 @@ where node_access.user_id='$user_id' and node_bookmark='yes' order by node_name"
             $_SESSION['mood_name'] = $mset->getString('node_name');
             $_SESSION['mood_content'] = addslashes(substr(strip_tags($mset->getString('node_content')),0,223));
         }
-
         // last login
-        $db->query(sprintf('update users set last_login = NOW() where user_id = %d', $user_id));
+
+       $db->query(sprintf('update users set date_last_login = NOW() where user_id = %d', $user_id));
 
         $_SESSION['user_id']=$user_id;
         $_SESSION['user_name']=addslashes($user_name);
+       setcookie('jabber_login', $xmpp, time()+60*60*24*10, '/'); //10days on whole domain - should have persistent username in future...
+       $xmpp_pass=hash('md5', 'jabber:'.$_POST['password']);
+       setcookie('jabber_password', $xmpp_pass, time()+60*60*24*10, '/'); //10days on whole domain
+       system('sudo /usr/sbin/ejabberdctl register '.escapeshellarg($xmpp).' '.escapeshellarg('kyberia.cz').' '.escapeshellarg($xmpp_pass)); //gpasswd -a kyberia jabber #Adding user kyberia to group jabber //XXX TODO Hardcoded kyberia.cz jabber domain (NOT dev.kyberia.cz!!!!!)
         if (!empty($cube_vector)) $_SESSION['cube_vector']=$cube_vector;
         if (empty($_SESSION['template_set'])) $_SESSION['template_set']=$set->getString('template_set');
         if (is_numeric($_POST['screen_width'])) $_SESSION['browser']['screen_width']=$_POST['screen_width'];