From patchwork Mon Dec 26 13:07:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wujian(Chin)" X-Patchwork-Id: 39758 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp2667201pzb; Mon, 26 Dec 2022 05:08:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXve2EpYWHT0QMiEKWmXDH0f3BaACrM/oqPHyg76I2XgQmbV7XIOdh9BPYaLLy2W+EBQN8ry X-Received: by 2002:a05:6402:2b87:b0:482:4ffd:3e80 with SMTP id fj7-20020a0564022b8700b004824ffd3e80mr8643556edb.12.1672060086806; Mon, 26 Dec 2022 05:08:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672060086; cv=none; d=google.com; s=arc-20160816; b=QhYkkaoyBaRPis7/aaN2i+4h6RL2cV52jRE00tP24VI9VQY/WgYwjYQz4buDlbu8HN v0ungVqNDe4PG8lbdJnaCnvYPcpeuvua1clO/qq8RX8mIc8FK7nhxqqhpD+N4+DB5Opk VghnMK+7gO6WGD+KpGBe8HGufSUYgqBUSQCVD1Nc+TVmTmHdcGIN7ttL3l/JH5Z53oVa 8+Q5h5r69DhILBkPeMR/EzGXGMaFARh7lQesmofzXkN2St7KPhwZ3E8I6PECfANoTwMv 7/3k1Mbhs9H48Wd++iH8nnXOb76xZ3y/75YpqQ0O3/XalJKlw9CnfiVX7TinVtjh6XXi cABA== 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=yRyEdiK7/9M5dVlVmH7KfO/ckk+wY9HCVXzUv1ks+AY=; b=gGRVS7Q6soObsbPFUHDiCRRAv+wrxjENT48AtSQn8ep7IWRpMf4Xh39fL4ZMR5FYhx ZbCqovvZK0GZ/VyY44IKiJVGHOJIfDt7CHnfpQlIHBDJs2tIAy/t/Eeg4m0RVjdL473N dmZ2ccUzrv6M2AwyXPVWlAt8GqS25lhs/95otxwWv2Z7sf5vjaXRrykyRzRzQJw4OPm4 6D+UK8Mub18REVz+TnFQ2A/gtl+qHbB8xgYb/6Lnhm+TpXSMo/ofL7/8jyquy0m+xeew +wbP3HV6wUezRFElSfh0HXHs4qHT3+S9kRm2IRL6AFfYvYbtABqIB7Z6N1BJcejLxdiW i4yQ== 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 n21-20020a056402515500b0047338d1bfb8si8046351edd.157.2022.12.26.05.08.06; Mon, 26 Dec 2022 05:08:06 -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 85EA668B9FD; Mon, 26 Dec 2022 15:08:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE9C46801B0 for ; Mon, 26 Dec 2022 15:07:55 +0200 (EET) Received: from dggpeml100026.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NgdJx4p1nzJpQv for ; Mon, 26 Dec 2022 21:04:01 +0800 (CST) Received: from kwepemi500014.china.huawei.com (7.221.188.232) by dggpeml100026.china.huawei.com (7.185.36.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 26 Dec 2022 21:07:52 +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; Mon, 26 Dec 2022 21:07:51 +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: AdkZKwoRoi0uY0dPRESbmQpbQziRdQ== Date: Mon, 26 Dec 2022 13:07:51 +0000 Message-ID: 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: IstbbdDkfAxP The issue has been modified. Please review again, thank you! Signed-off-by: wujian_nanjing --- doc/fftools-common-opts.texi | 11 +++++++ fftools/cmdutils.c | 77 ++++++++++++++++++++++++++++++++++++++++++-- fftools/cmdutils.h | 25 ++++++++++++++ fftools/ffmpeg.c | 10 +++--- fftools/ffplay.c | 9 ++++-- fftools/ffprobe.c | 10 +++--- 6 files changed, 128 insertions(+), 14 deletions(-) diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index d914570..724c028 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. You can add 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..0f80910 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -61,6 +61,74 @@ 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(*argv_copy)); + 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) +{ + for (int i = 1; i < *argc; i++) { + if (strcmp((*argv)[i], "-mask_url")) { + continue; + } + + for (int j = i + 1; j < *argc; j++) { + (*argv)[j - 1] = (*argv)[j]; + } + (*argc)--; + 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 +283,16 @@ static void prepare_app_arguments(int *argc_ptr, char ***argv_ptr) if (win32_argv_utf8) { *argc_ptr = win32_argc; *argv_ptr = win32_argv_utf8; + get_mask_flag(argc_ptr, argv_ptr); return; } win32_argc = 0; argv_w = CommandLineToArgvW(GetCommandLineW(), &win32_argc); - if (win32_argc <= 0 || !argv_w) + if (win32_argc <= 0 || !argv_w) { + get_mask_flag(argc_ptr, argv_ptr); return; + } /* determine the UTF-8 buffer size (including NULL-termination symbols) */ for (i = 0; i < win32_argc; i++) @@ -232,6 +303,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); + get_mask_flag(argc_ptr, argv_ptr); return; } @@ -246,6 +318,7 @@ static void prepare_app_arguments(int *argc_ptr, char ***argv_ptr) *argc_ptr = win32_argc; *argv_ptr = win32_argv_utf8; + get_mask_flag(argc_ptr, argv_ptr); } #else static inline void prepare_app_arguments(int *argc_ptr, char ***argv_ptr) @@ -696,10 +769,8 @@ int split_commandline(OptionParseContext *octx, int argc, char *argv[], { int optindex = 1; int dashdash = -2; - /* perform system-dependent conversions for arguments list */ prepare_app_arguments(&argc, &argv); - init_parse_context(octx, groups, nb_groups); av_log(NULL, AV_LOG_DEBUG, "Splitting the commandline.\n"); 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++)