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

am aad37a1e: Merge "Validate restored file paths against their nominal domain" into jb-mr2-dev

Browse Source 
* commit 'aad37a1eeb4dcd35500a382401b889d34f6430d2':
  Validate restored file paths against their nominal domain
This commit is contained in:
Christopher Tate
2013-03-25 20:26:39 +00:00
committed by Android Git Automerger
parent e00962234b aad37a1eeb
commit 537dc87335
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/app/backup/BackupAgent.java
View File

@@ -477,21 +477,31 @@ public abstract class BackupAgent extends ContextWrapper {
}
} else {
// Not a supported location
Log.i(TAG, "Data restored from non-app domain " + domain + ", ignoring");
Log.i(TAG, "Unrecognized domain " + domain);
}
// Now that we've figured out where the data goes, send it on its way
if (basePath != null) {
// Canonicalize the nominal path and verify that it lies within the stated domain
File outFile = new File(basePath, path);
if (DEBUG) Log.i(TAG, "[" + domain + " : " + path + "] mapped to " + outFile.getPath());
onRestoreFile(data, size, outFile, type, mode, mtime);
} else {
// Not a supported output location? We need to consume the data
// anyway, so just use the default "copy the data out" implementation
// with a null destination.
if (DEBUG) Log.i(TAG, "[ skipping data from unsupported domain " + domain + "]");
FullBackup.restoreFile(data, size, type, mode, mtime, null);
String outPath = outFile.getCanonicalPath();
if (outPath.startsWith(basePath + File.separatorChar)) {
if (DEBUG) Log.i(TAG, "[" + domain + " : " + path + "] mapped to " + outPath);
onRestoreFile(data, size, outFile, type, mode, mtime);
return;
} else {
// Attempt to restore to a path outside the file's nominal domain.
if (DEBUG) {
Log.e(TAG, "Cross-domain restore attempt: " + outPath);
}
}
}
// Not a supported output location, or bad path: we need to consume the data
// anyway, so just use the default "copy the data out" implementation
// with a null destination.
if (DEBUG) Log.i(TAG, "[ skipping file " + path + "]");
FullBackup.restoreFile(data, size, type, mode, mtime, null);
}
// ----- Core implementation -----