Commit Graph

186 Commits

Author SHA1 Message Date
Thomas Lamprecht
aad755eb35 multipart upload: avoid some extra lines and general code style fixes
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2022-09-29 17:05:34 +02:00
Thomas Lamprecht
dafe441609 multipart upload: avoid code duplication in writing data to tmp file
Separate the flow into first getting the length and data reference
and only then handle writing/digest in a common way

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2022-09-29 17:05:34 +02:00
Thomas Lamprecht
59128f6b5a multipart upload: factor out content-disposition extraction
and improve the boundary variable helper name by adding a _re postfix
and using snake case everywhere.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2022-09-29 17:05:34 +02:00
Thomas Lamprecht
42ec24969f multipart upload: drop unused variables
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2022-09-29 17:05:34 +02:00
Matthias Heiserer
0fbcbc2628 fix #3990: multipart upload: rework to fix uploading small files
== The problem
Upload of files smaller than ~16kb failed.
This was because the code assumed that it would be called
several times, and each time would do a certain action.
When the whole file was in the buffer, this failed because
the function would try parssing the first part in the payload and
then return, instead of parsing the rest of the available data.

== Why not just modifying the current code a bit?
The code had a lot of nested control statements and a
non-intuitive control flow (phase 0->2->1->1->1 and so on).

The way the phases and buffer content were checked made it
rather difficult to just fix a few lines.

== What was changed
* Part headers are parsed with a single regex line each,
 which improves code readability.

* Parsing the content is done in order, so even if the whole data is in the buffer,
 it can be read in one go. Files of arbitrary sizes can be uploaded.

== Tested with
* Uploaded 0B, 1B, 14KB, 16KB, 1GB, 10GB, 20GB files

* Tested with all checksums and without

* Tested on firefox, chromium, and pvesh

I didn't do any fuzzing or automated upload testing.

== Drawbacks & Potential issues
* Part headers are hardcoded, adding new ones requries modifying this file

== does not fix
* upload can still time out

Signed-off-by: Matthias Heiserer <m.heiserer@proxmox.com>
Tested-by: Daniel Tschlatscher <d.tschlatscher@proxmox.com>
2022-09-29 17:04:34 +02:00
Matthias Heiserer
91b86f4e2d AnyEvent: whitespace fix
and remove unnecessary parentheses.

Signed-off-by: Matthias Heiserer <m.heiserer@proxmox.com>
2022-09-29 14:40:46 +02:00
Daniel Tschlatscher
9c1388daf1 acknowledge content-disposition header
Acknowledging the Content-Disposition header makes it possible for the
backend to tell the browser whether a file should be downloaded,
rather than displayed inline, and what it's default name should be.

Signed-off-by: Daniel Tschlatscher <d.tschlatscher@proxmox.com>
2022-09-29 14:35:32 +02:00
Thomas Lamprecht
4099febef5 request: add missing early return to complete error check
While $self->error will immediately send out a 4xx or 5xx response
anyhow its still good to cover against possible side effects (e.g.,
from future code in that branch) on the server and return directly.

Note that this is mostly for completeness sake, we already have
another check that covers this one for relevant cases in commit
580d540ea9.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2022-07-04 11:08:19 +02:00
Thomas Lamprecht
9f092591c8 bump version to 4.1-3
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2022-07-02 09:16:29 +02:00
Thomas Lamprecht
c2bd69c7b5 requests: assert that theres no @ in the URLs authority
We don't expect any userinfo in the authority and t o avoid that this
allows some leverage in doing weird things later its better to error
out early on such requests.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Originally-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
2022-07-02 08:27:13 +02:00
Thomas Lamprecht
e9df8a6e76 pass through streaming: only allow from privileged local pvedaemon
Ensures that no external request can control streaming on proxying
requests as safety net for when we'd have another issue in the
request handling part.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Originally-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
2022-07-02 07:59:53 +02:00
Thomas Lamprecht
580d540ea9 proxy request: assert that API url starts with a slash
We implicitly assume that to be the case when assembling the target
URL, so assert it explicitly as it's user controlled input.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Originally-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
2022-07-02 07:56:15 +02:00
Thomas Lamprecht
936007ae02 response: avoid linefeeds in response status
basically only possible to trigger with chromium based browsers
(chrome, edge, opera) but besides those having the biggest usage
currently its not that nice in any way.

Users could inject headers in their response, which isn't really that
bad itself, as they won't really do anything at least for sane
browsers that don't allow setting third party cookies by default
(unlike again, chrome), in which case one can create huge cookies
that then trigger the max header size check on requests, DOS'ing an
user's access to a PVE interface if they can get them to visit a
malicious site (a clear cooki actione would allow visiting it again)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Reported-by: STAR Labs <info@starlabs.sg>
2022-07-01 11:38:16 +02:00
Thomas Lamprecht
b9a7fd54e9 response: improve no content comment
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2022-07-01 10:14:31 +02:00
Thomas Lamprecht
f124f482a1 bump version to 4.1-2
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2022-05-17 16:40:33 +02:00
Fabian Grünbichler
6781735008 html formatter: encode href attributes
these contain untrusted data, so treat them accordingly.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2022-05-17 16:39:47 +02:00
Fabian Grünbichler
34f20af260 tls: log failure to apply TLS 1.3 ciphers
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2022-01-18 12:35:49 +01:00
Thomas Lamprecht
61cf96bed7 bump version to 4.1-1
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2022-01-13 13:32:47 +01:00
Fabian Grünbichler
e902248507 fix #3789: allow disabling TLS v1.2/v1.3
SSL 2 and 3 are already disabled by default by us, and TLS 1.1 and below
are disabled by default on Debian systems.

