5
0
mirror of git://git.proxmox.com/git/pve-http-server.git synced 2025-01-10 01:18:00 +03:00
Commit Graph

149 Commits

Author SHA1 Message Date
Fabian Grünbichler
1d7da93655 websocket: add note about compat removal
this major release still needs to have an incompatible client, the next
one can drop setting a protocol client-side, and the one after that can
remove the protocol handling on the server side.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2021-05-18 09:25:33 +02:00
Dominik Csapak
e7eb716588 AnyEvent/websocket_proxy: drop handling of websocket subprotocols
We do not support any, and we only ever send binary frames, so drop
trying to parse the header.

For compatibility with current clients (novnc, pve-xtermjs), we have
to reply with the protocols it sent.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2021-05-18 09:24:16 +02:00
Dominik Csapak
1201435994 AnyEvent/websocket_proxy: remove 'base64' handling
novnc does not support this anymore since 2015, and neither does
our xtermjs client. it is also not listed in IANAs list of websocket
protocols [0].

so simply drop it and only send out binary frames and don't decode text frames

0: https://www.iana.org/assignments/websocket/websocket.xml#subprotocol-name

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2021-05-18 09:24:16 +02:00
Thomas Lamprecht
a7f937b2d0 bump version to 4.0-1
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-05-14 16:38:26 +02:00
Thomas Lamprecht
f8f97c8d26 buildsys: split packaging and source build-systems
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-05-14 16:37:17 +02:00
Thomas Lamprecht
ec08ad30f5 d/control: drop unzip from build depends
is actually not required since quite a bit, i.e., commit
88628fd141 from my last bootstrapping
effort in 2019.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-05-14 15:13:08 +02:00
Thomas Lamprecht
e69542b4c9 d/control: improve package description
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-05-14 15:12:05 +02:00
Thomas Lamprecht
a008f818b4 d/control: bump compat level to 12
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-05-14 15:11:46 +02:00
Thomas Lamprecht
0527add069 d/copyright: update years
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-05-14 15:11:22 +02:00
Thomas Lamprecht
dacfcf3a3c bump version to 3.2-2
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-05-07 17:50:07 +02:00
Stoiko Ivanov
9494318e18 access control: also include ipv6 in 'all'
Net::IP objects are bound to a version - 0/0 is treated as ipv4 only.
If 'all' is present in the allow_from/deny_from list we should also
add ::/0 for matching all ipv6 addresses.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2021-05-07 17:47:46 +02:00
Stoiko Ivanov
c6de5b3f2d access control: correctly match v4-mapped-v6 addresses
With recent changes to the listening socket code in pve-manager
the proxy daemons now usually bind to '::' and ipv4 clients are
read as v4-mapped-v6 addresses [0] from ::ffff:0:0/96.

This caused the allow_from/deny_from matching to break.

This patch addresses the issue by normalizing addresses from
::ffff:0:0/96 using Net::IP::ip_get_embedded_ipv4
(which roughly splits on ':' and checks if the last part looks like an
ipv4 address).

Issue was originally reported in our community forum [1]

[0] https://en.wikipedia.org/wiki/IPv6_address
[1] https://forum.proxmox.com/threads/my-pveproxy-file-doesnt-work.83228/

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2021-05-07 17:47:46 +02:00
Thomas Lamprecht
6d42e63792 bump version to 3.2-1
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-04-23 13:54:14 +02:00
Stefan Reiter
51841e98fa allow stream download from path and over pvedaemon-proxy
Allow specifying a filepath for stream=1 instead of either a path or fh
with stream=1.

With this in place, we can also just return the path to the proxy in
case we want to stream a response back, and let it read from the file
itself. This way, the pvedaemon is cut out of the transfer pipe.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
2021-04-22 18:18:50 +02:00
Stefan Reiter
389ad881f9 support streaming data form fh to client
Use an explicit AnyEvent::Handle similar to websocket proxying.

Needs some special care to make sure we apply backpressure correctly to
avoid caching too much data. Note that because of AnyEvent restrictions,
specifying a "fh" to point to a file or a packet-based socket may result
in unwanted behaviour[0].

