ip7z/7zip
1
0
Fork 0
mirror of https://github.com/ip7z/7zip.git synced 2026-01-03 15:09:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

feature(console): password confirmation when creating encrypted archive

Browse source 
So that typos become less likely in the password.
This commit is contained in:
powerjungle 2025-02-16 12:30:37 +00:00
parent e5431fa6f5
commit 98975d9167
No known key found for this signature in database
GPG key ID: 190C37B0F8665DA8
3 changed files with 79 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CPP/7zip/UI/Console/UpdateCallbackConsole.cpp
View file

@ -830,7 +830,7 @@ HRESULT CUpdateCallbackConsole::CryptoGetTextPassword2(Int32 *passwordIsDefined,
{
if (AskPassword)
{
RINOK(GetPassword_HRESULT(_so, Password))
RINOK(GetPasswordConfirm_HRESULT(_so, Password))
PasswordIsDefined = true;
}
}
@ -857,7 +857,7 @@ HRESULT CUpdateCallbackConsole::CryptoGetTextPassword(BSTR *password)
if (!PasswordIsDefined)
{
{
RINOK(GetPassword_HRESULT(_so, Password))
RINOK(GetPasswordConfirm_HRESULT(_so, Password))
PasswordIsDefined = true;
}
}

91
CPP/7zip/UI/Console/UserInputUtils.cpp
View file

@ -60,21 +60,24 @@ NUserAnswerMode::EEnum ScanUserYesNoAllQuit(CStdOutStream *outStream)
#endif
#endif
static bool GetPassword(CStdOutStream *outStream, UString &psw)
static void OutputPassInputMessage(CStdOutStream *outStream, const UString &msg)
{
if (outStream)
{
*outStream << "\nEnter password"
*outStream << '\n' << msg
#ifdef MY_DISABLE_ECHO
" (will not be echoed)"
<< " (will not be echoed)"
#endif
":";
<< ":";
outStream->Flush();
}
}
static bool PassInput(UString &psw)
{
bool res = false;
#ifdef MY_DISABLE_ECHO
const HANDLE console = GetStdHandle(STD_INPUT_HANDLE);
/*
GetStdHandle() returns
@ -82,33 +85,81 @@ static bool GetPassword(CStdOutStream *outStream, UString &psw)
NULL : If an application does not have associated standard handles,
such as a service running on an interactive desktop,
and has not redirected them. */
bool wasChanged = false;
const HANDLE console = GetStdHandle(STD_INPUT_HANDLE);
DWORD mode = 0;
bool wasChanged = false;
if (console != INVALID_HANDLE_VALUE && console != NULL)
if (GetConsoleMode(console, &mode))
wasChanged = (SetConsoleMode(console, mode & ~(DWORD)ENABLE_ECHO_INPUT) != 0);
const bool res = g_StdIn.ScanUStringUntilNewLine(psw);
res = g_StdIn.ScanUStringUntilNewLine(psw);
if (wasChanged)
SetConsoleMode(console, mode);
#else
const bool res = g_StdIn.ScanUStringUntilNewLine(psw);
# else
res = g_StdIn.ScanUStringUntilNewLine(psw);
#endif
return res;
}
static void EndOutStream(CStdOutStream *outStream)
{
if (outStream)
{
*outStream << endl;
outStream->Flush();
}
}
static bool GetPassword(CStdOutStream *outStream, UString &psw, const bool confirm)
{
UString confirmPsw;
UString passInMsg;
bool res = false;
passInMsg = "Enter password";
OutputPassInputMessage(outStream, passInMsg);
res = PassInput(psw);
if (!res)
{
EndOutStream(outStream);
return res;
}
if (confirm)
{
passInMsg = "Confirm password";
OutputPassInputMessage(outStream, passInMsg);
res = PassInput(confirmPsw);
if (!res)
{
EndOutStream(outStream);
return res;
}
if (psw != confirmPsw)
{
if (outStream)
{
*outStream << '\n'
<< "Confirm password is different from "
<< "the initially entered password, stopping. "
<< "Try again!";
}
res = false;
}
}
EndOutStream(outStream);
return res;
}
HRESULT GetPassword_HRESULT(CStdOutStream *outStream, UString &psw)
static HRESULT HandleHRESULT(bool res, UString &psw)
{
if (!GetPassword(outStream, psw))
if (!res)
return E_INVALIDARG;
if (g_StdIn.Error())
return E_FAIL;
@ -116,3 +167,13 @@ HRESULT GetPassword_HRESULT(CStdOutStream *outStream, UString &psw)
return E_ABORT;
return S_OK;
}
HRESULT GetPasswordConfirm_HRESULT(CStdOutStream *outStream, UString &psw)
{
return HandleHRESULT(GetPassword(outStream, psw, true), psw);
}
HRESULT GetPassword_HRESULT(CStdOutStream *outStream, UString &psw)
{
return HandleHRESULT(GetPassword(outStream, psw, false), psw);
}

1
CPP/7zip/UI/Console/UserInputUtils.h
View file

@ -23,5 +23,6 @@ enum EEnum
NUserAnswerMode::EEnum ScanUserYesNoAllQuit(CStdOutStream *outStream);
// bool GetPassword(CStdOutStream *outStream, UString &psw);
HRESULT GetPassword_HRESULT(CStdOutStream *outStream, UString &psw);
HRESULT GetPasswordConfirm_HRESULT(CStdOutStream *outStream, UString &psw);
#endif