Skip to content

CLI quiet mode - write database unlock errors to stderr #12403

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

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
+15 −16
Draft

CLI quiet mode - write database unlock errors to stderr #12403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/cli/Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ namespace Utils
const QString& yubiKeySlot,
bool quiet)
Copy link

Copilot AI Aug 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code change removes the quiet mode logic but the quiet parameter is still present in the function signature. Consider removing the unused parameter or documenting why it's kept for future use to avoid confusion.

Suggested change
bool quiet)
const QString& yubiKeySlot)

Copilot uses AI. Check for mistakes.
{
auto& err = quiet ? DEVNULL : STDERR;
auto& err = STDERR;
auto compositeKey = QSharedPointer<CompositeKey>::create();

QFileInfo dbFileInfo(databaseFilename);
Expand Down
29 changes: 14 additions & 15 deletions tests/TestCli.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ void TestCli::testAdd()
// Quiet option
setInput("a");
execCmd(addCmd, {"add", "-q", "-u", "newuser", "-g", "-L", "20", m_dbFile->fileName(), "/newentry-quiet"});
QCOMPARE(m_stderr->readAll(), QByteArray());
QVERIFY(m_stderr->readAll().startsWith("Enter password to unlock"));
QCOMPARE(m_stdout->readAll(), QByteArray());
db = readDatabase();
entry = db->rootGroup()->findEntryByPath("/newentry-quiet");
Expand Down Expand Up @@ -513,8 +513,7 @@ void TestCli::testAttachmentExport()
execCmd(
attachmentExportCmd,
{"attachment-export", "--quiet", "--stdout", m_dbFile->fileName(), "/Sample Entry", "Sample attachment.txt"});
m_stderr->readLine(); // skip password prompt
QCOMPARE(m_stderr->readAll(), QByteArray());
QVERIFY(m_stderr->readAll().startsWith("Enter password to unlock"));
QCOMPARE(m_stdout->readAll(), QByteArray("Sample content\n"));
}

Expand Down Expand Up @@ -662,7 +661,7 @@ void TestCli::testClip()
// Quiet option
setInput("a");
execCmd(clipCmd, {"clip", m_dbFile->fileName(), "/Sample Entry", "0", "-q"});
QCOMPARE(m_stderr->readAll(), QByteArray());
QVERIFY(m_stderr->readAll().startsWith("Enter password to unlock"));
QCOMPARE(m_stdout->readAll(), QByteArray());
QTRY_COMPARE(clipboard->text(), QString("Password"));

Expand Down Expand Up @@ -1031,7 +1030,7 @@ void TestCli::testInfo()
// Test with quiet option.
setInput("a");
execCmd(infoCmd, {"db-info", "-q", m_dbFile->fileName()});
QCOMPARE(m_stderr->readAll(), QByteArray());
QVERIFY(m_stderr->readAll().startsWith("Enter password to unlock"));
QVERIFY(m_stdout->readLine().contains(QByteArray("UUID: ")));
QCOMPARE(m_stdout->readLine(), QByteArray("Name: \n"));
QCOMPARE(m_stdout->readLine(), QByteArray("Description: \n"));
Expand Down Expand Up @@ -1126,7 +1125,7 @@ void TestCli::testEdit()
// Quiet option
setInput("a");
execCmd(editCmd, {"edit", m_dbFile->fileName(), "-q", "-t", "newertitle", "/newtitle"});
QCOMPARE(m_stderr->readAll(), QByteArray());
QVERIFY(m_stderr->readAll().startsWith("Enter password to unlock"));
QCOMPARE(m_stdout->readAll(), QByteArray());

setInput("a");
Expand Down Expand Up @@ -1297,7 +1296,7 @@ void TestCli::testExport()
QScopedPointer<Database> dbQuiet(new Database());
setInput("a");
execCmd(exportCmd, {"export", "-f", "xml", "-q", m_dbFile->fileName()});
QCOMPARE(m_stderr->readAll(), QByteArray());
QVERIFY(m_stderr->readAll().startsWith("Enter password to unlock"));