[0]: https://metacpan.org/pod/AnyEvent::Handle#DESCRIPTION

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
2021-04-22 18:18:50 +02:00
Oguz Bektas
9afe1e89ea utils: add LISTEN_IP option in /etc/default/pveproxy
to allow setting arbitrary IP address to listen on

Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
Tested-by: Dylan Whyte <d.whyte@proxmox.com>
Reviewed-by: Dylan Whyte <d.whyte@proxmox.com>
2021-04-21 17:44:03 +02:00
Stefan Reiter
6d832dbced allow 'download' to be passed from API handler
PVE::HTTPServer in pve-manager wraps the API return value in a 'data'
element, look for a 'download' element there too to allow an API call to
instruct the HTTP server to return a file via path or filehandle.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
2021-04-21 17:42:01 +02:00
Thomas Lamprecht
e22eccff31 bump version to 3.1-1
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-12-11 08:41:44 +01:00
Stoiko Ivanov
1e1692429a add debug log for problems during accept
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-12-10 20:23:38 +01:00
Stoiko Ivanov
ebcaaf4606 accept-phase: shutdown socket on early error
if an error happens before AnyEvent::Handle registers the cleanup
callback, we should shutdown/close the socket, when handling it.

Using close, instead of shutdown($sock, SHUT_WR) here, since we are in
an error-state, and would not read from the socket anyways.
(Additionally close sends just on packet (RST,ACK), vs shutdown
(FIN,ACK+RST,ACK) in its use here).

Co-Authored-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-12-10 20:23:38 +01:00
Stoiko Ivanov
c82d1707ed accept-phase: fix conn_count "leak"
When handling new connections in 'accept_connections' the number of
active connections (conn_count) got increased before the callback, which
would eventually decrease it got registered in AnyEvent::Handle->new.

Any error/die before registering the callback would skip the
decrement, and leave the process in an endless loop upon exiting in
wait_end_loop.

This can happen e.g. when the call to getpeername fails, or if the
connection is denied by the ALLOW_FROM/DENY_FROM settings in
'/etc/default/pveproxy' (which is also a simple reproducer for that).

Additionally it can cause a denial of service, by attempting to
connect from a denied ip until the connection count exeeds the maximum
connections of all child-processes.

This patch addresses the issue by incrementing the connection count
before attempting to create the handle, and decrementing it again, if
handle creation fails.

A warning is logged if 'conn_count' turns negative when decrementing
during cleanup on error/eof. In case creating a new handle during
initial accept_connection fails, a warning is logged as well, but
'conn_count' is not decremented.

Reported via our community-forum:
https://forum.proxmox.com/threads/pveproxy-eats-available-ram.79617/

Co-Authored-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-12-10 20:23:38 +01:00
Stoiko Ivanov
26e73e6b9e add debug print helper
and uniformly use it

Suggested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-12-10 20:23:38 +01:00
Thomas Lamprecht
a420cb361a bump version to 3.0-6
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-07-02 09:44:16 +02:00
Thomas Lamprecht
e7ee5e3f75 increase max headers to 64 to cope with modern browsers + proxy combinations
This is mostly a "do not allow infinity headers" limit in the sense
of "it's good to have limits". With modern browsers and users behind
proxies we may actually get over 30 headers, so increase it for now
to 64 - hopefully enough for another decade ;)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Reported-by: Victor Hooi <victorhooi@yahoo.com>
2020-07-02 07:58:45 +02:00
Dominik Csapak
abef317256 fix post if variable declaration
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2020-06-05 09:07:29 +02:00
Dominik Csapak
3e05f16607 fix #2766: allow application/json as content-type for post/put requests
this makes creating an api client much nicer

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2020-06-05 09:07:29 +02:00
Thomas Lamprecht
779306a757 bump version to 3.0-5
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-03-09 16:12:51 +01:00
Fabian Grünbichler
f1b41d8405 websocket_proxy: fix indentation
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2020-03-07 20:19:03 +01:00
Fabian Grünbichler
e6cb79b52c websocket_proxy: implement ping/pong support
needed to keep tunnel connections alive.

