Skip to content

Fix zip path traversal error and update to v3.0.6 (56) #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 2, 2024
Merged

Fix zip path traversal error and update to v3.0.6 (56) #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
218ee64
Fix zip path traversal error
microbit-grace Apr 2, 2024
289b495
Version 3.0.6 (56)
microbit-grace Apr 2, 2024
1778a85
Continue instead of throw error
microbit-grace Apr 2, 2024
9407953
Add a comment
microbit-grace Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:versionCode="55"
android:versionName="3.0.5">
android:versionCode="56"
android:versionName="3.0.6">

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
Expand Down
9 changes: 7 additions & 2 deletions app/src/main/java/com/samsung/microbit/utils/ProjectsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,18 @@ public static boolean installSamples( Context context) {
while((ze = zin.getNextEntry()) != null) {
Log.v("MicroBit", "Unzipping " + ze.getName());

File f = projectFile(context, ze.getName());
if (!f.getCanonicalPath().startsWith(projectRoot(context).getCanonicalPath())) {
// Skip file with unexpected directory
continue;
}

if (ze.isDirectory()) {
File f = projectFile( context, ze.getName());
if ( !f.isDirectory()) {
f.mkdirs();
}
} else {
FileOutputStream fout = new FileOutputStream( projectFile( context, ze.getName()));
FileOutputStream fout = new FileOutputStream(f);
BufferedOutputStream bufout = new BufferedOutputStream(fout);
byte[] buffer = new byte[1024];
int read = 0;
Expand Down