Skip to content

[4.0] [plg_privacy_user] Convert to prepared statement #25432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wilsonge merged 6 commits into from
Nov 2, 2019
Merged

[4.0] [plg_privacy_user] Convert to prepared statement #25432

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dacd2f0
Add prepared statements to plugin privacy user
HLeithner Jul 7, 2019
ea60065
Use short array syntax
HLeithner Jul 7, 2019
d9f8a68
Merge remote-tracking branch 'origin/4.0-dev' into prepared-plg-priva…
HLeithner Oct 19, 2019
1145443
Remove unneded variable
HLeithner Oct 19, 2019
a4e188c
Use largeobject as parameter type for session ids
HLeithner Oct 19, 2019
2ed0cbd
Merge branch '4.0-dev' into prepared-plg-privacy-user
HLeithner Oct 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 36 additions & 27 deletions plugins/privacy/user/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\Database\ParameterType;
use Joomla\Utilities\ArrayHelper;

/**
Expand Down Expand Up @@ -107,24 +108,29 @@ public function onPrivacyRemoveData(PrivacyTableRequest $request, JUser $user =
return;
}

$pseudoanonymisedData = array(
$db = $this->db;

$pseudoanonymisedData = [
'name' => 'User ID ' . $user->id,
'username' => bin2hex(random_bytes(12)),
'email' => 'UserID' . $user->id . 'removed@email.invalid',
'block' => true,
);
];

$user->bind($pseudoanonymisedData);

$user->save();

// Destroy all sessions for the user account
$sessionIds = $this->db->setQuery(
$this->db->getQuery(true)
->select($this->db->quoteName('session_id'))
->from($this->db->quoteName('#__session'))
->where($this->db->quoteName('userid') . ' = ' . (int) $user->id)
)->loadColumn();

$query = $db->getQuery(true)
->select($db->quoteName('session_id'))
->from($db->quoteName('#__session'))
->where($db->quoteName('userid') . ' = :userid')
->bind(':userid', $user->id, ParameterType::INTEGER);

$db->setQuery($query);
$sessionIds = $db->loadColumn();

// If there aren't any active sessions then there's nothing to do here
if (empty($sessionIds))
Expand All @@ -134,20 +140,19 @@ public function onPrivacyRemoveData(PrivacyTableRequest $request, JUser $user =

$storeName = Factory::getConfig()->get('session_handler', 'none');
$store = JSessionStorage::getInstance($storeName);
$quotedIds = array();

// Destroy the sessions and quote the IDs to purge the session table
foreach ($sessionIds as $sessionId)
{
$store->destroy($sessionId);
$quotedIds[] = $this->db->quote($sessionId);
}

$this->db->setQuery(
$this->db->getQuery(true)
->delete($this->db->quoteName('#__session'))
->where($this->db->quoteName('session_id') . ' IN (' . implode(', ', $quotedIds) . ')')
)->execute();
$query->clear()
->delete($db->quoteName('#__session'))
->whereIn($db->quoteName('session_id'), $sessionIds, ParameterType::LARGE_OBJECT);

$db->setQuery($query)
->execute();
}

/**
Expand All @@ -162,16 +167,18 @@ public function onPrivacyRemoveData(PrivacyTableRequest $request, JUser $user =
private function createNotesDomain(JTableUser $user)
{
$domain = $this->createDomain('user_notes', 'joomla_user_notes_data');
$db = $this->db;

$query = $this->db->getQuery(true)
$query = $db->getQuery(true)
->select('*')
->from($this->db->quoteName('#__user_notes'))
->where($this->db->quoteName('user_id') . ' = ' . $this->db->quote($user->id));
->from($db->quoteName('#__user_notes'))
->where($db->quoteName('user_id') . ' = :userid')
->bind(':userid', $user->id, ParameterType::INTEGER);

$items = $this->db->setQuery($query)->loadAssocList();
$items = $db->setQuery($query)->loadAssocList();

// Remove user ID columns
foreach (array('user_id', 'created_user_id', 'modified_user_id') as $column)
foreach (['user_id', 'created_user_id', 'modified_user_id'] as $column)
{
$items = ArrayHelper::dropColumn($items, $column);
}
Expand All @@ -196,14 +203,16 @@ private function createNotesDomain(JTableUser $user)
private function createProfileDomain(JTableUser $user)
{
$domain = $this->createDomain('user_profile', 'joomla_user_profile_data');
$db = $this->db;

$query = $this->db->getQuery(true)
$query = $db->getQuery(true)
->select('*')
->from($this->db->quoteName('#__user_profiles'))
->where($this->db->quoteName('user_id') . ' = ' . $this->db->quote($user->id))
->order($this->db->quoteName('ordering') . ' ASC');
->from($db->quoteName('#__user_profiles'))
->where($db->quoteName('user_id') . ' = :userid')
->order($db->quoteName('ordering') . ' ASC')
->bind(':userid', $user->id, ParameterType::INTEGER);

$items = $this->db->setQuery($query)->loadAssocList();
$items = $db->setQuery($query)->loadAssocList();

foreach ($items as $item)
{
Expand Down Expand Up @@ -241,8 +250,8 @@ private function createUserDomain(JTableUser $user)
*/
private function createItemForUserTable(JTableUser $user)
{
$data = array();
$exclude = array('password', 'otpKey', 'otep');
$data = [];
$exclude = ['password', 'otpKey', 'otep'];

foreach (array_keys($user->getFields()) as $fieldName)
{
Expand Down