Skip to content

Commit

Permalink
Fixed #176
Browse files Browse the repository at this point in the history
  • Loading branch information
@fileformats
fileformats committed May 12, 2018
1 parent 650e752 commit 3f00a03
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 112 deletions.
32 changes: 21 additions & 11 deletions adm-zip.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,18 @@ module.exports = function (/*String*/input) {
_zip = new ZipFile(null, Utils.Constants.NONE);
}

function sanitize(prefix, name) {
prefix = pth.resolve(pth.normalize(prefix));
var parts = name.split('/');
for (var i = 0, l = parts.length; i < l; i++) {
var path = pth.normalize(pth.join(prefix, parts.slice(i, l).join(pth.sep)));
if (path.indexOf(prefix) === 0) {
return path;
}
}
return pth.normalize(pth.join(prefix, pth.basename(name)));
}

function getEntry(/*Object*/entry) {
if (entry && _zip) {
var item;
Expand Down Expand Up @@ -344,9 +356,9 @@ module.exports = function (/*String*/input) {
throw Utils.Errors.NO_ENTRY;
}

var entryName = pth.normalize(item.entryName);
var entryName = item.entryName;

var target = pth.resolve(targetPath, maintainEntryPath ? entryName : pth.basename(entryName));
var target = sanitize(targetPath, pth.resolve(targetPath, maintainEntryPath ? entryName : pth.basename(entryName)));

if (item.isDirectory) {
target = pth.resolve(target, "..");
Expand All @@ -357,7 +369,7 @@ module.exports = function (/*String*/input) {
if (!content) {
throw Utils.Errors.CANT_EXTRACT_FILE;
}
var childName = child.entryName;
var childName = sanitize(targetPath, child.entryName);

Utils.writeFileTo(pth.resolve(targetPath, maintainEntryPath ? childName : childName.substr(entryName.length)), content, overwrite);
});
Expand Down Expand Up @@ -413,19 +425,17 @@ module.exports = function (/*String*/input) {
throw Utils.Errors.NO_ZIP;
}
_zip.entries.forEach(function (entry) {
var entryName = pth.normalize(entry.entryName.toString());

var entryName = sanitize(targetPath, entry.entryName.toString());
if (entry.isDirectory) {
Utils.makeDir(pth.resolve(targetPath, entryName));
Utils.makeDir(entryName);
return;
}
var content = entry.getData();
if (!content) {
throw Utils.Errors.CANT_EXTRACT_FILE;
}
var fname = pth.resolve(targetPath, entryName);
Utils.writeFileTo(fname, content, overwrite);
fs.utimesSync(fname, entry.header.time, entry.header.time)
Utils.writeFileTo(entryName, content, overwrite);
fs.utimesSync(entryName, entry.header.time, entry.header.time)
})
},

Expand Down Expand Up @@ -455,7 +465,7 @@ module.exports = function (/*String*/input) {
var entryName = pth.normalize(entry.entryName.toString());

if (entry.isDirectory) {
Utils.makeDir(pth.resolve(targetPath, entryName));
Utils.makeDir(sanitize(targetPath, entryName));
if (--i === 0)
callback(undefined);
return;
Expand All @@ -468,7 +478,7 @@ module.exports = function (/*String*/input) {
return;
}

Utils.writeFileToAsync(pth.resolve(targetPath, entryName), content, overwrite, function (succ) {
Utils.writeFileToAsync(sanitize(targetPath, entryName), content, overwrite, function (succ) {
fs.utimesSync(pth.resolve(targetPath, entryName), entry.header.time, entry.header.time);
if (i <= 0) return;
if (!succ) {
Expand Down
16 changes: 8 additions & 8 deletions methods/inflater.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function JSInflater(/*Buffer*/input) {
function HuffTable(clen, cnum, cval, blist, elist, lookupm) {

this.status = 0;
this.root = null;
this.r = null;
this.maxbit = 0;

var el, f, tail,
Expand All @@ -38,7 +38,7 @@ function JSInflater(/*Buffer*/input) {
values = [],
tentry = {extra: 0, bitcnt: 0, lbase: 0, next: null};

tail = this.root = null;
tail = this.r = null;
for (var i = 0; i < 0x11; i++) {
countTbl[i] = 0;
sTbl[i] = 0;
Expand Down Expand Up @@ -115,7 +115,7 @@ function JSInflater(/*Buffer*/input) {
cnode = [];
while (cnode.length < tblCnt) cnode.push({extra: 0, bitcnt: 0, lbase: 0, next: null});
if (tail == null) {
tail = this.root = {next: null, list: null};
tail = this.r = {next: null, list: null};
} else {
tail = tail.next = {next: null, list: null}
}
Expand Down Expand Up @@ -278,7 +278,7 @@ function JSInflater(/*Buffer*/input) {

if (htbl.status !== 0) return -1;

fixedTableList = htbl.root;
fixedTableList = htbl.r;
fixedLookup = htbl.maxbit;

for (symbol = 0; symbol < 30; symbol++) lengths[symbol] = 5;
Expand All @@ -289,7 +289,7 @@ function JSInflater(/*Buffer*/input) {
fixedTableList = null;
return -1;
}
fixedTableDist = htbl.root;
fixedTableDist = htbl.r;
fixed_bd = htbl.maxbit;
}

Expand Down Expand Up @@ -320,7 +320,7 @@ function JSInflater(/*Buffer*/input) {
if (hufTable.status !== 0)
return -1; // incomplete code set

tblList = hufTable.root;
tblList = hufTable.r;
bitList = hufTable.maxbit;
var lencnt = llencnt + dcodescnt,
i = 0,
Expand Down Expand Up @@ -354,13 +354,13 @@ function JSInflater(/*Buffer*/input) {

if (hufTable.status !== 0) return -1;

tblList = hufTable.root;
tblList = hufTable.r;
bitList = hufTable.maxbit;

for (i = 0; i < dcodescnt; i++) ll[i] = ll[i + llencnt];
bitdist = 6;
hufTable = new HuffTable(ll, dcodescnt, 0, DISTS, DEXT, bitdist);
tblDist = hufTable.root;
tblDist = hufTable.r;
bitdist = hufTable.maxbit;

if ((bitdist === 0 && llencnt > 257) || hufTable.status !== 0) return -1;
Expand Down
17 changes: 0 additions & 17 deletions test/assets/attributes_test/New folder/hidden.txt
View file

This file was deleted.

17 changes: 0 additions & 17 deletions test/assets/attributes_test/New folder/hidden_readonly.txt
View file

This file was deleted.

17 changes: 0 additions & 17 deletions test/assets/attributes_test/New folder/readonly.txt
View file

This file was deleted.

17 changes: 0 additions & 17 deletions test/assets/attributes_test/New folder/somefile.txt
View file

This file was deleted.

Empty file removed test/assets/attributes_test/asd/New Text Document.txt
View file
Empty file.
Empty file removed test/assets/attributes_test/blank file.txt
View file
Empty file.
Binary file modified test/assets/ultra.zip
View file
Binary file not shown.
23 changes: 3 additions & 20 deletions test/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,8 @@
var Attr = require("../util").FileAttr,
Zip = require("../adm-zip"),
pth = require("path");
fs = require("fs");

var zip = Zip("./test/assets/ultra.zip");

var zipEntries = zip.getEntries();

zipEntries.forEach(function(zipEntry)
{
if (zipEntry.entryName === "attributes_test/blank file.txt")
{
zip.updateFile(zipEntry.entryName, "inner content");
console.log(zip.readAsText(zipEntry.entryName));
}
});

zipEntries.forEach(function(zipEntry)
{
if (zipEntry.entryName === "attributes_test/blank file.txt")
{
console.log(zip.readAsText(zipEntry.entryName));
}
});
zip.writeZip("files3.zip");
var zip = new Zip('./test/assets/ultra.zip');
zip.extractAllTo('./test/xxx');
10 changes: 5 additions & 5 deletions util/utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = (function() {
Constants = require('./constants'),
Errors = require('./errors'),

PATH_SEPARATOR = pth.normalize("/");
PATH_SEPARATOR = pth.sep;


function mkdirSync(/*String*/path) {
Expand All @@ -28,14 +28,14 @@ module.exports = (function() {
});
}

function findSync(/*String*/root, /*RegExp*/pattern, /*Boolean*/recoursive) {
function findSync(/*String*/dir, /*RegExp*/pattern, /*Boolean*/recoursive) {
if (typeof pattern === 'boolean') {
recoursive = pattern;
pattern = undefined;
}
var files = [];
fs.readdirSync(root).forEach(function(file) {
var path = pth.join(root, file);
fs.readdirSync(dir).forEach(function(file) {
var path = pth.join(dir, file);

if (fs.statSync(path).isDirectory() && recoursive)
files = files.concat(findSync(path, pattern, recoursive));
Expand Down Expand Up @@ -92,7 +92,7 @@ module.exports = (function() {
writeFileTo : function(/*String*/path, /*Buffer*/content, /*Boolean*/overwrite, /*Number*/attr) {
if (fs.existsSync(path)) {
if (!overwrite)
return false; // cannot overwite
return false; // cannot overwrite

var stat = fs.statSync(path);
if (stat.isDirectory()) {
Expand Down

0 comments on commit 3f00a03

Please sign in to comment.