Add plaintext password authenticaion for prosody mysql

Signed-off-by: Sebastian Sterk <sebastian@wiuwiu.de>

Author: sebastiansterk

lib/xmpp.php

@@ -20,14 +20,16 @@ class OC_User_XMPP extends \OCA\user_external\Base {
 	private $xmppDbUser;
 	private $xmppDbPassword;
 	private $xmppDomain;
+	private $passwordHashed;
 
-	public function __construct($host, $xmppDb, $xmppDbUser, $xmppDbPassword, $xmppDomain) {
+	public function __construct($host, $xmppDb, $xmppDbUser, $xmppDbPassword, $xmppDomain, $passwordHashed) {
 		parent::__construct($host);
 		$this->host = $host;
 		$this->xmppDb = $xmppDb;
 		$this->xmppDbUser = $xmppDbUser;
 		$this->xmppDbPassword = $xmppDbPassword;
 		$this->xmppDomain = $xmppDomain;
+		$this->passwordHashed = $passwordHashed;
 	}
 
 	public function hmacSha1($key, $data) {
@@ -48,6 +50,51 @@ public function hmacSha1($key, $data) {
                 return sha1($oPad.sha1($iPad.$data, true));
         }
 
+	public function validateHashedPassword($user, $uid, $submittedPassword){
+		foreach ($user as $key){
+	        	if($key[3] === "salt") {
+        	        	$internalSalt = $key['value'];
+                	}
+                	if($key[3] === "server_key") {
+                	        $internalServerKey = $key['value'];
+                	}
+                	if($key[3] === "stored_key") {
+                	        $internalStoredKey = $key['value'];
+                	}
+                }
+                unset($user);
+                $internalIteration = '4096';
+                $newSaltedPassword = hash_pbkdf2('sha1', $submittedPassword, $internalSalt, $internalIteration, 0, true);
+                $newServerKey = $this->hmacSha1($newSaltedPassword, 'Server Key');
+                $newClientKey = $this->hmacSha1($newSaltedPassword, 'Client Key');
+                $newStoredKey = sha1(hex2bin($newClientKey));
+
+                if ($newServerKey === $internalServerKey
+ 	               && $newStoredKey === $internalStoredKey) {
+        		$uid = mb_strtolower($uid);
+                        $this->storeUser($uid);
+                        return $uid;
+                } else {
+                	return false;
+                }
+	}
+
+	public function validatePlainPassword($user, $uid, $submittedPassword) {
+	        foreach ($user as $key) {
+        	        if($key[3] === "password") {
+                	        $internalPlainPassword = $key['value'];
+                        }
+                }
+		unset($user);
+                if ($submittedPassword === $internalPlainPassword) {
+	                $uid = mb_strtolower($uid);
+                        $this->storeUser($uid);
+                        return $uid;
+                } else {
+         	       return false;
+                }
+	}
+	
 	public function checkPassword($uid, $password){
 		$pdo = new PDO("mysql:host=$this->host;dbname=$this->xmppDb", $this->xmppDbUser, $this->xmppDbPassword);
 		if(isset($uid) 
@@ -70,32 +117,11 @@ public function checkPassword($uid, $password){
         		if(empty($user)) {
                 		return false;
 			}
-        		foreach ($user as $key){
-                        	if($key[3] === "salt") {
-                        	        $internalSalt = $key['value'];
-				}
-                        	if($key[3] === "server_key") {
-                        	        $internalServerKey = $key['value'];
-				}
-                        	if($key[3] === "stored_key") {
-                        	        $internalStoredKey = $key['value'];
-				}
-		        }
-	        	unset($user);
-		        $internalIteration = '4096';
-
-		        $newSaltedPassword = hash_pbkdf2('sha1', $submittedPassword, $internalSalt, $internalIteration, 0, true);
-		        $newServerKey = $this->hmacSha1($newSaltedPassword, 'Server Key');
-		        $newClientKey = $this->hmacSha1($newSaltedPassword, 'Client Key');
-		        $newStoredKey = sha1(hex2bin($newClientKey));
-
-		        if ($newServerKey === $internalServerKey 
-			    && $newStoredKey === $internalStoredKey) {
-				$uid = mb_strtolower($uid);
-	                        $this->storeUser($uid);
-				return $uid;
+			
+			if ($this->passwordHashed === true) {
+				return $this->validateHashedPassword($user, $uid, $submittedPassword);
 			} else {
-				return false;
+				return $this->validatePlainPassword($user, $uid, $submittedPassword);
 			}
 		}
 	}