requires corresponding patch in pve-manager to have an effect.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2022-01-13 13:30:20 +01:00
Fabian Grünbichler
d93700f182 fix #3745: allow overriding TLS key location
when using a custom pveproxy certificate. actual handling is done in
pve-manager.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2022-01-13 13:30:14 +01:00
Fabian Grünbichler
95fde1f73d fix #3790: allow setting TLS 1.3 cipher suites
like the TLS <= 1.2 cipher list, but needs a different option since the
format and values are incompatible. AnyEvent doesn't yet handle this
directly like the cipher list, so set it directly on the context.

requires corresponding patch in pve-manager (which reads the config, and
passes relevant parts back to the API server).

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2022-01-13 13:30:10 +01:00
Fabian Grünbichler
e12e46c979 fix #3807: don't attempt response on closed handle
if a client closes the connection while the API server is
waiting/stalling here, the handle will disappear, and sending a response
is no longer possible.

(this issue is only cosmetic, but if such clients are a regular
occurrence it might get quite noisy in the logs)

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2022-01-13 13:10:26 +01:00
Thomas Lamprecht
baf8c8dc0d small indentation and code cleanup
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2022-01-13 13:10:17 +01:00
Thomas Lamprecht
d9b3838f27 avoid warning if request params do not exists
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2022-01-13 13:10:17 +01:00
Fabian Grünbichler
6277311e71 WS: guard disconnect block check properly
if the WS gets disconnected without any data having been sent first,
wbuf (and thus `length $wbuf`) is undef. the actual length of the buffer
is not relevant here anyway, just the fact that it's non-empty - so
avoid the undef warning by dropping the unnecessary comparison.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2021-12-17 11:05:03 +01:00
Thomas Lamprecht
d298a22cc2 bump version to 4.0-4
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-11-24 18:14:57 +01:00
Thomas Lamprecht
5cef57dee9 http: split and sort use statements
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-11-24 18:13:14 +01:00
Dominik Csapak
127dbe7c7d download-stream: allow the api call to set the content-encoding
this is useful if we want to pipe the output of a program e.g. through gzip

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-11-24 18:09:37 +01:00
Thomas Lamprecht
7599c47894 constructor: split TLS flags to separate lines
easier to grasp what's actually being set..

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-11-16 07:34:11 +01:00
Stoiko Ivanov
a0434e126e fix #3724: disable TLS renegotiation
The issue is probably not critical and best addressed by not running
the perl API servers in an exposed environment or when this needs to
be done by installing a reverse proxy in front of them.

The DOS potential of the perl daemons is limited more by the limited
number of parallel workers (and the memory constraints of starting
more of them), than by the CPU cycles wasted on TLS renegotiation.

Still disabling TLS renegotiation should show very little downside:
* it was removed in TLS 1.3 for security reasons
* it was the way nginx addressed this issue [1].
* we do not use client certificate authentication

Tested by running `openssl s_client -no_tls1_3 -connect 192.0.2.1:8006`
and issuing a `HEAD / HTTP/1.1\nR\n`
with and without the patch.

[1] 70bd187c4c386d82d6e4d180e0db84f361d1be02 at
    https://github.com/nginx/nginx (although that code adapted to
    the various changes in openssl API over the years)
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2021-11-16 07:07:40 +01:00
Fabian Grünbichler
b1364a3c98 webproxy: handle unflushed write buffer
for proxied requests, we usually tear down the proxy connection
immediately when closing the source connection. this is not the correct
course of action for bulk one-way data streams that are proxied, where
the source connection might be closed, but the proxy connection might
still have data in the write buffer that needs to be written out.

push_shutdown already handles this case (closing the socket/FH after it
has been fully drained).

one example for such a proxied data stream is the 'migrate' data for a
remote migration, which gets proxied over a websocket connection.
terminating the proxied connection early makes the target VM crash for
obvious reasons.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2021-11-11 17:01:12 +01:00
Thomas Lamprecht
46b962f6b1 buildsys: change upload dist to bullseye
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-10-04 10:21:12 +02:00
Thomas Lamprecht
a545da70da bump version to 4.0-3
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-10-04 10:18:38 +02:00
Thomas Lamprecht
9a826d0ce9 d/control: wrap-and-sort -tkn
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-10-04 10:13:57 +02:00
Thomas Lamprecht
515633c801 d/control: break libpve-storage-perl (<< 7.0-11)
as only newer version cleanup temp files on their own.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-10-04 10:13:23 +02:00
Lorenz Stechauner
7fb356b79e anyevent: move unlink from http-server to endpoint
any uploaded file has to be deleted by the corrosponding
endpoint. the file upload was only used by the 'upload to
storage' feature in pve.

this change allows the endpoint to delete the file itself,
making the old and racey`sleep 1` (waiting until the worker
has opened the file) obsolete.

this change breaks all pve-manager versions, in which the
worker does not unlink the temp file itself.

Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com>
2021-10-04 10:00:23 +02:00
Fabian Grünbichler
28a4b9a424 bump version to 4.0-2
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2021-05-18 10:24:39 +02:00
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