fixes #445 Encrypt connection passwords - you will need to edit and s…

…ave connections to update to encrypted versions of passwords

administrator/components/com_fabrik/models/connection.php

@@ -168,6 +168,13 @@ public function save($data)
 		$session = JFactory::getSession();
 		$model = JModelLegacy::getInstance('Connection', 'FabrikFEModel');
 		$model->setId($data['id']);
+		$crypt = FabrikWorker::getCrypt();
+
+		$params = new stdClass;
+		$params->encryptedPw = true;
+		$data['params'] = json_encode($params);
+		$data['password'] = $crypt->encrypt($data['password']);
+
 		$options = $model->getConnectionOptions(JArrayHelper::toObject($data));
 		$db = JDatabase::getInstance($options);
 		if (JError::isError($db))

administrator/components/com_fabrik/models/list.php

@@ -574,7 +574,7 @@ public function save($data)
 		$date = JFactory::getDate();
 		$row = $this->getTable();
 
-		$id = $data['id'];
+		$id = JArrayHelper::getValue($data, 'id');
 		$row->load($id);
 
 		$params = new JRegistry($row->params);

components/com_fabrik/models/connection.php

@@ -136,6 +136,31 @@ public function getTableDdForThisConnection($javascript = '', $name = 'table_joi
 		return JHTML::_('select.genericlist', $tableOptions, $name, $options, 'value', 'text', $selected);
 	}
 
+	/**
+	 * Decrypt once a connection password - if its params->encryptedPw option is true
+	 *
+	 * @param   JTable  &$cnn  Connection
+	 *
+	 * @since   3.1rc1
+	 *
+	 * @return  void
+	 */
+
+	protected function decryptPw(&$cnn)
+	{
+		if (isset($cnn->decrypted) && $cnn->decrypted)
+		{
+			return;
+		}
+		$crypt = FabrikWorker::getCrypt();
+		$params = json_decode($cnn->params);
+		if (is_object($params) && $params->encryptedPw == true)
+		{
+			$cnn->password = $crypt->decrypt($cnn->password);
+			$cnn->decrypted = true;
+		}
+	}
+
 	/**
 	 * Get a connection table object
 	 *
@@ -167,6 +192,7 @@ public function &getConnection($id = null)
 				{
 					$this->connection = FabTable::getInstance('connection', 'FabrikTable');
 					$this->connection->bind($connProperties);
+					$this->decryptPw($this->connection);
 					return $this->connection;
 				}
 
@@ -183,6 +209,7 @@ public function &getConnection($id = null)
 			// $$$ rob store the connection for later use as it may be required by modules/plugins
 			$session->set($key, serialize($this->connection->getProperties()));
 		}
+		$this->decryptPw($this->connection);
 		return $this->connection;
 	}
 
@@ -349,6 +376,10 @@ public function getConnections()
 		$query->select('*, id AS value, description AS text')->from('#__fabrik_connections')->where('published = 1');
 		$db->setQuery($query);
 		$connections = $db->loadObjectList();
+		foreach ($connections as &$cnn)
+		{
+			$this->decryptPw($cnn);
+		}
 		return $connections;
 	}
 
@@ -529,6 +560,7 @@ public function &loadDefaultConnection()
 			// jos_fabrik_connections and not jos_{package}_connections
 			$row = FabTable::getInstance('Connection', 'FabrikTable');
 			$row->load(array('default' => 1));
+			$this->decryptPw($row);
 			$this->defaultConnection = $row;
 		}
 		$this->connection = $this->defaultConnection;