Skip to content

fix: handle password prompt and missing list in long filename extraction #415

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
deepin-bot merged 2 commits into from
May 19, 2026
Merged

fix: handle password prompt and missing list in long filename extraction #415

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b16244
fix: handle password prompt and missing list in long filename extraction
LiHua000 May 19, 2026
94ee22d
fix: handle wrong password when processing longname-extract
LiHua000 May 19, 2026
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
73 changes: 68 additions & 5 deletions 3rdparty/interface/archiveinterface/cliinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ PluginFinishType CliInterface::extractFiles(const QList<FileEntry> &files, const
m_extractOptions = options;

if (!bLnfs) {
if (arcData.listRootEntry.isEmpty() && options.qSize < FILE_MAX_SIZE) {
if (arcData.listRootEntry.isEmpty()) {
emit signalprogress(1);
setProperty("list", "tmpList");
list();
Expand Down Expand Up @@ -227,7 +227,10 @@ PluginFinishType CliInterface::extractFiles(const QList<FileEntry> &files, const
}
if (bHandleLongName) {
if (!handleLongNameExtract(m_files)) {
m_eErrorType = ET_FileWriteError;
if (m_eErrorType == ET_NoError) {
m_eErrorType = ET_FileWriteError;
}
emit signalFinished(PFT_Error);
return PFT_Error;
}
}
Expand Down Expand Up @@ -269,7 +272,10 @@ PluginFinishType CliInterface::extractFiles(const QList<FileEntry> &files, const

if (bHandleLongName) {
if (!handleLongNameExtract(arcData.mapFileEntry.values())) {
m_eErrorType = ET_FileWriteError;
if (m_eErrorType == ET_NoError) {
m_eErrorType = ET_FileWriteError;
}
emit signalFinished(PFT_Error);
return PFT_Error;
}
}
Expand Down Expand Up @@ -779,9 +785,14 @@ bool CliInterface::runProcess(const QString &programName, const QStringList &arg
if (exitCode != 0) {
emit signalprogress(100);
emit signalFinished(PFT_Error);
return;
}
deleteProcess();
extractFiles(m_files, m_extractOptions, property("lnfs").toBool());
PluginFinishType ret = extractFiles(m_files, m_extractOptions, property("lnfs").toBool());
if (ret == PFT_Error) {
emit signalprogress(100);
emit signalFinished(PFT_Error);
}
}
});
}
Expand Down Expand Up @@ -1287,7 +1298,59 @@ bool CliInterface::handleLongNameExtract(const QList<FileEntry> &files)
pProcess->setProgram(m_cliProps->property("extractProgram").toString(),
m_cliProps->extractArgs(absoluteDestinationPath, fileList, false, password));
pProcess->start();
pProcess->waitForFinished(-1);

// 检测加密文件解压时的密码提示，避免进程卡死
if (password.isEmpty()) {
bool bPasswordEntered = false;
while (!pProcess->waitForFinished(200)) {
if (pProcess->bytesAvailable() > 0) {
QByteArray output = pProcess->readAllStandardOutput();
QStringList lines = QString::fromLocal8Bit(output).split('\n');
for (const QString &line : lines) {
if (isPasswordPrompt(line)) {
pProcess->kill();
pProcess->waitForFinished(3000);

PasswordNeededQuery query(m_strArchiveName);
emit signalQuery(&query);
query.waitForResponse();

if (query.responseCancelled()) {
m_eErrorType = ET_NeedPassword;
return false;
}

password = query.password();
DataManager::get_instance().archiveData().strPassword = password;

// 带密码参数重新启动解压进程
pProcess->setPtyChannels(KPtyProcess::StdinChannel);
pProcess->setOutputChannelMode(KProcess::MergedChannels);
pProcess->setNextOpenMode(QIODevice::ReadWrite | QIODevice::Unbuffered | QIODevice::Text);
pProcess->setProgram(m_cliProps->property("extractProgram").toString(),
m_cliProps->extractArgs(absoluteDestinationPath, fileList, false, password));
pProcess->start();
pProcess->waitForFinished(-1);

if (pProcess->exitCode() != 0) {
QByteArray output = pProcess->readAllStandardOutput();
if (output.contains("Wrong password")) {
m_eErrorType = ET_WrongPassword;
return false;
}
}

bPasswordEntered = true;
break;
}
}
if (bPasswordEntered)
break;
}
}
} else {
pProcess->waitForFinished(-1);
}
}
}
pProcess->deleteLater();
Expand Down
Loading