> The Ping frame contains an opcode of 0x9.
> [...]
> The Pong frame contains an opcode of 0xA.
-- Section 5.5.2 cf. https://tools.ietf.org/html/rfc6455#section-5.5.2

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-03-07 20:17:41 +01:00
Fabian Grünbichler
c3bd22ec46 websocket_proxy: pull out encoding into helper sub
to allow adding other types of frames.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2020-03-07 20:11:12 +01:00
Fabian Grünbichler
c55702c39b websocket: improve masking performance
in order to make websocket proxying feasible as general tunnel, we need
to be able to transfer more than a few MB/s

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2020-03-07 20:11:12 +01:00
Thomas Lamprecht
597f8fb9d1 d/control: bump versioned dependency to pve-common
to ensure that we've PVE::Tools::spice_port_range available

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-03-06 19:02:00 +01:00
Thomas Lamprecht
9789c451a5 followup: indentation and error message improvement
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-03-06 19:01:40 +01:00
Dominik Csapak
542f4c3a03 increase allowed spiceport range
by using the new spice_port_range sub from PVE::Tools

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2020-03-06 18:58:45 +01:00
Thomas Lamprecht
bd8e8612d8 bump version to 3.0-4
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-01-29 21:36:08 +01:00
Thomas Lamprecht
3d358efe29 d/control: versioned break pve-manager and pmg-api
due to incompatible new cookie/header extraction method

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-01-29 21:36:08 +01:00
Fabian Grünbichler
362dd8eb9a api-server: extract, set and handle API token header
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2020-01-28 20:43:51 +01:00
Tim Marx
e045d0700e allow ticket in auth header as fallback
based on idea & RFC by Tim Marx, incorporating feedback by Thomas
Lamprecht. this will be extended to support API tokens in the
Authorization header as well, so make it generic.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2020-01-28 20:43:51 +01:00
Thomas Lamprecht
fa5e6f6908 update standards version
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-12-11 10:14:01 +01:00
Thomas Lamprecht
aa6e7a0d63 Revert "tls: make dh to openssl 1.1 compatible"
The libanyevent-perl version 7.140-3 included a fix for this.
It migrated to the then still testing (buster was not yet released)
on 07.04.2019, and so we can safely revert this workaround again
here.

Albeit this was fixed since Buster was officially released, still
bump the version dependency to libanyevent-perl in debian/control.

A future libanyevent-perl will use "ffdhe3072" for DH; another good
reason to revert this, to not keep hardcoded parameters with possible
(future) security implications here.

[0]: https://tracker.debian.org/news/1037514/libanyevent-perl-7140-3-migrated-to-testing/

This reverts commit ea574439f7.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-10-28 10:26:26 +01:00
Fabian Grünbichler
f5fe153b48 proxy_request: drop duplicate, unused parameter
which was mistakenly added back when this was still in pve-manager.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-10-17 17:36:06 +02:00
Thomas Lamprecht
c66bf47bff bump version to 3.0-3
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-10-11 11:25:23 +02:00
Dominik Csapak
05e777bce5 AnyEvent: extend send_file with content-type
for pmg, we need to send temporary files (for the attachment quarantine),
but we cannot know beforehand what content-type it is, so we
optionally give it to send_file_start

we give a hash with the open filehandle and the content-type in that case

this also removes the unnecessary open on the filename, since we open
it in send_file_start anyway...

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-10-10 11:58:37 +02:00
Thomas Lamprecht
d1287429bc bump version to 3.0-2
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-11 19:30:36 +02:00
Thomas Lamprecht
4a09623bbd decode_urlencoded: cope with undefined values
Avoids syslog/journal warning like:
>  Use of uninitialized value $v in substitution (s///) at
>  /usr/share/perl5/PVE/APIServer/AnyEvent.pm line 648.

If one passes a "value-less" GET argument to a request, e.g.,
GET /?debug

Besides the fact that this allows us to even use such arguments it
also is a general improvement against a slight "syslog DOS attack",
because anybody can pass such parameters to the '/' page, and all
proxmox daemons providing a API/UI using libpve-http-server-perl
allow to do such requests unauthenticated (which itself is OK, as
else one could not show the login window at all). As each of such
request produces two log lines in the syslog/journal it's far from
ideal.

A simple reproducer of the possible outcome can be seen with the
following shell script using curl:

> PVEURL='127.0.0.1'
> ARGS='?a'; # send multiple args at once to amplify the per-connection cost
> for c in {a..z}; do for i in {0..9}; do ARGS="$ARGS&$c$i"; done; done
> while true; do curl --insecure --silent --output /dev/null "https://$PVEURL:8006$ARGS"; done

Not really bad, but not nice either, as logging is not too cheap this
has some resource usage cost and noise in the syslog is never nice.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-09 14:25:30 +02:00
Thomas Lamprecht
88628fd141 re-use Debians jQuery and Bootstrap packages
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-05-22 08:10:58 +02:00
Thomas Lamprecht
e52d940029 anyevent: rpcenv is optional and from our child instance
This fixes the simple-demo, which was regressed with commit
8782148642 were we falsely assumed that
we always have an rpcenv instance here, but actually that's just
optional as it comes from our child class instance

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-05-22 08:08:00 +02:00
Thomas Lamprecht
3396e08126 buildsys: switch upload dist over to buster
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-05-22 07:39:03 +02:00
Thomas Lamprecht
8a29f1fce9 buildsys: also cleanup build directory on clean
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-05-22 07:23:11 +02:00
Thomas Lamprecht
e6dc4ff346 buildsys: no need to include arch detection for arch-independent package
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-05-21 22:25:36 +02:00