Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set permissions on adb key file after write.

Browse Source 
We're using AtomicFile to atomically update the key file, but that does
so by creating a new file with 0600 permissions, and then moving it into
place, which results in adbd not being able to read the file when not
root. Manually set the permissions after we write to the file to prevent
this.

Also, while we're at it, delete the explicit creation of the file, since
FileOutputStream does so automatically.

Bug: http://b/132774621
Test: manual
Change-Id: I286b90adfdc591c5e7d7e417ef06be287d77261e
This commit is contained in:
Josh Gao
2019-05-23 13:55:47 -07:00
parent 9a7f304d2f
commit d044dba50b
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/adb/AdbDebuggingManager.java
View File

@@ -661,12 +661,6 @@ public class AdbDebuggingManager {
return mTestUserKeyFile == null ? getAdbFile(ADB_KEYS_FILE) : mTestUserKeyFile;
}
private void createKeyFile(File keyFile) throws IOException {
keyFile.createNewFile();
FileUtils.setPermissions(keyFile.toString(),
FileUtils.S_IRUSR | FileUtils.S_IWUSR | FileUtils.S_IRGRP, -1, -1);
}
private void writeKey(String key) {
try {
File keyFile = getUserKeyFile();
@@ -675,14 +669,13 @@ public class AdbDebuggingManager {
return;
}
if (!keyFile.exists()) {
createKeyFile(keyFile);
}
FileOutputStream fo = new FileOutputStream(keyFile, true);
fo.write(key.getBytes());
fo.write('\n');
fo.close();
FileUtils.setPermissions(keyFile.toString(),
FileUtils.S_IRUSR | FileUtils.S_IWUSR | FileUtils.S_IRGRP, -1, -1);
} catch (IOException ex) {
Slog.e(TAG, "Error writing key:" + ex);
}
@@ -698,10 +691,6 @@ public class AdbDebuggingManager {
return;
}
if (!keyFile.exists()) {
createKeyFile(keyFile);
}
atomicKeyFile = new AtomicFile(keyFile);
fo = atomicKeyFile.startWrite();
for (String key : keys) {
@@ -709,6 +698,9 @@ public class AdbDebuggingManager {
fo.write('\n');
}
atomicKeyFile.finishWrite(fo);
FileUtils.setPermissions(keyFile.toString(),
FileUtils.S_IRUSR | FileUtils.S_IWUSR | FileUtils.S_IRGRP, -1, -1);
} catch (IOException ex) {
Slog.e(TAG, "Error writing keys: " + ex);
if (atomicKeyFile != null) {