From patchwork Sat Dec 17 07:36:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wujian(Chin)" X-Patchwork-Id: 39719 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp2220405pzb; Fri, 16 Dec 2022 23:36:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf6lLDzjUVKIR41nMf5obUSdzu/c5CET1WvpfOH3PYXIzhcMD077vHjs2ZGwNUQwLRSYiE5x X-Received: by 2002:a17:907:1c0e:b0:7c1:63d1:c4e9 with SMTP id nc14-20020a1709071c0e00b007c163d1c4e9mr30049242ejc.29.1671262610363; Fri, 16 Dec 2022 23:36:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671262610; cv=none; d=google.com; s=arc-20160816; b=NcSx/fEqW7vUtiwXIuJaX8jZltZDCDmG0UP/RfaUaeZF9dYFSH9p2JgTpcGEeor/QT 6qUqPiGUJzQKPxjEYWG5mhzBpddF9AOYpVYjzC9Cf/ZVQl8iYfRIbgTUdr9UPQ1OztqL Lb+CuGinOXwaNe+AwM0FNfXjQatVoZTMFWXrqc0u5K0XOLtijzTSPXDBHZd/nmGYLXsA tQAnv+36aiZBUQHFq5MRkPwHRw5Z/muacmRHXFeROeksk2FWEMton+qzVyL0Gl/QIj/d +zgkBVN+ZuhYJVRAFvyV1VXl+oSZGifPepfxLPjqkwNfnu1KbLSHhFnP3u6LWgTh6yM1 IpfQ== 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=46RBsZ3TLRZiuThbM6HbFd9FxVcgZxT7oofmcjdHl70=; b=Xqq/j6KWuP0fsh/F3xw30mfE7XwL9064qeAqWqGHkm5hT/YLJiGYx7ES7Ghztpmvxo wY0IICDik68l4Bl+I7R77FVLYjUN36XKE2LmxEUalMfa19qK4Hb9sjxHucVOyWarHOMG z92k2/qnqOWhjjpBHhhcGMmENdF6RVgxhr/tdENDMUNqi77+2v59uvP6MQJCYTfcjoaA baqUMUy1MkoQ+9om+jt2RVZlf8D+m4eU3iRjw9fN+NUZtwYhvwKTYRWiRf5yV1Ptx314 IoT3Dw9uOx9Sb0kJIrLXOZVSm3I8FYkaTecm+b3pFKvnwEqyy1TZjnP76F5iQiKoPj1H zN9A== 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 t18-20020a1709063e5200b007ae417013desi3527615eji.324.2022.12.16.23.36.49; Fri, 16 Dec 2022 23:36:50 -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 75D8F68BAAC; Sat, 17 Dec 2022 09:36:45 +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 BBD3668B4DE for ; Sat, 17 Dec 2022 09:36:38 +0200 (EET) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NYySB3XXpzJqXg for ; Sat, 17 Dec 2022 15:35:38 +0800 (CST) Received: from kwepemi500014.china.huawei.com (7.221.188.232) by kwepemm600005.china.huawei.com (7.193.23.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Sat, 17 Dec 2022 15:36:35 +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; Sat, 17 Dec 2022 15:36:35 +0800 From: "Wujian(Chin)" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] fftools/ffmpeg_ffplay_ffprobe_cmdutils: add -safe to replace the user name and password in the protocol address Thread-Index: AdkR6kCaPiIZsC5wR7GatfIhHllSDQ== Date: Sat, 17 Dec 2022 07:36:34 +0000 Message-ID: <1f01a2a041ba4e809ec8d9175fde8d8e@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 -safe to replace the user name and password in the protocol address 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: "zhangxiong \(A\)" , "wangqinghua \(I\)" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LAF1NjPjQpe4 The Protocol address may contain the user name and password. The ps -ef command may expose the plaintext. The -safe parameter option is added to replace the user name and password in the command line with the asterisk (*). Signed-off-by: wujian_nanjing --- doc/ffmpeg.texi | 7 +++++++ doc/ffplay.texi | 8 ++++++++ doc/ffprobe.texi | 7 +++++++ fftools/cmdutils.c | 47 +++++++++++++++++++++++++++++++++++++++++++---- fftools/cmdutils.h | 15 +++++++++++++++ fftools/ffmpeg.c | 16 +++++++++++++--- fftools/ffplay.c | 15 +++++++++++++-- fftools/ffprobe.c | 18 ++++++++++++++---- 8 files changed, 120 insertions(+), 13 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 0367930..e905542 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -50,6 +50,13 @@ output files. Also do not mix options which belong to different files. All options apply ONLY to the next input or output file and are reset between files. @itemize +@item -safe +The Protocol address may contain the user name and password. The ps -ef command may expose the plaintext. +The -safe parameter option is added to replace the user name and password in the command line with the asterisk (*). +@example +ffmpeg -safe -i rtsp://username@password.xxxx.com +@end example + @item To set the video bitrate of the output file to 64 kbit/s: @example diff --git a/doc/ffplay.texi b/doc/ffplay.texi index 5dd860b..f46ca91 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -122,6 +122,14 @@ Read @var{input_url}. @section Advanced options @table @option + +@item -safe +The Protocol address may contain the user name and password. The ps -ef command may expose the plaintext. +The -safe parameter option is added to replace the user name and password in the command line with the asterisk (*). +@example +ffplay -safe -i rtsp://username@password.xxxx.com +@end example + @item -stats Print several playback statistics, in particular show the stream duration, the codec parameters, the current position in the stream and diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi index 4dc9f57..92b13cf 100644 --- a/doc/ffprobe.texi +++ b/doc/ffprobe.texi @@ -89,6 +89,13 @@ Set the output printing format. @var{writer_name} specifies the name of the writer, and @var{writer_options} specifies the options to be passed to the writer. +@item -safe +The Protocol address may contain the user name and password. The ps -ef command may expose the plaintext. +The -safe parameter option is added to replace the user name and password in the command line with the asterisk (*). +@example +ffprobe -safe -i rtsp://username@password.xxxx.com +@end example + For example for printing the output in JSON format, specify: @example -print_format json diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index a1de621..22407f8 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -61,6 +61,40 @@ AVDictionary *format_opts, *codec_opts; int hide_banner = 0; +void param_masking(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 **argv2; + argv2 = av_mallocz(argc * sizeof(char *)); + if (!argv2) + exit_program(1); + + for (int i = 0; i < argc; i++) { + int length = strlen(argv[i]) + 1; + argv2[i] = av_mallocz(length * sizeof(char *)); + if (!argv2[i]) + exit_program(1); + memcpy(argv2[i], argv[i], length - 1); + } + return argv2; +} + +void free_pp(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 +249,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 +266,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++) { @@ -243,9 +277,14 @@ static void prepare_app_arguments(int *argc_ptr, char ***argv_ptr) } win32_argv_utf8[i] = NULL; LocalFree(argv_w); - *argc_ptr = win32_argc; *argv_ptr = win32_argv_utf8; +end: + if (*argc_ptr > 1 && !strcmp((*argv_ptr)[1], "-safe")) { + (*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..ce4c1db 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -50,6 +50,21 @@ extern AVDictionary *format_opts, *codec_opts; extern int hide_banner; /** + * Using to masking sensitive info. + */ +void param_masking(int argc, char **argv); + +/** + * Using to copy ori argv. + */ +char **copy_argv(int argc, char **argv); + +/** + * Free ** + */ +void free_pp(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..f77e850 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, safeFlag; BenchmarkTimeStamps ti; - + char **argv2; init_dynload(); register_exit(ffmpeg_cleanup); @@ -3877,15 +3877,25 @@ int main(int argc, char **argv) av_log_set_flags(AV_LOG_SKIP_REPEATED); parse_loglevel(argc, argv, options); + safeFlag = 0; + if (argc > 1 && !strcmp(argv[1], "-safe")) { + argv[1] = argv[0]; + safeFlag = 1; + argc--; + argv++; + } #if CONFIG_AVDEVICE avdevice_register_all(); #endif avformat_network_init(); show_banner(argc, argv, options); + argv2 = copy_argv(argc, argv); + if (safeFlag) + param_masking(argc, argv); /* parse options and open all input/output files */ - ret = ffmpeg_parse_options(argc, argv); + ret = ffmpeg_parse_options(argc, argv2); if (ret < 0) exit_program(1); diff --git a/fftools/ffplay.c b/fftools/ffplay.c index fc7e1c2..f9e6c91 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -3663,10 +3663,18 @@ void show_help_default(const char *opt, const char *arg) /* Called from the main */ int main(int argc, char **argv) { - int flags; + int flags, safeFlag; + char **argv2; VideoState *is; init_dynload(); + safeFlag = 0; + if (argc > 1 && !strcmp(argv[1], "-safe")) { + argv[1] = argv[0]; + safeFlag = 1; + argc--; + argv++; + } av_log_set_flags(AV_LOG_SKIP_REPEATED); parse_loglevel(argc, argv, options); @@ -3682,7 +3690,10 @@ int main(int argc, char **argv) show_banner(argc, argv, options); - parse_options(NULL, argc, argv, options, opt_input_file); + argv2 = copy_argv(argc, argv); + parse_options(NULL, argc, argv2, options, opt_input_file); + if (safeFlag) + param_masking(argc, argv); if (!input_filename) { show_usage(); diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index d2f126d..8d4d1e9 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -4035,9 +4035,16 @@ 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, safeFlag; + char **argv2; init_dynload(); + safeFlag = 0; + if (argc > 1 && !strcmp(argv[1], "-safe")) { + argv[1] = argv[0]; + safeFlag = 1; + argc--; + argv++; + } #if HAVE_THREADS ret = pthread_mutex_init(&log_mutex, NULL); @@ -4056,8 +4063,10 @@ int main(int argc, char **argv) #endif show_banner(argc, argv, options); - parse_options(NULL, argc, argv, options, opt_input_file); - + argv2 = copy_argv(argc, argv); + parse_options(NULL, argc, argv2, options, opt_input_file); + if (safeFlag) + param_masking(argc, argv); if (do_show_log) av_log_set_callback(log_callback); @@ -4173,6 +4182,7 @@ end: av_freep(&print_format); av_freep(&read_intervals); av_hash_freep(&hash); + free_pp(argc, argv2); uninit_opts(); for (i = 0; i < FF_ARRAY_ELEMS(sections); i++)