xmlOutput.open(QIODevice::WriteOnly);
xmlOutput.write(m_stdout->readAll());
Expand Down Expand Up @@ -1566,7 +1565,7 @@ void TestCli::testList()
// Quiet option
setInput("a");
execCmd(listCmd, {"ls", "-q", m_dbFile->fileName()});
QCOMPARE(m_stderr->readAll(), QByteArray());
QVERIFY(m_stderr->readAll().startsWith("Enter password to unlock"));
QCOMPARE(m_stdout->readAll(),
QByteArray("Sample Entry\n"
"General/\n"
Expand Down Expand Up @@ -1711,7 +1710,7 @@ void TestCli::testMerge()
// the dry run option can be used with the quiet option
setInput("a");
execCmd(mergeCmd, {"merge", "--dry-run", "-s", "-q", targetFile2.fileName(), sourceFile.fileName()});
QCOMPARE(m_stderr->readAll(), QByteArray());
QVERIFY(m_stderr->readAll().startsWith("Enter password to unlock"));
QCOMPARE(m_stdout->readAll(), QByteArray());

mergedDb = QSharedPointer<Database>::create();
Expand Down Expand Up @@ -1743,13 +1742,13 @@ void TestCli::testMerge()
// Quiet option
setInput("a");
execCmd(mergeCmd, {"merge", "-q", "-s", sourceFile.fileName(), sourceFile.fileName()});
QCOMPARE(m_stderr->readAll(), QByteArray());
QVERIFY(m_stderr->readAll().startsWith("Enter password to unlock"));
QCOMPARE(m_stdout->readAll(), QByteArray());

// Quiet option without the -s option
setInput({"a", "a"});
execCmd(mergeCmd, {"merge", "-q", sourceFile.fileName(), sourceFile.fileName()});
QCOMPARE(m_stderr->readAll(), QByteArray());
QVERIFY(m_stderr->readAll().startsWith("Enter password to unlock"));
QCOMPARE(m_stdout->readAll(), QByteArray());
}

Expand Down Expand Up @@ -1982,7 +1981,7 @@ void TestCli::testRemoveQuiet()
// delete entry and verify
setInput("a");
execCmd(removeCmd, {"rm", "-q", m_dbFile->fileName(), "/Sample Entry"});
QCOMPARE(m_stderr->readAll(), QByteArray());
QVERIFY(m_stderr->readAll().startsWith("Enter password to unlock"));
QCOMPARE(m_stdout->readAll(), QByteArray());

auto db = readDatabase();
Expand All @@ -1994,7 +1993,7 @@ void TestCli::testRemoveQuiet()
// remove the entry completely
setInput("a");
execCmd(removeCmd, {"rm", "-q", m_dbFile->fileName(), QString("/%1/Sample Entry").arg(Group::tr("Recycle Bin"))});
QCOMPARE(m_stderr->readAll(), QByteArray());
QVERIFY(m_stderr->readAll().startsWith("Enter password to unlock"));
QCOMPARE(m_stdout->readAll(), QByteArray());

db = readDatabase();
Expand All @@ -2017,7 +2016,7 @@ void TestCli::testSearch()
// Quiet option
setInput("a");
execCmd(searchCmd, {"search", m_dbFile->fileName(), "-q", "Sample"});
QCOMPARE(m_stderr->readAll(), QByteArray());
QVERIFY(m_stderr->readAll().startsWith("Enter password to unlock"));
QCOMPARE(m_stdout->readAll(), QByteArray("/Sample Entry\n"));

setInput("a");
Expand Down Expand Up @@ -2104,7 +2103,7 @@ void TestCli::testShow()

setInput("a");
execCmd(showCmd, {"show", m_dbFile->fileName(), "-q", "/Sample Entry"});
QCOMPARE(m_stderr->readAll(), QByteArray());
QVERIFY(m_stderr->readAll().startsWith("Enter password to unlock"));
QCOMPARE(m_stdout->readAll(),
QByteArray("Title: Sample Entry\n"
"UserName: User Name\n"
Expand Down