morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11689 from akallabeth/warn-args

Browse Source 
Warn args
This commit is contained in:
akallabeth
2025-06-18 10:43:58 +02:00
committed by GitHub
parent d67e1ec17b 8e38600298
commit a845647627
2 changed files with 78 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
client/common/cmdline.c
View File

@@ -74,6 +74,13 @@
static const char str_force[] = "force";
static const char* credential_args[] = { "p", "smartcard-logon",
#if defined(WITH_FREERDP_DEPRECATED_COMMANDLINE)
"gp", "gat",
#endif
"pth", "reconnect-cookie",
"assistance" };
static const char* option_starts_with(const char* what, const char* val);
static BOOL option_ends_with(const char* str, const char* ext);
static BOOL option_equals(const char* what, const char* val);
@@ -1460,7 +1467,7 @@ BOOL freerdp_set_connection_type(rdpSettings* settings, UINT32 type)
case CONNECTION_TYPE_AUTODETECT:
if (!freerdp_apply_connection_type(settings, type))
return FALSE;
/* Automatically activate GFX and RFX codec support */
/* Automatically activate GFX and RFX codec support */
#ifdef WITH_GFX_H264
if (!freerdp_settings_set_bool(settings, FreeRDP_GfxAVC444v2, TRUE) ||
!freerdp_settings_set_bool(settings, FreeRDP_GfxAVC444, TRUE) ||
@@ -4228,21 +4235,9 @@ static void fill_credential_string(COMMAND_LINE_ARGUMENT_A* args, const char* va
static void fill_credential_strings(COMMAND_LINE_ARGUMENT_A* args)
{
const char* credentials[] = {
"p",
"smartcard-logon",
#if defined(WITH_FREERDP_DEPRECATED_COMMANDLINE)
"gp",
"gat",
#endif
"pth",
"reconnect-cookie",
"assistance"
};
for (size_t x = 0; x < ARRAYSIZE(credentials); x++)
for (size_t x = 0; x < ARRAYSIZE(credential_args); x++)
{
const char* cred = credentials[x];
const char* cred = credential_args[x];
fill_credential_string(args, cred);
}
@@ -5466,10 +5461,39 @@ static int parse_command_line(rdpSettings* settings, const COMMAND_LINE_ARGUMENT
return 0;
}
static void warn_credential_args(const COMMAND_LINE_ARGUMENT* args)
{
WINPR_ASSERT(args);
bool insecureArgFound = false;
for (size_t x = 0; x < ARRAYSIZE(credential_args); x++)
{
const char* cred = credential_args[x];
const COMMAND_LINE_ARGUMENT* arg = CommandLineFindArgumentA(args, cred);
if (!arg)
continue;
if ((arg->Flags & COMMAND_LINE_ARGUMENT_PRESENT) == 0)
continue;
WLog_WARN(TAG, "Using /%s is insecure", arg->Name);
insecureArgFound = true;
}
if (insecureArgFound)
{
WLog_WARN(TAG, "Passing credentials or secrets via command line might expose these in the "
"process list");
WLog_WARN(TAG, "Consider using one of the following (more secure) alternatives:");
WLog_WARN(TAG, " - /args-from: pipe in arguments from stdin, file or file descriptor");
WLog_WARN(TAG, " - /from-stdin pass the credential via stdin");
WLog_WARN(TAG, " - set environment variable FREERDP_ASKPASS to have a gui tool query for "
"credentials");
}
}
static int freerdp_client_settings_parse_command_line_arguments_int(
rdpSettings* settings, int argc, char* argv[], BOOL allowUnknown,
COMMAND_LINE_ARGUMENT_A* largs, WINPR_ATTR_UNUSED size_t count,
freerdp_command_line_handle_option_t handle_option, void* handle_userdata)
freerdp_command_line_handle_option_t handle_option, void* handle_userdata, bool isArgsFrom)
{
char* user = NULL;
int status = 0;
@@ -5507,34 +5531,34 @@ static int freerdp_client_settings_parse_command_line_arguments_int(
WLog_WARN(TAG, "FreeRDP 1.0 style syntax was dropped with version 3!");
return -1;
}
else
if (allowUnknown)
flags |= COMMAND_LINE_IGN_UNKNOWN_KEYWORD;
if (ext)
{
if (allowUnknown)
flags |= COMMAND_LINE_IGN_UNKNOWN_KEYWORD;
if (ext)
{
if (freerdp_client_settings_parse_connection_file(settings, argv[1]))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
}
if (assist)
{
if (freerdp_client_settings_parse_assistance_file(settings, argc, argv) < 0)
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
}
CommandLineClearArgumentsA(largs);
status = CommandLineParseArgumentsA(argc, argv, largs, flags, settings,
freerdp_client_command_line_pre_filter,
freerdp_client_command_line_post_filter);
if (status < 0)
return status;
prepare_default_settings(settings, largs, ext);
if (freerdp_client_settings_parse_connection_file(settings, argv[1]))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
}
if (assist)
{
if (freerdp_client_settings_parse_assistance_file(settings, argc, argv) < 0)
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
}
CommandLineClearArgumentsA(largs);
status = CommandLineParseArgumentsA(argc, argv, largs, flags, settings,
freerdp_client_command_line_pre_filter,
freerdp_client_command_line_post_filter);
if (status < 0)
return status;
prepare_default_settings(settings, largs, ext);
if (!isArgsFrom)
warn_credential_args(largs);
CommandLineFindArgumentA(largs, "v");
arg = largs;
errno = 0;
@@ -5813,8 +5837,11 @@ int freerdp_client_settings_parse_command_line_arguments_ex(
int res = -1;
int aargc = 0;
char** aargv = NULL;
bool isArgsFrom = false;
if ((argc == 2) && option_starts_with("/args-from:", argv[1]))
{
isArgsFrom = true;
BOOL success = FALSE;
const char* file = strchr(argv[1], ':') + 1;
FILE* fp = stdin;
@@ -5854,7 +5881,8 @@ int freerdp_client_settings_parse_command_line_arguments_ex(
goto fail;
res = freerdp_client_settings_parse_command_line_arguments_int(
settings, argc, argv, allowUnknown, largs, lcount, handle_option, handle_userdata);
settings, argc, argv, allowUnknown, largs, lcount, handle_option, handle_userdata,
isArgsFrom);
fail:
free(largs);
argv_free(&aargc, &aargv);

9
client/common/man/freerdp-global-envvar.1.in
View File

@@ -1,10 +1,17 @@
.SH "ENVIRONMENT VARIABLES"
.PP
wlog environment variable
wlog environment variables
.RS 4
@MANPAGE_NAME@ uses wLog as its log facility, you can refer to the corresponding man page (wlog(7)) for more information\&. Arguments passed via the
\fI/log\-level\fR
or
\fI/log\-filters\fR
have precedence over the environment variables\&.
.br
.RE
.PP
FREERDP_ASKPASS
.RS 4
\fISet a program to ask for passwords similar to SSH_ASKPASS\fR
.RE