From patchwork Wed Dec 21 10:10:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wujian(Chin)" X-Patchwork-Id: 39738 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5698885pzb; Wed, 21 Dec 2022 02:10:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXvX8OtJMiQi0BkEEnM+jp/HIMuAcHLMDXLembb53Q8W4CdHR3zzZuYBJBruCFcOlVTtlg20 X-Received: by 2002:aa7:c458:0:b0:479:973d:867d with SMTP id n24-20020aa7c458000000b00479973d867dmr989231edr.31.1671617420785; Wed, 21 Dec 2022 02:10:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671617420; cv=none; d=google.com; s=arc-20160816; b=G6WcuO+IGtOXcTQ1IC9btnbBxxKpJkOzG8zu8x8IMXA0VQ6iX0RZYam3KxebTSou8f x3esaYHvFHfa5lCZig9fz/wQRbBi9TO6m6e8cM+8A2AwZ26ax9cj1gBrFqjHnwoIAAwH upU54YCaxAWc3pOpw9Q3EYgkiOoU2bYC8dYJIRFRcAlvkZhQ276W660P3z+ikV2cXuIg o8fydnxKTGYmHwuyPnwW+1kLOAWeqBaxk4T9FAmz6MT0K4ZvWTB9tCT5ASNUkJG58lCV AdpWIikmqRf9Hw1IBAkjWA80g7pKwfecSMnpk9ZyFDNihc1CUDe24X4sPVVGadQn7Lkp 2B3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:content-language :accept-language:message-id:date:thread-index:thread-topic:to:from :delivered-to; bh=gOzmBxi5+Z6ozDLdk+omt2B4A9B2aSsDVsFxYyvGvRY=; b=vqImtmWLFKsrHqkIeiTfgYph8R3huaYNr//hPTrD0Ntz6IxAxrAHmx/vMvSdE75pVW 4uwAxIb3BydID1kwpU6iHPU81n4S57nNKkbzmq171v2/kC9GrFo1DdeOiRzTjqkMqtZX 3S7IuhIz/W4aAsN0wNZZHpzO12RWCQ336pNaO/TtzuGwZmdctsfDIemuoj8LFzVyiGqG uWV3RkxaJcmIA74KB43AFiUCY5k66yGJVfYQRs3kqeWVc8ScJXQJVxK4zBGVhX4Tr25V wIUUHB6+0EFFm1UUS6WlqrlRY/4etxN0UOPSpMKJJ1xakRB1JkTA00uTYSnPkQ6J4svD Dh+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t14-20020a05640203ce00b0046b6615703esi12260664edw.181.2022.12.21.02.10.20; Wed, 21 Dec 2022 02:10:20 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A8F3568B6B0; Wed, 21 Dec 2022 12:10:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6083C68A8F1 for ; Wed, 21 Dec 2022 12:10:11 +0200 (EET) Received: from kwepemm600006.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NcTgS1MQ5zJqbD for ; Wed, 21 Dec 2022 18:09:08 +0800 (CST) Received: from kwepemi500014.china.huawei.com (7.221.188.232) by kwepemm600006.china.huawei.com (7.193.23.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 21 Dec 2022 18:10:08 +0800 Received: from kwepemi500014.china.huawei.com ([7.221.188.232]) by kwepemi500014.china.huawei.com ([7.221.188.232]) with mapi id 15.01.2375.034; Wed, 21 Dec 2022 18:10:08 +0800 From: "Wujian(Chin)" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] fftools/ffmpeg_ffplay_ffprobe_cmdutils:add -mask_url to replace the protocol address in the command with the asterisk (*) Thread-Index: AdkVJGWdoWk3SK1uRBeLFSi2TaoyFA== Date: Wed, 21 Dec 2022 10:10:07 +0000 Message-ID: <2f52afe919284d9a872738dd68ab886f@huawei.com> Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.136.102.143] MIME-Version: 1.0 X-CFilter-Loop: Reflected Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_ffplay_ffprobe_cmdutils:add -mask_url to replace the protocol address in the command with the asterisk (*) X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: "wangqinghua \(I\)" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9vy8F0W9P8Bi I have modified the issues again. Please review it again. Thank you. If the protocol address contains the user name and password, the ps -ef command exposes plaintext. The -mask_url parameter option is added to replace the protocol address in the command line with the asterisk (*). Because other users can run the ps -ef command to view sensitive information such as the user name and password in the protocol address, which is insecure. Signed-off-by: wujian_nanjing --- doc/fftools-common-opts.texi | 11 +++++++ fftools/cmdutils.c | 75 ++++++++++++++++++++++++++++++++++++++++++-- fftools/cmdutils.h | 25 +++++++++++++++ fftools/ffmpeg.c | 10 +++--- fftools/ffplay.c | 9 ++++-- fftools/ffprobe.c | 10 +++--- 6 files changed, 126 insertions(+), 14 deletions(-) diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index d914570..77b4e4a 100644 --- a/doc/fftools-common-opts.texi +++ b/doc/fftools-common-opts.texi @@ -363,6 +363,17 @@ for testing. Do not use it unless you know what you're doing. ffmpeg -cpucount 2 @end example +@item -mask_url -i @var{url} (@emph{output}) +If the protocol address contains the user name and password, the ps -ef +command exposes plaintext. The -mask_url parameter option is added to +replace the protocol address in the command line with the asterisk (*). +Because other users can run the ps -ef command to view sensitive +information such as the user name and password in the protocol address, +which is insecure. +@example +ffmpeg -mask_url -i rtsp://username:password-ip:port/stream/test +@end example + @item -max_alloc @var{bytes} Set the maximum size limit for allocating a block on the heap by ffmpeg's family of malloc functions. Exercise @strong{extreme caution} when using diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index a1de621..08b6c28 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -61,6 +61,69 @@ AVDictionary *format_opts, *codec_opts; int hide_banner = 0; +void mask_param(int argc, char **argv) +{ + int i, j; + for (i = 1; i < argc; i++) { + char *match = strstr(argv[i], "://"); + if (match) { + int total = strlen(argv[i]); + for (j = 0; j < total; j++) { + argv[i][j] = '*'; + } + } + } +} + +char **copy_argv(int argc, char **argv) +{ + char **argv_copy; + argv_copy = av_mallocz(argc * sizeof(char *)); + if (!argv_copy) { + av_log(NULL, AV_LOG_FATAL, "argv_copy malloc failed\n"); + exit_program(1); + } + + for (int i = 0; i < argc; i++) { + int length = strlen(argv[i]) + 1; + argv_copy[i] = av_mallocz(length * sizeof(char *)); + if (!argv_copy[i]) { + av_log(NULL, AV_LOG_FATAL, "argv_copy[%d] malloc failed\n", i); + exit_program(1); + } + memcpy(argv_copy[i], argv[i], length); + } + return argv_copy; +} + +char **handle_arg_param(int argc, int mask_flag, char **argv) +{ + char **argv_copy; + argv_copy = copy_argv(argc, argv); + if (mask_flag) + mask_param(argc, argv); + return argv_copy; +} + +int get_mask_flag(int *argc, char ***argv) +{ + if (*argc > 1 && !strcmp((*argv)[1], "-mask_url")) { + (*argv)[1] = (*argv)[0]; + (*argc)--; + (*argv)++; + return 1; + } + + return 0; +} + +void free_argv_copy(int argc, char **argv) +{ + for (int i = 0; i < argc; i++) + av_free(argv[i]); + av_free(argv); +} + void uninit_opts(void) { av_dict_free(&swr_opts); @@ -215,13 +278,13 @@ static void prepare_app_arguments(int *argc_ptr, char ***argv_ptr) if (win32_argv_utf8) { *argc_ptr = win32_argc; *argv_ptr = win32_argv_utf8; - return; + goto end; } win32_argc = 0; argv_w = CommandLineToArgvW(GetCommandLineW(), &win32_argc); if (win32_argc <= 0 || !argv_w) - return; + goto end; /* determine the UTF-8 buffer size (including NULL-termination symbols) */ for (i = 0; i < win32_argc; i++) @@ -232,7 +295,7 @@ static void prepare_app_arguments(int *argc_ptr, char ***argv_ptr) argstr_flat = (char *)win32_argv_utf8 + sizeof(char *) * (win32_argc + 1); if (!win32_argv_utf8) { LocalFree(argv_w); - return; + goto end; } for (i = 0; i < win32_argc; i++) { @@ -246,6 +309,12 @@ static void prepare_app_arguments(int *argc_ptr, char ***argv_ptr) *argc_ptr = win32_argc; *argv_ptr = win32_argv_utf8; +end: + if (*argc_ptr > 1 && !strcmp((*argv_ptr)[1], "-mask_url")) { + (*argv_ptr)[1] = (*argv_ptr)[0]; + (*argc_ptr)--; + (*argv_ptr)++; + } } #else static inline void prepare_app_arguments(int *argc_ptr, char ***argv_ptr) diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index 4496221..08c4da7 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -50,6 +50,31 @@ extern AVDictionary *format_opts, *codec_opts; extern int hide_banner; /** + * Using to mask sensitive info. + */ +void mask_param(int argc, char **argv); + +/** + * Using to copy ori argv. + */ +char **copy_argv(int argc, char **argv); + +/** + * Handle argv and argv_copy. + */ +char **handle_arg_param(int argc, int mask_flag, char **argv); + +/** + * Get mask flag. + */ +int get_mask_flag(int *argc, char ***argv); + +/** + * Free argv. + */ +void free_argv_copy(int argc, char **argv); + +/** * Register a program-specific cleanup routine. */ void register_exit(void (*cb)(int ret)); diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 881d6f0..d16eb36 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3865,9 +3865,9 @@ static int64_t getmaxrss(void) int main(int argc, char **argv) { - int ret; + int ret, mask_flag; BenchmarkTimeStamps ti; - + char **argv_copy; init_dynload(); register_exit(ffmpeg_cleanup); @@ -3877,15 +3877,16 @@ int main(int argc, char **argv) av_log_set_flags(AV_LOG_SKIP_REPEATED); parse_loglevel(argc, argv, options); + mask_flag = get_mask_flag(&argc, &argv); #if CONFIG_AVDEVICE avdevice_register_all(); #endif avformat_network_init(); show_banner(argc, argv, options); - + argv_copy = handle_arg_param(argc, mask_flag, argv); /* parse options and open all input/output files */ - ret = ffmpeg_parse_options(argc, argv); + ret = ffmpeg_parse_options(argc, argv_copy); if (ret < 0) exit_program(1); @@ -3920,5 +3921,6 @@ int main(int argc, char **argv) exit_program(69); exit_program(received_nb_signals ? 255 : main_return_code); + free_argv_copy(argc, argv_copy); return main_return_code; } diff --git a/fftools/ffplay.c b/fftools/ffplay.c index fc7e1c2..559e417 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -3663,10 +3663,12 @@ void show_help_default(const char *opt, const char *arg) /* Called from the main */ int main(int argc, char **argv) { - int flags; + int flags, mask_flag; + char **argv_copy; VideoState *is; init_dynload(); + mask_flag = get_mask_flag(&argc, &argv); av_log_set_flags(AV_LOG_SKIP_REPEATED); parse_loglevel(argc, argv, options); @@ -3682,7 +3684,8 @@ int main(int argc, char **argv) show_banner(argc, argv, options); - parse_options(NULL, argc, argv, options, opt_input_file); + argv_copy = handle_arg_param(argc, mask_flag, argv); + parse_options(NULL, argc, argv_copy, options, opt_input_file); if (!input_filename) { show_usage(); @@ -3759,6 +3762,6 @@ int main(int argc, char **argv) event_loop(is); /* never returns */ - + free_argv_copy(argc, argv_copy); return 0; } diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index d2f126d..49375bd 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -4035,9 +4035,10 @@ int main(int argc, char **argv) WriterContext *wctx; char *buf; char *w_name = NULL, *w_args = NULL; - int ret, input_ret, i; - + int ret, input_ret, i, mask_flag; + char **argv_copy; init_dynload(); + mask_flag = get_mask_flag(&argc, &argv); #if HAVE_THREADS ret = pthread_mutex_init(&log_mutex, NULL); @@ -4056,8 +4057,8 @@ int main(int argc, char **argv) #endif show_banner(argc, argv, options); - parse_options(NULL, argc, argv, options, opt_input_file); - + argv_copy = handle_arg_param(argc, mask_flag, argv); + parse_options(NULL, argc, argv_copy, options, opt_input_file); if (do_show_log) av_log_set_callback(log_callback); @@ -4173,6 +4174,7 @@ end: av_freep(&print_format); av_freep(&read_intervals); av_hash_freep(&hash); + free_argv_copy(argc, argv_copy); uninit_opts(); for (i = 0; i < FF_ARRAY_ELEMS(sections); i++)