mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-08 00:45:34 +02:00
![Moritz Barsnick](/assets/img/avatar_default.png)
Add the "http_proxy" option and its handling to the "tls" protocol, pass the option from the "https" protocol. The "https" protocol already defines the "http_proxy" command line option, like the "http" protocol does. The "http" protocol properly honors that command line option in addition to the environment variable. The "https" protocol doesn't, because the proxy is evaluated in the underlying "tls" protocol, which doesn't have this option, and thus only handles the environment variable, which it has access to. Fixes #7223. Signed-off-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Marton Balint <cus@passwd.hu>
111 lines
3.6 KiB
C
111 lines
3.6 KiB
C
/*
|
|
* TLS/SSL Protocol
|
|
* Copyright (c) 2011 Martin Storsjo
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "avformat.h"
|
|
#include "internal.h"
|
|
#include "network.h"
|
|
#include "os_support.h"
|
|
#include "url.h"
|
|
#include "tls.h"
|
|
#include "libavutil/avstring.h"
|
|
#include "libavutil/opt.h"
|
|
#include "libavutil/parseutils.h"
|
|
|
|
static void set_options(TLSShared *c, const char *uri)
|
|
{
|
|
char buf[1024];
|
|
const char *p = strchr(uri, '?');
|
|
if (!p)
|
|
return;
|
|
|
|
if (!c->ca_file && av_find_info_tag(buf, sizeof(buf), "cafile", p))
|
|
c->ca_file = av_strdup(buf);
|
|
|
|
if (!c->verify && av_find_info_tag(buf, sizeof(buf), "verify", p)) {
|
|
char *endptr = NULL;
|
|
c->verify = strtol(buf, &endptr, 10);
|
|
if (buf == endptr)
|
|
c->verify = 1;
|
|
}
|
|
|
|
if (!c->cert_file && av_find_info_tag(buf, sizeof(buf), "cert", p))
|
|
c->cert_file = av_strdup(buf);
|
|
|
|
if (!c->key_file && av_find_info_tag(buf, sizeof(buf), "key", p))
|
|
c->key_file = av_strdup(buf);
|
|
}
|
|
|
|
int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AVDictionary **options)
|
|
{
|
|
int port;
|
|
const char *p;
|
|
char buf[200], opts[50] = "";
|
|
struct addrinfo hints = { 0 }, *ai = NULL;
|
|
const char *proxy_path;
|
|
int use_proxy;
|
|
|
|
set_options(c, uri);
|
|
|
|
if (c->listen)
|
|
snprintf(opts, sizeof(opts), "?listen=1");
|
|
|
|
av_url_split(NULL, 0, NULL, 0, c->underlying_host, sizeof(c->underlying_host), &port, NULL, 0, uri);
|
|
|
|
p = strchr(uri, '?');
|
|
|
|
if (!p) {
|
|
p = opts;
|
|
} else {
|
|
if (av_find_info_tag(opts, sizeof(opts), "listen", p))
|
|
c->listen = 1;
|
|
}
|
|
|
|
ff_url_join(buf, sizeof(buf), "tcp", NULL, c->underlying_host, port, "%s", p);
|
|
|
|
hints.ai_flags = AI_NUMERICHOST;
|
|
if (!getaddrinfo(c->underlying_host, NULL, &hints, &ai)) {
|
|
c->numerichost = 1;
|
|
freeaddrinfo(ai);
|
|
}
|
|
|
|
if (!c->host && !(c->host = av_strdup(c->underlying_host)))
|
|
return AVERROR(ENOMEM);
|
|
|
|
proxy_path = c->http_proxy ? c->http_proxy : getenv("http_proxy");
|
|
use_proxy = !ff_http_match_no_proxy(getenv("no_proxy"), c->underlying_host) &&
|
|
proxy_path && av_strstart(proxy_path, "http://", NULL);
|
|
|
|
if (use_proxy) {
|
|
char proxy_host[200], proxy_auth[200], dest[200];
|
|
int proxy_port;
|
|
av_url_split(NULL, 0, proxy_auth, sizeof(proxy_auth),
|
|
proxy_host, sizeof(proxy_host), &proxy_port, NULL, 0,
|
|
proxy_path);
|
|
ff_url_join(dest, sizeof(dest), NULL, NULL, c->underlying_host, port, NULL);
|
|
ff_url_join(buf, sizeof(buf), "httpproxy", proxy_auth, proxy_host,
|
|
proxy_port, "/%s", dest);
|
|
}
|
|
|
|
return ffurl_open_whitelist(&c->tcp, buf, AVIO_FLAG_READ_WRITE,
|
|
&parent->interrupt_callback, options,
|
|
parent->protocol_whitelist, parent->protocol_blacklist, parent);
|
|
}
|