Skip to content

Added password masking in Linux terminal #112

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

Open
srijondeb wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added password masking in Linux terminal #112

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
55 changes: 34 additions & 21 deletions CPP/7zip/UI/Console/UserInputUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@

#include "UserInputUtils.h"

#include <iostream>
#ifdef _WIN32
#include <windows.h>
#elif defined(__linux__)
#include <termios.h>
#include <unistd.h>
#endif

static const char kYes = 'y';
static const char kNo = 'n';
static const char kYesAll = 'a';
Expand Down Expand Up @@ -64,42 +72,47 @@ static bool GetPassword(CStdOutStream *outStream, UString &psw)
{
if (outStream)
{
*outStream << "\nEnter password"
#ifdef MY_DISABLE_ECHO
" (will not be echoed)"
#endif
":";
*outStream << "\nEnter password (will not be echoed):";
outStream->Flush();
}

#ifdef MY_DISABLE_ECHO

#ifdef _WIN32
// Windows: disable echo
const HANDLE console = GetStdHandle(STD_INPUT_HANDLE);

/*
GetStdHandle() returns
INVALID_HANDLE_VALUE: If the function fails.
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;
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);

if (wasChanged)
SetConsoleMode(console, mode);

#else


#elif defined(__linux__)
// Linux: disable echo using termios
termios oldt;
if (tcgetattr(STDIN_FILENO, &oldt) != 0)
return false;

termios newt = oldt;
newt.c_lflag &= ~ECHO;
if (tcsetattr(STDIN_FILENO, TCSANOW, &newt) != 0)
return false;

const bool res = g_StdIn.ScanUStringUntilNewLine(psw);

#endif

tcsetattr(STDIN_FILENO, TCSANOW, &oldt);

#else
// Fallback: no echo masking
const bool res = g_StdIn.ScanUStringUntilNewLine(psw);
#endif

if (outStream)
{
*outStream << endl;
*outStream << '\n';
outStream->Flush();
}

Expand Down