Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-18 03:01:05 +01:00
Code Issues Packages Projects Releases Activity

Fix potential vulnerability

Browse Source 
Fixes a potential vulnerability that allows to overwrite files outside the plugin directory using a manipulated SMP archive.
This commit is contained in:
Sebastian Sdorra
2020-09-15 09:42:53 +02:00
parent 7bc037bdb0
commit 7ba7147d27
3 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scm-test/src/main/java/sonia/scm/repository/spi/ZippedRepositoryTestBase.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
@@ -150,18 +150,18 @@ public abstract class ZippedRepositoryTestBase extends AbstractTestBase
public static void extract(File targetFolder, String zippedRepositoryResource) throws IOException {
URL url = Resources.getResource(zippedRepositoryResource);
ZipInputStream zip = null;
try
try (ZipInputStream zip = new ZipInputStream(url.openStream());)
{
zip = new ZipInputStream(url.openStream());
ZipEntry entry = zip.getNextEntry();
while (entry != null)
{
File file = new File(targetFolder, entry.getName());
File parent = file.getParentFile();
if (!IOUtil.isChild(parent, file)) {
throw new IOException("invalid zip entry name");
}
if (!parent.exists())
{
@@ -174,27 +174,16 @@ public abstract class ZippedRepositoryTestBase extends AbstractTestBase
}
else
{
OutputStream output = null;
try
try (OutputStream output = new FileOutputStream(file))
{
output = new FileOutputStream(file);
IOUtil.copy(zip, output);
}
finally
{
IOUtil.close(output);
}
}
zip.closeEntry();
entry = zip.getNextEntry();
}
}
finally
{
IOUtil.close(zip);
}
}
//~--- fields ---------------------------------------------------------------