Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename LoggingQuery.query() to rawQuery() to make audits easier

Browse Source 
rawQuery() is much more dangerous, so this method should have the
same name as the method it is actually calling.

https://f-droid.org/docs/Second_Audit_Report/#f47--fdroidclient-raw-sql-query-executions
This commit is contained in:
Hans-Christoph Steiner 2019-01-02 22:13:40 +01:00
parent 1deec1c9b3
commit 7bc7fa9288
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java
View File

@ -533,7 +533,7 @@ public class ApkProvider extends FDroidProvider {
queryBuilder.addSelection(query); queryBuilder.addSelection(query);
queryBuilder.addOrderBy(sortOrder); queryBuilder.addOrderBy(sortOrder);
Cursor cursor = LoggingQuery.query(db(), queryBuilder.toString(), queryBuilder.getArgs()); Cursor cursor = LoggingQuery.rawQuery(db(), queryBuilder.toString(), queryBuilder.getArgs());
cursor.setNotificationUri(getContext().getContentResolver(), uri); cursor.setNotificationUri(getContext().getContentResolver(), uri);
return cursor; return cursor;
} }

2
app/src/main/java/org/fdroid/fdroid/data/AppPrefsProvider.java
View File

@ -131,7 +131,7 @@ public class AppPrefsProvider extends FDroidProvider {
query.addFields(projection); query.addFields(projection);
query.addOrderBy(sortOrder); query.addOrderBy(sortOrder);
Cursor cursor = LoggingQuery.query(db(), query.toString(), query.getArgs()); Cursor cursor = LoggingQuery.rawQuery(db(), query.toString(), query.getArgs());
cursor.setNotificationUri(getContext().getContentResolver(), uri); cursor.setNotificationUri(getContext().getContentResolver(), uri);
return cursor; return cursor;
} }

2
app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
View File

@ -892,7 +892,7 @@ public class AppProvider extends FDroidProvider {
query.addOrderBy(sortOrder); query.addOrderBy(sortOrder);
query.addLimit(limit); query.addLimit(limit);
Cursor cursor = LoggingQuery.query(db(), query.toString(), query.getArgs()); Cursor cursor = LoggingQuery.rawQuery(db(), query.toString(), query.getArgs());
cursor.setNotificationUri(getContext().getContentResolver(), uri); cursor.setNotificationUri(getContext().getContentResolver(), uri);
return cursor; return cursor;
} }

2
app/src/main/java/org/fdroid/fdroid/data/CategoryProvider.java
View File

@ -211,7 +211,7 @@ public class CategoryProvider extends FDroidProvider {
query.setOnlyCategoriesWithApps(); query.setOnlyCategoriesWithApps();
} }
Cursor cursor = LoggingQuery.query(db(), query.toString(), query.getArgs()); Cursor cursor = LoggingQuery.rawQuery(db(), query.toString(), query.getArgs());
cursor.setNotificationUri(getContext().getContentResolver(), uri); cursor.setNotificationUri(getContext().getContentResolver(), uri);
return cursor; return cursor;
} }

2
app/src/main/java/org/fdroid/fdroid/data/LoggingQuery.java
View File

@ -161,7 +161,7 @@ final class LoggingQuery {
return plan; return plan;
} }
public static Cursor query(SQLiteDatabase db, String query, String[] queryBuilderArgs) { public static Cursor rawQuery(SQLiteDatabase db, String query, String[] queryBuilderArgs) {
return new LoggingQuery(db, query, queryBuilderArgs).rawQuery(); return new LoggingQuery(db, query, queryBuilderArgs).rawQuery();
} }

2
app/src/main/java/org/fdroid/fdroid/data/PackageProvider.java
View File

@ -138,7 +138,7 @@ public class PackageProvider extends FDroidProvider {
query.addFields(projection); query.addFields(projection);
query.addOrderBy(sortOrder); query.addOrderBy(sortOrder);
Cursor cursor = LoggingQuery.query(db(), query.toString(), query.getArgs()); Cursor cursor = LoggingQuery.rawQuery(db(), query.toString(), query.getArgs());
cursor.setNotificationUri(getContext().getContentResolver(), uri); cursor.setNotificationUri(getContext().getContentResolver(), uri);
return cursor; return cursor;
} }