Skip to content
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

Hide password input #50

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Hide password input #50

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c61d61f
Added a prompt for rcon password when -P is not specified. This promp…
tmanifold May 9, 2020
8bd43eb
recommented _WIN32_WINNT define
tmanifold May 9, 2020
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
72 changes: 63 additions & 9 deletions mcrcon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,19 @@
#ifdef _WIN32
// for name resolving on windows
// enable this if you get compiler whine about getaddrinfo() on windows
//#define _WIN32_WINNT 0x0501
// #define _WIN32_WINNT 0x0501

#include <ws2tcpip.h>
#include <winsock2.h>
#include <windows.h>

#else
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <termios.h>
#endif

#define VERSION "0.7.1"
Expand All @@ -59,6 +61,8 @@

#define DATA_BUFFSIZE 4096

#define MAX_PASSWORD_LENGTH 1024

// rcon packet structure
typedef struct _rc_packet {
int size;
Expand All @@ -70,7 +74,7 @@ typedef struct _rc_packet {


// ===================================
// FUNCTION DEFINITIONS
// FUNCTION DEFINITIONS
// ===================================

// Network related functions
Expand All @@ -92,6 +96,7 @@ void print_color(int color);
int get_line(char *buffer, int len);
int run_terminal_mode(int sock);
int run_commands(int argc, char *argv[]);
char* get_pass(char* host);

// Rcon protocol related functions
rc_packet* packet_build(int id, int cmd, char *s1);
Expand Down Expand Up @@ -163,7 +168,7 @@ int main(int argc, char *argv[])
char *host = getenv("MCRCON_HOST");
char *pass = getenv("MCRCON_PASS");
char *port = getenv("MCRCON_PORT");

if (!port) port = "25575";
if (!host) host = "localhost";

Expand Down Expand Up @@ -201,8 +206,15 @@ int main(int argc, char *argv[])
}

if (pass == NULL) {
puts("You must give password (-p password).\nTry 'mcrcon -h' or 'man mcrcon' for help.");
return 0;

// prompt user for password so it isn't displayed in plaintext
pass = get_pass(host);

if (!pass)
{
puts("You must give password (-p password).\nTry 'mcrcon -h' or 'man mcrcon' for help.");
return 0;
}
}

if(optind == argc && terminal_mode == 0)
Expand Down Expand Up @@ -393,7 +405,7 @@ int net_send_packet(int sd, rc_packet *packet)
{
int len;
int total = 0; // bytes we've sent
int bytesleft; // bytes left to send
int bytesleft; // bytes left to send
int ret = -1;

bytesleft = len = packet->size + sizeof(int);
Expand Down Expand Up @@ -550,7 +562,7 @@ void packet_print(rc_packet *packet)
if ((unsigned char) packet->data[i] == 0xc2 && (unsigned char) packet->data[i+1] == 0xa7) {
i+=2;
continue;
}
}
putchar(packet->data[i]);
}
}
Expand Down Expand Up @@ -644,6 +656,48 @@ int run_commands(int argc, char *argv[])
}
}

// prompt user for password while hiding input
char* get_pass(char* host)
{
char* pass = malloc(MAX_PASSWORD_LENGTH);

// hide password input
// https://stackoverflow.com/questions/6899025/hide-user-input-on-password-prompt
#ifdef _WIN32
HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE);
DWORD mode = 0;
GetConsoleMode(hStdin, &mode);
SetConsoleMode(hStdin, mode & (~ENABLE_ECHO_INPUT));
#else
struct termios oldt;
tcgetattr(STDIN_FILENO, &oldt);
struct termios newt = oldt;
newt.c_lflag &= ~ECHO;
tcsetattr(STDIN_FILENO, TCSANOW, &newt);
#endif

printf("Enter password for %s:", host);

char c;
int i = 0;

while ( (c = getc(stdin)) != '\n' && i < MAX_PASSWORD_LENGTH)
pass[i++] = c;

pass[i] = '\0';

// reset console mode and hash password
#ifdef _WIN32
SetConsoleMode(hStdin, mode);
#else
tcsetattr(STDIN_FILENO, TCSANOW, &oldt);
#endif

putc('\n', stdout);

return pass;
}

// interactive terminal mode
int run_terminal_mode(int sock)
{
Expand All @@ -667,7 +721,7 @@ int run_terminal_mode(int sock)

/* Special case for "stop" command to prevent server-side bug.
* https://bugs.mojang.com/browse/MC-154617
*
*
* NOTE: This is hacky workaround which should be handled better to
* ensure compatibility with other servers using source RCON.
* NOTE: strcasecmp() is POSIX function.
Expand Down Expand Up @@ -697,7 +751,7 @@ int get_line(char *buffer, int bsize)

int len = strlen(buffer);

// clean input buffer if needed
// clean input buffer if needed
if (len == bsize - 1) {
int ch;
while ((ch = getchar()) != '\n' && ch != EOF);
Expand Down