Skip to content

[bug] fix s3 full match prefix#492

Open
IMSupperkaka wants to merge 1619 commits intoONLYOFFICE:masterfrom
IMSupperkaka:master
Open

[bug] fix s3 full match prefix#492
IMSupperkaka wants to merge 1619 commits intoONLYOFFICE:masterfrom
IMSupperkaka:master

Conversation

@IMSupperkaka
Copy link

aws s3 and fs file systems behave inconsistently.

filesCount = yield* downloadFileFromStorage(ctx, cmd.getDocId() + cmd.getSaveKey(), changesDir);

yield* downloadFileFromStorage(ctx, cmd.getDocId() + cmd.getSaveKey(), tempDirs.source);

async function listObjects(storageCfg, strPath) {
let params = {
Bucket: storageCfg.bucketName,
Prefix: getFilePath(storageCfg, strPath)
};
let output = [];
await listObjectsExec(storageCfg, output, params);
return output;
}

e.g.

cmd.getDocId() + cmd.getSaveKey(); // RAPp9zLIAPNideSp + _860

// s3 storage objects
const objects = [
        'editfiles/data/RAPp9zLIAPNideSp_860',
        'editfiles/data/RAPp9zLIAPNideSp_860/changesHistory.json',
        'editfiles/data/RAPp9zLIAPNideSp_860/output.docx',
        'editfiles/data/RAPp9zLIAPNideSp_860/changes.zip',
        'editfiles/data/RAPp9zLIAPNideSp_8603',
        'editfiles/data/RAPp9zLIAPNideSp_8603/changesHistory.json',
        'editfiles/data/RAPp9zLIAPNideSp_8603/output.docx',
        'editfiles/data/RAPp9zLIAPNideSp_8603/changes.zip',
        'editfiles/data/RAPp9zLIAPNideSp'
    ];

Before:

const list = storage.listObjects(cfg, 'editfiles/data/RAPp9zLIAPNideSp_860');
// Print list: 
// [
//        'editfiles/data/RAPp9zLIAPNideSp_860',
//        'editfiles/data/RAPp9zLIAPNideSp_860/changesHistory.json',
//        'editfiles/data/RAPp9zLIAPNideSp_860/output.docx',
//        'editfiles/data/RAPp9zLIAPNideSp_860/changes.zip',
//        'editfiles/data/RAPp9zLIAPNideSp_8603',
//        'editfiles/data/RAPp9zLIAPNideSp_8603/changesHistory.json',
//        'editfiles/data/RAPp9zLIAPNideSp_8603/output.docx',
//        'editfiles/data/RAPp9zLIAPNideSp_8603/changes.zip',
// ]

After:

const list = storage.listObjects(cfg, 'editfiles/data/RAPp9zLIAPNideSp_860');
// Print list: 
// [
//        'editfiles/data/RAPp9zLIAPNideSp_860',
//        'editfiles/data/RAPp9zLIAPNideSp_860/changesHistory.json',
//        'editfiles/data/RAPp9zLIAPNideSp_860/output.docx',
//        'editfiles/data/RAPp9zLIAPNideSp_860/changes.zip',
// ]

Issues that the previous code may cause:

//make dirs
for (var i = 0; i < dirsToCreate.length; ++i) {
fs.mkdirSync(dirsToCreate[i]);
}

function receiveTask(data, ack) {
return co(function* () {
var res = null;
var task = null;
let outParams = {isAck: false};
let timeoutId = undefined;
let ctx = new operationContext.Context();
try {
task = new commonDefines.TaskQueueData(JSON.parse(data));
if (task) {
ctx.initFromTaskQueueData(task);
yield ctx.initTenantCache();
timeoutId = receiveTaskSetTimeout(ctx, task, ack, outParams);
res = yield* ExecuteTask(ctx, task);
}
} catch (err) {
ctx.logger.error('receiveTask %s', err.stack);
} finally {
clearTimeout(timeoutId);
if (!outParams.isAck) {
yield ackTask(ctx, res, task, ack);
}
}
});
}

receiveTask  {"errno":-17,"syscall":"mkdir","code":"EEXIST","path":"/tmp/ASC_CONVERT2025121-rr3tge.qow3/source"}

papacarlo and others added 30 commits January 30, 2024 11:30
…elop

# Conflicts:
#	Common/sources/storage-fs.js
#	DocService/package.json
#	DocService/sources/DocsCoServer.js
#	DocService/sources/databaseConnectors/connectorUtilities.js
#	DocService/sources/databaseConnectors/postgreConnector.js
#	DocService/sources/gc.js
#	DocService/sources/mySqlBaseConnector.js
#	DocService/sources/wopiClient.js
…lative-file-save-as

Feature/wopi put relative file save as
# Conflicts:
#	DocService/sources/canvasservice.js
#	DocService/sources/wopiClient.js
konovalovsergey and others added 27 commits November 29, 2024 17:11
@CLAassistant
Copy link

CLAassistant commented Feb 24, 2025

CLA assistant check
All committers have signed the CLA.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants