Skip to content
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

Jump to bottom

Do not ignore column-restricted INSERT privileges #57810

Merged
merged 1 commit into from
Jul 15, 2024
+58 −20
Merged

Do not ignore column-restricted INSERT privileges #57810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 26 additions & 20 deletions src/providers/postgres/qgspostgresprovider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1492,18 +1492,10 @@ bool QgsPostgresProvider::hasSufficientPermsAndCapabilities()

mEnabledCapabilities = QgsVectorDataProvider::Capability::ReloadData;

QString sql;
QgsPostgresResult testAccess;

bool forceReadOnly = ( mReadFlags & QgsDataProvider::ForceReadOnly );
bool inRecovery = false;
sql = QStringLiteral( "SELECT "
"has_table_privilege(%1,'SELECT')," // 0
"pg_is_in_recovery()," // 1
"current_schema(), " // 2
"has_table_privilege(%1,'INSERT')," // 3
"has_table_privilege(%1,'DELETE')" ) // 4
.arg( quotedValue( mQuery ) );

if ( !mIsQuery )
{
Expand All @@ -1515,23 +1507,37 @@ bool QgsPostgresProvider::hasSufficientPermsAndCapabilities()
mEnabledCapabilities |= QgsVectorDataProvider::SelectAtId;
}

QString sql = QStringLiteral(
"SELECT "
"has_table_privilege(%1,'SELECT')," // 0 (select priv)
"pg_is_in_recovery()," // 1 (in recovery)
"current_schema() " // 2 (current schema)
).arg( quotedValue( mQuery ) );


if ( connectionRO()->pgVersion() >= 80400 )
{
sql += QString( ",has_any_column_privilege(%1,'UPDATE')" // 5
",%2" ) // 6
.arg( quotedValue( mQuery ),
mGeometryColumn.isNull()
? QStringLiteral( "'f'" )
: QStringLiteral( "has_column_privilege(%1,%2,'UPDATE')" )
.arg( quotedValue( mQuery ),
quotedValue( mGeometryColumn ) )
);
sql += QString(
",has_any_column_privilege(%1,'INSERT')" // 3 (insert priv)
",has_table_privilege(%1,'DELETE')" // 4 (delete priv)
",has_any_column_privilege(%1,'UPDATE')" // 5 (update priv)
",%2" // 6 (geom upd priv)
).arg( quotedValue( mQuery ),
mGeometryColumn.isNull()
? QStringLiteral( "'f'" )
: QStringLiteral( "has_column_privilege(%1,%2,'UPDATE')" )
.arg( quotedValue( mQuery ),
quotedValue( mGeometryColumn ) )
);
}
else
{
sql += QString( ",has_table_privilege(%1,'UPDATE')" // 5
",has_table_privilege(%1,'UPDATE')" ) // 6
.arg( quotedValue( mQuery ) );
sql += QString(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maintaining PostgreSQL < 8.4 code paths looks like self inflicted pain at that point, given it has been long unsupported.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. but it's better done in an ad-hoc PR

",has_table_privilege(%1,'INSERT')" // 3 (insert priv)
",has_table_privilege(%1,'DELETE')" // 4 (delete priv)
",has_table_privilege(%1,'UPDATE')" // 5 (update priv)
",has_table_privilege(%1,'UPDATE')" // 6 (geom col priv)
).arg( quotedValue( mQuery ) );
}

testAccess = connectionRO()->LoggedPQexec( "QgsPostgresProvider", sql );
Expand Down
32 changes: 32 additions & 0 deletions tests/src/python/test_provider_postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3475,6 +3475,38 @@ def testPktLowerCase(self):
cur.execute(sql_pk)
self.assertEqual(cur.fetchall(), [('dep', 'character varying')])

def testColumnRestrictedLayerIsEditable(self):
"""
Test editability of table with partial column insert privs
See https://github.com/qgis/QGIS/issues/28835
"""

md = QgsProviderRegistry.instance().providerMetadata("postgres")
conn = md.createConnection(self.dbconn, {})

conn.executeSql('''
DROP TABLE IF EXISTS public.qgis_issue_gh_28835;
CREATE UNLOGGED TABLE public.qgis_issue_gh_28835 (
id INT PRIMARY KEY,
restricted_column TEXT,
geom GEOMETRY(point, 4326)
)
''')

uri = QgsDataSourceUri(self.dbconn + ' table="public"."qgis_issue_gh_28835" (geom)')
uri.setUsername('qgis_test_unprivileged_user')
uri.setPassword('qgis_test_unprivileged_user_password')

conn.executeSql('GRANT SELECT ON public.qgis_issue_gh_28835 TO qgis_test_unprivileged_user')
vl = QgsVectorLayer(uri.uri(), 'test', 'postgres')
self.assertTrue(vl.isValid(), "qgis_issue_gh_28835 is an invalid layer")
self.assertFalse(vl.startEditing(), "qgis_issue_gh_28835 is unexpectedly editable by qgis_test_unprivileged_user before grants")

conn.executeSql('GRANT INSERT(geom) ON public.qgis_issue_gh_28835 TO qgis_test_unprivileged_user')
vl = QgsVectorLayer(uri.uri(), 'test', 'postgres')
self.assertTrue(vl.isValid(), "qgis_issue_gh_28835 is an invalid layer")
self.assertTrue(vl.startEditing(), "qgis_issue_gh_28835 is not editable by qgis_test_unprivileged_user after restricted-column insert grant")


class TestPyQgsPostgresProviderCompoundKey(QgisTestCase, ProviderTestCase):

Expand Down
Loading