Skip to content

Commit

Permalink
Now setting owner, group, and context to required values after SU cop…
Browse files Browse the repository at this point in the history 
…y of databases - as required for Android 11.

Hopefully solves #112.
  • Loading branch information
@mh-
mh- committed Dec 31, 2020
1 parent 55912b1 commit d50f7bc
Show file tree
Hide file tree
Showing 3 changed files with 138 additions and 38 deletions.
56 changes: 44 additions & 12 deletions ...warn-companion/src/main/java/org/tosl/coronawarncompanion/gmsreadout/ContactDbOnDisk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public class ContactDbOnDisk {
private static final String dbNameModifier = "_";
private static final String dbNameModified = dbName+dbNameModifier;
private static String cachePathStr = "";
private static File cacheDir = null;

private final Context context;

Expand All @@ -64,24 +65,54 @@ public ContactDbOnDisk(Context context) {
public void copyFromGMS() {
// Copy the GMS LevelDB to local app cache
Log.d(TAG, "Trying to copy LevelDB");
File cacheDir = context.getExternalCacheDir();
cacheDir = context.getExternalCacheDir();
if (cacheDir == null) {
cacheDir = context.getCacheDir();
}
assert cacheDir != null;
cachePathStr = cacheDir.getPath();

// First rename the LevelDB directory, then copy it, then rename to the original name
String result = sudo(
"rm -rf "+cachePathStr+"/"+dbNameModified,
"mv "+gmsPathStr+"/"+dbName+" "+gmsPathStr+"/"+dbNameModified,
"cp -R "+gmsPathStr+"/"+dbNameModified+" "+cachePathStr+"/",
"mv "+gmsPathStr+"/"+dbNameModified+" "+gmsPathStr+"/"+dbName,
"ls -la "+cachePathStr+"/"+dbNameModified
);
Log.d(TAG, "Result from trying to copy LevelDB: "+result);
if (result.length() < 10) {
Log.e(TAG, "ERROR: Super User rights not granted!");
try {
File testFile = File.createTempFile("test_file", null, cacheDir);
FileOutputStream stream = new FileOutputStream(testFile);
try {
stream.write("test".getBytes());
// get owner of testFile
String owner = sudo("ls -l "+testFile+"|head -n 1|cut -d \" \" -f 3").replace("\n", "");
Log.d(TAG, "Cache file owner: "+owner);
// get group of testFile
String group = sudo("ls -l "+testFile+"|head -n 1|cut -d \" \" -f 4").replace("\n", "");
Log.d(TAG, "Cache file group: "+group);
// get context of testFile
String context = sudo("ls -Z "+testFile+"|head -n 1|cut -d \" \" -f 1").replace("\n", "");
Log.d(TAG, "Cache file context: "+context);

// First rename the LevelDB directory, then copy it, then rename to the original name
String result = sudo(
"rm -rf "+cachePathStr+"/"+dbNameModified,
"mv "+gmsPathStr+"/"+dbName+" "+gmsPathStr+"/"+dbNameModified,
"cp -R "+gmsPathStr+"/"+dbNameModified+" "+cachePathStr+"/",
"mv "+gmsPathStr+"/"+dbNameModified+" "+gmsPathStr+"/"+dbName,
"ls -lZ "+cachePathStr+"/"+dbNameModified
);
Log.d(TAG, "Result from trying to copy LevelDB: "+result);
if (result.length() < 10) {
Log.e(TAG, "ERROR: Super User rights not granted!");
}

// set owner and context (required for Android 11), and group as well
result = sudo(
"chown -R "+owner+" "+cachePathStr+"/"+dbNameModified,
"chgrp -R "+group+" "+cachePathStr+"/"+dbNameModified,
"chcon -R "+context+" "+cachePathStr+"/"+dbNameModified,
"ls -lZ "+cachePathStr+"/"+dbNameModified
);
Log.d(TAG, "Result from trying to set owner, group and context: "+result);
} finally {
stream.close();
}
} catch (IOException e) {
e.printStackTrace();
}
}

Expand Down Expand Up @@ -246,6 +277,7 @@ public RpiList getRpisFromContactDB() {
close();
}
}
deleteDir(cacheDir);
} catch (IOException e) {
Log.e(TAG, "IOException", e);
e.printStackTrace();
Expand Down
60 changes: 47 additions & 13 deletions ...warn-companion/src/main/java/org/tosl/coronawarncompanion/microgreadout/CctgDbOnDisk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
import org.tosl.coronawarncompanion.rpis.RpiList;

import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;

import static org.tosl.coronawarncompanion.gmsreadout.ContactDbOnDisk.deleteDir;
import static org.tosl.coronawarncompanion.gmsreadout.Sudo.sudo;
import static org.tosl.coronawarncompanion.tools.Utils.byteArrayToHexString;
import static org.tosl.coronawarncompanion.tools.Utils.getDaysFromMillis;
Expand All @@ -28,6 +31,7 @@ public class CctgDbOnDisk {
private static final String dbNameModifier = "_";
private static final String dbNameModified = dbName+dbNameModifier;
private static String cachePathStr = "";
private static File cacheDir = null;

private final Context context;

Expand All @@ -38,24 +42,54 @@ public CctgDbOnDisk(Context context) {
public void copyFromGMS() {
// Copy the CCTG microG GMS database to local app cache
Log.d(TAG, "Trying to copy CCTG database");
File cacheDir = context.getExternalCacheDir();
cacheDir = context.getExternalCacheDir();
if (cacheDir == null) {
cacheDir = context.getCacheDir();
}
assert cacheDir != null;
cachePathStr = cacheDir.getPath();

// First rename the database, then copy it, then rename to the original name
String result = sudo(
"rm "+cachePathStr+"/"+dbNameModified,
"mv "+gmsPathStr+"/"+dbName+" "+gmsPathStr+"/"+dbNameModified,
"cp "+gmsPathStr+"/"+dbNameModified+" "+cachePathStr+"/",
"mv "+gmsPathStr+"/"+dbNameModified+" "+gmsPathStr+"/"+dbName,
"ls -la "+cachePathStr+"/"+dbNameModified
);
Log.d(TAG, "Result from trying to copy LevelDB: "+result);
if (result.length() < 10) {
Log.e(TAG, "ERROR: Super User rights not granted!");
try {
File testFile = File.createTempFile("test_file", null, cacheDir);
FileOutputStream stream = new FileOutputStream(testFile);
try {
stream.write("test".getBytes());
// get owner of testFile
String owner = sudo("ls -l "+testFile+"|head -n 1|cut -d \" \" -f 3").replace("\n", "");
Log.d(TAG, "Cache file owner: "+owner);
// get group of testFile
String group = sudo("ls -l "+testFile+"|head -n 1|cut -d \" \" -f 4").replace("\n", "");
Log.d(TAG, "Cache file group: "+group);
// get context of testFile
String context = sudo("ls -Z "+testFile+"|head -n 1|cut -d \" \" -f 1").replace("\n", "");
Log.d(TAG, "Cache file context: "+context);

// First rename the LevelDB directory, then copy it, then rename to the original name
String result = sudo(
"rm "+cachePathStr+"/"+dbNameModified,
"mv "+gmsPathStr+"/"+dbName+" "+gmsPathStr+"/"+dbNameModified,
"cp "+gmsPathStr+"/"+dbNameModified+" "+cachePathStr+"/",
"mv "+gmsPathStr+"/"+dbNameModified+" "+gmsPathStr+"/"+dbName,
"ls -lZ "+cachePathStr+"/"+dbNameModified
);
Log.d(TAG, "Result from trying to copy LevelDB: "+result);
if (result.length() < 10) {
Log.e(TAG, "ERROR: Super User rights not granted!");
}

// set owner and context (required for Android 11), and group as well
result = sudo(
"chown -R "+owner+" "+cachePathStr+"/"+dbNameModified,
"chgrp -R "+group+" "+cachePathStr+"/"+dbNameModified,
"chcon -R "+context+" "+cachePathStr+"/"+dbNameModified,
"ls -lZ "+cachePathStr+"/"+dbNameModified
);
Log.d(TAG, "Result from trying to set owner, group and context: "+result);
} finally {
stream.close();
}
} catch (IOException e) {
e.printStackTrace();
}
}

Expand Down Expand Up @@ -127,7 +161,7 @@ public RpiList getRpisFromContactDB(Activity activity) {
} catch (Exception e) {
e.printStackTrace();
}

deleteDir(cacheDir);
return rpiList;
}
}
60 changes: 47 additions & 13 deletions ...rn-companion/src/main/java/org/tosl/coronawarncompanion/microgreadout/MicroGDbOnDisk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
import org.tosl.coronawarncompanion.rpis.RpiList;

import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;

import static org.tosl.coronawarncompanion.gmsreadout.ContactDbOnDisk.deleteDir;
import static org.tosl.coronawarncompanion.gmsreadout.Sudo.sudo;
import static org.tosl.coronawarncompanion.tools.Utils.byteArrayToHexString;
import static org.tosl.coronawarncompanion.tools.Utils.getDaysFromMillis;
Expand All @@ -28,6 +31,7 @@ public class MicroGDbOnDisk {
private static final String dbNameModifier = "_";
private static final String dbNameModified = dbName+dbNameModifier;
private static String cachePathStr = "";
private static File cacheDir = null;

private final Context context;

Expand All @@ -38,24 +42,54 @@ public MicroGDbOnDisk(Context context) {
public void copyFromGMS() {
// Copy the microG GMS database to local app cache
Log.d(TAG, "Trying to copy microG database");
File cacheDir = context.getExternalCacheDir();
cacheDir = context.getExternalCacheDir();
if (cacheDir == null) {
cacheDir = context.getCacheDir();
}
assert cacheDir != null;
cachePathStr = cacheDir.getPath();

// First rename the database, then copy it, then rename to the original name
String result = sudo(
"rm "+cachePathStr+"/"+dbNameModified,
"mv "+gmsPathStr+"/"+dbName+" "+gmsPathStr+"/"+dbNameModified,
"cp "+gmsPathStr+"/"+dbNameModified+" "+cachePathStr+"/",
"mv "+gmsPathStr+"/"+dbNameModified+" "+gmsPathStr+"/"+dbName,
"ls -la "+cachePathStr+"/"+dbNameModified
);
Log.d(TAG, "Result from trying to copy LevelDB: "+result);
if (result.length() < 10) {
Log.e(TAG, "ERROR: Super User rights not granted!");
try {
File testFile = File.createTempFile("test_file", null, cacheDir);
FileOutputStream stream = new FileOutputStream(testFile);
try {
stream.write("test".getBytes());
// get owner of testFile
String owner = sudo("ls -l "+testFile+"|head -n 1|cut -d \" \" -f 3").replace("\n", "");
Log.d(TAG, "Cache file owner: "+owner);
// get group of testFile
String group = sudo("ls -l "+testFile+"|head -n 1|cut -d \" \" -f 4").replace("\n", "");
Log.d(TAG, "Cache file group: "+group);
// get context of testFile
String context = sudo("ls -Z "+testFile+"|head -n 1|cut -d \" \" -f 1").replace("\n", "");
Log.d(TAG, "Cache file context: "+context);

// First rename the database, then copy it, then rename to the original name
String result = sudo(
"rm "+cachePathStr+"/"+dbNameModified,
"mv "+gmsPathStr+"/"+dbName+" "+gmsPathStr+"/"+dbNameModified,
"cp "+gmsPathStr+"/"+dbNameModified+" "+cachePathStr+"/",
"mv "+gmsPathStr+"/"+dbNameModified+" "+gmsPathStr+"/"+dbName,
"ls -lZ "+cachePathStr+"/"+dbNameModified
);
Log.d(TAG, "Result from trying to copy database: "+result);
if (result.length() < 10) {
Log.e(TAG, "ERROR: Super User rights not granted!");
}

// set owner and context (required for Android 11), and group as well
result = sudo(
"chown -R "+owner+" "+cachePathStr+"/"+dbNameModified,
"chgrp -R "+group+" "+cachePathStr+"/"+dbNameModified,
"chcon -R "+context+" "+cachePathStr+"/"+dbNameModified,
"ls -lZ "+cachePathStr+"/"+dbNameModified
);
Log.d(TAG, "Result from trying to set owner, group and context: "+result);
} finally {
stream.close();
}
} catch (IOException e) {
e.printStackTrace();
}
}

Expand Down Expand Up @@ -137,7 +171,7 @@ public RpiList getRpisFromContactDB(Activity activity, File databaseFile) {
} catch (Exception e) {
e.printStackTrace();
}

deleteDir(cacheDir);
return rpiList;
}
}

0 comments on commit d50f7bc

Please sign in to comment.