norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fix playlist path resolution for symlinked paths. (#1016)

Browse Source 
Change path resolution to remove parent directories without following
symbolic links.

When resolving relative paths such as `../../storage/emulated/0/`
the symlinks will be read and parent paths removed, in that order.
This results in paths from an `/sdcard` symlink producing unexpected
relative paths e.g.`/sdcard/../storage/emulated/0/test.mp3` resolves to
`/storage/emulated/storage/emulated/0/test.mp3` instead of
`/storage/emulated/0/test.mp3`.
This commit is contained in:
Edontin 2020-02-22 18:47:01 +10:00 committed by GitHub
parent 265efa7b93
commit 3ac3efe92c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/ch/blinkenlights/android/vanilla/FileUtils.java
View File

@ -20,10 +20,11 @@ package ch.blinkenlights.android.vanilla;
import ch.blinkenlights.android.medialibrary.MediaLibrary; import ch.blinkenlights.android.medialibrary.MediaLibrary;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.StringTokenizer;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -31,6 +32,7 @@ import android.content.SharedPreferences;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@ -144,12 +146,28 @@ public class FileUtils {
try { try {
if (!destination.isAbsolute()) { if (!destination.isAbsolute()) {
path = new File(base, path).getCanonicalPath(); path = new File(base, path).getAbsolutePath();
final ArrayList<String> pathComponents = new ArrayList<>();
final StringTokenizer pathTokenizer = new StringTokenizer(path, File.separator);
while (pathTokenizer.hasMoreTokens()) {
final String pathComponent = pathTokenizer.nextToken();
if (NAME_PARENT_FOLDER.equals(pathComponent)) {
final int lastComponentPosition = pathComponents.size() - 1;
if (lastComponentPosition >= 0
&& !NAME_PARENT_FOLDER.equals(pathComponents.get(lastComponentPosition))) {
pathComponents.remove(lastComponentPosition);
}
} else {
pathComponents.add(pathComponent);
}
}
path = File.separator + TextUtils.join(File.separator, pathComponents);
} }
} catch (SecurityException ex) { } catch (SecurityException ex) {
// Ignore. // Ignore.
}catch (IOException ex){
// Ignore
} }
return path; return path;
} }