Skip to content

fix: Fix psalm taint errors #50800

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
susnux merged 9 commits into from
Feb 17, 2025
Merged

fix: Fix psalm taint errors #50800

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
579a337
fix: Fix psalm taint error in L10N factory
come-nc Feb 13, 2025
fec865c
chore: Correctly flag json encoding methods as escaping html and quotes
come-nc Feb 17, 2025
85fbd3e
fix: Work around psalm taint false-positive by not using var_export
come-nc Feb 17, 2025
25f3888
fix: Work around false-positive psalm taint error calling print_r in …
come-nc Feb 17, 2025
aac79ba
fix: Move config.php taint trust upstream directly in OC\Config class
come-nc Feb 17, 2025
fa108d5
fix: Correctly tag json encoding in BaseResponse to fix false-positive
come-nc Feb 17, 2025
7c90722
fix: Fix psalm taint false-positive by escaping trusted input
come-nc Feb 17, 2025
640dbd0
fix: Fix false-positive psalm taint errors when outputting plain text
come-nc Feb 17, 2025
c1c59f9
chore: Add missing star in phpdoc comment
come-nc Feb 17, 2025
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
Prev Previous commit
Next Next commit
fix: Fix psalm taint false-positive by escaping trusted input 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Feb 17, 2025
commit 7c907223d2c61df3a3ee3ec25cf4d48f058c5751
8 changes: 0 additions & 8 deletions build/psalm-baseline-security.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,4 @@
<code><![CDATA[$column]]></code>
</TaintedSql>
</file>
<file src="lib/public/IDBConnection.php">
<TaintedSql>
<code><![CDATA[$sql]]></code>
<code><![CDATA[$sql]]></code>
<code><![CDATA[$sql]]></code>
<code><![CDATA[$sql]]></code>
</TaintedSql>
</file>
</files>
22 changes: 11 additions & 11 deletions lib/private/Setup/MySQL.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function setupDatabase($username) {
/**
* @param \OC\DB\Connection $connection
*/
private function createDatabase($connection) {
private function createDatabase($connection): void {
try {
$name = $this->dbName;
$user = $this->dbUser;
Expand Down Expand Up @@ -91,23 +91,23 @@ private function createDatabase($connection) {
* @param IDBConnection $connection
* @throws \OC\DatabaseSetupException
*/
private function createDBUser($connection) {
private function createDBUser($connection): void {
try {
$name = $this->dbUser;
$password = $this->dbPassword;
// we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one,
// the anonymous user would take precedence when there is one.

if ($connection->getDatabasePlatform() instanceof Mysql80Platform) {
$query = "CREATE USER '$name'@'localhost' IDENTIFIED WITH mysql_native_password BY '$password'";
$connection->executeUpdate($query);
$query = "CREATE USER '$name'@'%' IDENTIFIED WITH mysql_native_password BY '$password'";
$connection->executeUpdate($query);
$query = "CREATE USER ?@'localhost' IDENTIFIED WITH mysql_native_password BY ?";
$connection->executeUpdate($query, [$name,$password]);
$query = "CREATE USER ?@'%' IDENTIFIED WITH mysql_native_password BY ?";
$connection->executeUpdate($query, [$name,$password]);
} else {
$query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
$connection->executeUpdate($query);
$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
$connection->executeUpdate($query);
$query = "CREATE USER ?@'localhost' IDENTIFIED BY ?";
$connection->executeUpdate($query, [$name,$password]);
$query = "CREATE USER ?@'%' IDENTIFIED BY ?";
$connection->executeUpdate($query, [$name,$password]);
}
} catch (\Exception $ex) {
$this->logger->error('Database user creation failed.', [
Expand All @@ -119,7 +119,7 @@ private function createDBUser($connection) {
}

/**
* @param $username
* @param string $username
* @param IDBConnection $connection
*/
private function createSpecificUser($username, $connection): void {
Expand Down