neoris/NewPipe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 6ea4b87aef5b74e374bfa453f7a0a4a246917841 into 4481dd7fe6dd8c9bd116c391aed544de6239c640

Browse Source
This commit is contained in:
Rin 2026-02-21 07:39:37 -08:00 committed by GitHub
commit f754c8247b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/java/org/schabi/newpipe/util/StateSaver.java
View File

@ -35,8 +35,12 @@ import org.schabi.newpipe.MainActivity;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InvalidClassException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.io.ObjectStreamClass;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -63,13 +67,8 @@ public final class StateSaver {
* @param context used to get the available cache dir * @param context used to get the available cache dir
*/ */
public static void init(final Context context) { public static void init(final Context context) {
final File externalCacheDir = context.getExternalCacheDir(); // Use internal cache directory to prevent other apps from accessing/modifying the state
if (externalCacheDir != null) { cacheDirPath = context.getCacheDir().getAbsolutePath();
cacheDirPath = externalCacheDir.getAbsolutePath();
}
if (TextUtils.isEmpty(cacheDirPath)) {
cacheDirPath = context.getCacheDir().getAbsolutePath();
}
} }
/** /**
@ -129,7 +128,7 @@ public final class StateSaver {
} }
try (FileInputStream fileInputStream = new FileInputStream(file); try (FileInputStream fileInputStream = new FileInputStream(file);
ObjectInputStream inputStream = new ObjectInputStream(fileInputStream)) { ObjectInputStream inputStream = new ValidatingObjectInputStream(fileInputStream)) {
//noinspection unchecked //noinspection unchecked
savedObjects = (Queue<Object>) inputStream.readObject(); savedObjects = (Queue<Object>) inputStream.readObject();
} }
@ -310,6 +309,34 @@ public final class StateSaver {
} }
} }
private static final class ValidatingObjectInputStream extends ObjectInputStream {
ValidatingObjectInputStream(final InputStream in) throws IOException {
super(in);
}
@Override
protected Class<?> resolveClass(final ObjectStreamClass desc)
throws IOException, ClassNotFoundException {
final String name = desc.getName();
if (!isSafe(name)) {
throw new InvalidClassException("Unauthorized deserialization attempt", name);
}
return super.resolveClass(desc);
}
private boolean isSafe(final String name) {
return name.startsWith("java.lang.")
|| name.startsWith("java.util.")
|| name.startsWith("org.schabi.newpipe.")
|| name.startsWith("[Ljava.lang.")
|| name.startsWith("[Ljava.util.")
|| name.startsWith("[Lorg.schabi.newpipe.")
|| name.equals("[Z") || name.equals("[B") || name.equals("[C")
|| name.equals("[S") || name.equals("[I") || name.equals("[J")
|| name.equals("[F") || name.equals("[D");
}
}
/** /**
* Used for describing how to save/read the objects. * Used for describing how to save/read the objects.
* <p> * <p>