ImageDecoder: Add a new service for out-of-process image decoding :^)

The new ImageDecoder service (available for members of "image" via
/tmp/portal/image) allows you to decode images in a separate process.

This will allow programs to confidently load untrusted images, since
the bulk of the security concerns are sandboxed to a separate process.

The only API right now is a synchronous IPC DecodeImage() call that
takes a shbuf with encoded image data and returns a shared buffer and
metadata for the decoded image.

It also comes with a very simple library for interfacing with the
ImageDecoder service: LibImageDecoderClient. The name is a bit of a
mouthful but I guess we can rename it later if we think of something
nicer to call it.

There's obviously a bit of overhead to spawning a separate process
for every image decode, so this is mostly only appropriate for
untrusted images (e.g stuff downloaded from the web) and not necessary
for trusted local images (e.g stuff in /res)
This commit is contained in:
Andreas Kling 2020-06-22 21:35:22 +02:00
parent b191f24f05
commit e3782a7f99
Notes: sideshowbarker 2024-07-19 05:26:35 +09:00
17 changed files with 491 additions and 19 deletions

View file

@ -16,6 +16,15 @@ BootModes=graphical
MultiInstance=1 MultiInstance=1
AcceptSocketConnections=1 AcceptSocketConnections=1
[ImageDecoder]
Socket=/tmp/portal/image
SocketPermissions=660
Lazy=1
User=image
BootModes=graphical
MultiInstance=1
AcceptSocketConnections=1
[LookupServer] [LookupServer]
Socket=/tmp/portal/lookup Socket=/tmp/portal/lookup
SocketPermissions=660 SocketPermissions=660

View file

@ -9,4 +9,5 @@ notify:x:12:anon
window:x:13:anon,notify window:x:13:anon,notify
clipboard:x:14:anon,notify clipboard:x:14:anon,notify
webcontent:x:15:anon webcontent:x:15:anon
image:x:16:anon,webcontent
users:x:100:anon users:x:100:anon

View file

@ -5,5 +5,6 @@ notify:x:12:12:NotificationServer,,,:/:/bin/false
window:x:13:13:WindowServer,,,:/:/bin/false window:x:13:13:WindowServer,,,:/:/bin/false
clipboard:x:14:14:Clipboard,,,:/:/bin/false clipboard:x:14:14:Clipboard,,,:/:/bin/false
webcontent:x:15:15:WebContent,,,:/:/bin/false webcontent:x:15:15:WebContent,,,:/:/bin/false
image:x:16:16:ImageDecoder,,,:/:/bin/false
anon:x:100:100:Anonymous,,,:/home/anon:/bin/sh anon:x:100:100:Anonymous,,,:/home/anon:/bin/sh
nona:x:200:200:Nona,,,:/home/nona:/bin/sh nona:x:200:200:Nona,,,:/home/nona:/bin/sh

View file

@ -9,6 +9,7 @@ add_subdirectory(LibGfx)
add_subdirectory(LibGUI) add_subdirectory(LibGUI)
add_subdirectory(LibHTTP) add_subdirectory(LibHTTP)
add_subdirectory(LibIPC) add_subdirectory(LibIPC)
add_subdirectory(LibImageDecoderClient)
add_subdirectory(LibJS) add_subdirectory(LibJS)
add_subdirectory(LibKeyboard) add_subdirectory(LibKeyboard)
add_subdirectory(LibLine) add_subdirectory(LibLine)

View file

@ -28,13 +28,13 @@
#include <AK/Memory.h> #include <AK/Memory.h>
#include <AK/SharedBuffer.h> #include <AK/SharedBuffer.h>
#include <AK/String.h> #include <AK/String.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/BMPLoader.h> #include <LibGfx/BMPLoader.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/GIFLoader.h> #include <LibGfx/GIFLoader.h>
#include <LibGfx/ICOLoader.h>
#include <LibGfx/PBMLoader.h> #include <LibGfx/PBMLoader.h>
#include <LibGfx/PNGLoader.h> #include <LibGfx/PNGLoader.h>
#include <LibGfx/PPMLoader.h> #include <LibGfx/PPMLoader.h>
#include <LibGfx/ICOLoader.h>
#include <LibGfx/ShareableBitmap.h> #include <LibGfx/ShareableBitmap.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
@ -71,7 +71,7 @@ Bitmap::Bitmap(BitmapFormat format, const IntSize& size, Purgeable purgeable)
{ {
ASSERT(!m_size.is_empty()); ASSERT(!m_size.is_empty());
ASSERT(!size_would_overflow(format, size)); ASSERT(!size_would_overflow(format, size));
allocate_palette_from_format(format); allocate_palette_from_format(format, {});
int map_flags = purgeable == Purgeable::Yes ? (MAP_PURGEABLE | MAP_PRIVATE) : (MAP_ANONYMOUS | MAP_PRIVATE); int map_flags = purgeable == Purgeable::Yes ? (MAP_PURGEABLE | MAP_PRIVATE) : (MAP_ANONYMOUS | MAP_PRIVATE);
m_data = (RGBA32*)mmap_with_name(nullptr, size_in_bytes(), PROT_READ | PROT_WRITE, map_flags, 0, 0, String::format("GraphicsBitmap [%dx%d]", width(), height()).characters()); m_data = (RGBA32*)mmap_with_name(nullptr, size_in_bytes(), PROT_READ | PROT_WRITE, map_flags, 0, 0, String::format("GraphicsBitmap [%dx%d]", width(), height()).characters());
ASSERT(m_data && m_data != (void*)-1); ASSERT(m_data && m_data != (void*)-1);
@ -103,25 +103,35 @@ Bitmap::Bitmap(BitmapFormat format, const IntSize& size, size_t pitch, RGBA32* d
, m_format(format) , m_format(format)
{ {
ASSERT(!size_would_overflow(format, size)); ASSERT(!size_would_overflow(format, size));
allocate_palette_from_format(format); allocate_palette_from_format(format, {});
} }
RefPtr<Bitmap> Bitmap::create_with_shared_buffer(BitmapFormat format, NonnullRefPtr<SharedBuffer>&& shared_buffer, const IntSize& size) RefPtr<Bitmap> Bitmap::create_with_shared_buffer(BitmapFormat format, NonnullRefPtr<SharedBuffer>&& shared_buffer, const IntSize& size)
{ {
if (size_would_overflow(format, size)) if (size_would_overflow(format, size))
return nullptr; return nullptr;
return adopt(*new Bitmap(format, move(shared_buffer), size)); return adopt(*new Bitmap(format, move(shared_buffer), size, {}));
} }
Bitmap::Bitmap(BitmapFormat format, NonnullRefPtr<SharedBuffer>&& shared_buffer, const IntSize& size) RefPtr<Bitmap> Bitmap::create_with_shared_buffer(BitmapFormat format, NonnullRefPtr<SharedBuffer>&& shared_buffer, const IntSize& size, const Vector<RGBA32>& palette)
{
if (size_would_overflow(format, size))
return nullptr;
return adopt(*new Bitmap(format, move(shared_buffer), size, palette));
}
Bitmap::Bitmap(BitmapFormat format, NonnullRefPtr<SharedBuffer>&& shared_buffer, const IntSize& size, const Vector<RGBA32>& palette)
: m_size(size) : m_size(size)
, m_data((RGBA32*)shared_buffer->data()) , m_data((RGBA32*)shared_buffer->data())
, m_pitch(round_up_to_power_of_two(size.width() * sizeof(RGBA32), 16)) , m_pitch(round_up_to_power_of_two(size.width() * sizeof(RGBA32), 16))
, m_format(format) , m_format(format)
, m_shared_buffer(move(shared_buffer)) , m_shared_buffer(move(shared_buffer))
{ {
ASSERT(!is_indexed(format)); ASSERT(!is_indexed() || !palette.is_empty());
ASSERT(!size_would_overflow(format, size)); ASSERT(!size_would_overflow(format, size));
if (is_indexed(m_format))
allocate_palette_from_format(m_format, palette);
} }
RefPtr<Gfx::Bitmap> Bitmap::rotated(Gfx::RotationDirection rotation_direction) const RefPtr<Gfx::Bitmap> Bitmap::rotated(Gfx::RotationDirection rotation_direction) const
@ -175,7 +185,7 @@ RefPtr<Bitmap> Bitmap::to_bitmap_backed_by_shared_buffer() const
if (m_shared_buffer) if (m_shared_buffer)
return *this; return *this;
auto buffer = SharedBuffer::create_with_size(size_in_bytes()); auto buffer = SharedBuffer::create_with_size(size_in_bytes());
auto bitmap = Bitmap::create_with_shared_buffer(m_format, *buffer, m_size); auto bitmap = Bitmap::create_with_shared_buffer(m_format, *buffer, m_size, palette_to_vector());
if (!bitmap) if (!bitmap)
return nullptr; return nullptr;
memcpy(buffer->data(), scanline(0), size_in_bytes()); memcpy(buffer->data(), scanline(0), size_in_bytes());
@ -249,17 +259,26 @@ ShareableBitmap Bitmap::to_shareable_bitmap(pid_t peer_pid) const
return ShareableBitmap(*bitmap); return ShareableBitmap(*bitmap);
} }
void Bitmap::allocate_palette_from_format(BitmapFormat format) void Bitmap::allocate_palette_from_format(BitmapFormat format, const Vector<RGBA32>& source_palette)
{ {
if (format == BitmapFormat::Indexed1) { size_t size = palette_size(format);
m_palette = new RGBA32[2]; if (size == 0)
} else if (format == BitmapFormat::Indexed2) { return;
m_palette = new RGBA32[4]; m_palette = new RGBA32[size];
} else if (format == BitmapFormat::Indexed4) { if (!source_palette.is_empty()) {
m_palette = new RGBA32[16]; ASSERT(source_palette.size() == size);
} else if (format == BitmapFormat::Indexed8) { memcpy(m_palette, source_palette.data(), size * sizeof(RGBA32));
m_palette = new RGBA32[256];
} }
} }
Vector<RGBA32> Bitmap::palette_to_vector() const
{
Vector<RGBA32> vector;
auto size = palette_size(m_format);
vector.ensure_capacity(size);
for (size_t i = 0; i < size; ++i)
vector.unchecked_append(palette_color(i).value());
return vector;
}
} }

View file

@ -65,6 +65,7 @@ public:
static RefPtr<Bitmap> create_wrapper(BitmapFormat, const IntSize&, size_t pitch, RGBA32*); static RefPtr<Bitmap> create_wrapper(BitmapFormat, const IntSize&, size_t pitch, RGBA32*);
static RefPtr<Bitmap> load_from_file(const StringView& path); static RefPtr<Bitmap> load_from_file(const StringView& path);
static RefPtr<Bitmap> create_with_shared_buffer(BitmapFormat, NonnullRefPtr<SharedBuffer>&&, const IntSize&); static RefPtr<Bitmap> create_with_shared_buffer(BitmapFormat, NonnullRefPtr<SharedBuffer>&&, const IntSize&);
static RefPtr<Bitmap> create_with_shared_buffer(BitmapFormat, NonnullRefPtr<SharedBuffer>&&, const IntSize&, const Vector<RGBA32>& palette);
static bool is_path_a_supported_image_format(const StringView& path) static bool is_path_a_supported_image_format(const StringView& path)
{ {
#define __ENUMERATE_IMAGE_FORMAT(Name, Ext) \ #define __ENUMERATE_IMAGE_FORMAT(Name, Ext) \
@ -102,12 +103,35 @@ public:
SharedBuffer* shared_buffer() { return m_shared_buffer.ptr(); } SharedBuffer* shared_buffer() { return m_shared_buffer.ptr(); }
const SharedBuffer* shared_buffer() const { return m_shared_buffer.ptr(); } const SharedBuffer* shared_buffer() const { return m_shared_buffer.ptr(); }
ALWAYS_INLINE bool is_indexed() const
{
return is_indexed(m_format);
}
ALWAYS_INLINE static bool is_indexed(BitmapFormat format) ALWAYS_INLINE static bool is_indexed(BitmapFormat format)
{ {
return format == BitmapFormat::Indexed8 || format == BitmapFormat::Indexed4 return format == BitmapFormat::Indexed8 || format == BitmapFormat::Indexed4
|| format == BitmapFormat::Indexed2 || format == BitmapFormat::Indexed1; || format == BitmapFormat::Indexed2 || format == BitmapFormat::Indexed1;
} }
size_t palette_size(BitmapFormat format) const
{
switch (format) {
case BitmapFormat::Indexed1:
return 2;
case BitmapFormat::Indexed2:
return 4;
case BitmapFormat::Indexed4:
return 16;
case BitmapFormat::Indexed8:
return 256;
default:
return 0;
}
}
Vector<RGBA32> palette_to_vector() const;
static unsigned bpp_for_format(BitmapFormat format) static unsigned bpp_for_format(BitmapFormat format)
{ {
switch (format) { switch (format) {
@ -186,9 +210,9 @@ private:
Yes }; Yes };
Bitmap(BitmapFormat, const IntSize&, Purgeable); Bitmap(BitmapFormat, const IntSize&, Purgeable);
Bitmap(BitmapFormat, const IntSize&, size_t pitch, RGBA32*); Bitmap(BitmapFormat, const IntSize&, size_t pitch, RGBA32*);
Bitmap(BitmapFormat, NonnullRefPtr<SharedBuffer>&&, const IntSize&); Bitmap(BitmapFormat, NonnullRefPtr<SharedBuffer>&&, const IntSize&, const Vector<RGBA32>& palette);
void allocate_palette_from_format(BitmapFormat); void allocate_palette_from_format(BitmapFormat, const Vector<RGBA32>& source_palette );
IntSize m_size; IntSize m_size;
RGBA32* m_data { nullptr }; RGBA32* m_data { nullptr };

View file

@ -0,0 +1,11 @@
set(SOURCES
Client.cpp
)
set(GENERATED_SOURCES
../../Services/ImageDecoder/ImageDecoderClientEndpoint.h
../../Services/ImageDecoder/ImageDecoderServerEndpoint.h
)
serenity_lib(LibImageDecoderClient imagedecoderclient)
target_link_libraries(LibImageDecoderClient LibIPC LibGfx)

View file

@ -0,0 +1,88 @@
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <AK/SharedBuffer.h>
#include <LibImageDecoderClient/Client.h>
namespace ImageDecoderClient {
Client::Client()
: IPC::ServerConnection<ImageDecoderClientEndpoint, ImageDecoderServerEndpoint>(*this, "/tmp/portal/image")
{
handshake();
}
void Client::handshake()
{
auto response = send_sync<Messages::ImageDecoderServer::Greet>(getpid());
set_my_client_id(response->client_id());
set_server_pid(response->server_pid());
}
void Client::handle(const Messages::ImageDecoderClient::Dummy&)
{
}
RefPtr<Gfx::Bitmap> Client::decode_image(const ByteBuffer& encoded_data)
{
if (encoded_data.is_empty())
return nullptr;
auto encoded_buffer = SharedBuffer::create_with_size(encoded_data.size());
if (!encoded_buffer) {
dbg() << "Could not allocate encoded shbuf";
return nullptr;
}
memcpy(encoded_buffer->data(), encoded_data.data(), encoded_data.size());
encoded_buffer->seal();
encoded_buffer->share_with(server_pid());
auto response = send_sync<Messages::ImageDecoderServer::DecodeImage>(encoded_buffer->shbuf_id(), encoded_data.size());
auto bitmap_format = (Gfx::BitmapFormat)response->bitmap_format();
if (bitmap_format == Gfx::BitmapFormat::Invalid) {
#ifdef IMAGE_DECODER_CLIENT_DEBUG
dbg() << "Response image was invalid";
#endif
return nullptr;
}
if (response->size().is_empty()) {
dbg() << "Response image was empty";
return nullptr;
}
auto decoded_buffer = SharedBuffer::create_from_shbuf_id(response->decoded_shbuf_id());
if (!decoded_buffer) {
dbg() << "Could not map decoded image shbuf_id=" << response->decoded_shbuf_id();
return nullptr;
}
return Gfx::Bitmap::create_with_shared_buffer(bitmap_format, decoded_buffer.release_nonnull(), response->size(), response->palette());
}
}

View file

@ -0,0 +1,52 @@
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once
#include <AK/HashMap.h>
#include <ImageDecoder/ImageDecoderClientEndpoint.h>
#include <ImageDecoder/ImageDecoderServerEndpoint.h>
#include <LibIPC/ServerConnection.h>
namespace ImageDecoderClient {
class Client
: public IPC::ServerConnection<ImageDecoderClientEndpoint, ImageDecoderServerEndpoint>
, public ImageDecoderClientEndpoint {
C_OBJECT(Client);
public:
virtual void handshake() override;
RefPtr<Gfx::Bitmap> decode_image(const ByteBuffer&);
private:
Client();
virtual void handle(const Messages::ImageDecoderClient::Dummy&) override;
};
}

View file

@ -1,6 +1,7 @@
add_subdirectory(AudioServer) add_subdirectory(AudioServer)
add_subdirectory(Clipboard) add_subdirectory(Clipboard)
add_subdirectory(DHCPClient) add_subdirectory(DHCPClient)
add_subdirectory(ImageDecoder)
add_subdirectory(LaunchServer) add_subdirectory(LaunchServer)
add_subdirectory(LookupServer) add_subdirectory(LookupServer)
add_subdirectory(NotificationServer) add_subdirectory(NotificationServer)

View file

@ -0,0 +1,12 @@
compile_ipc(ImageDecoderServer.ipc ImageDecoderServerEndpoint.h)
compile_ipc(ImageDecoderClient.ipc ImageDecoderClientEndpoint.h)
set(SOURCES
ClientConnection.cpp
main.cpp
ImageDecoderServerEndpoint.h
ImageDecoderClientEndpoint.h
)
serenity_bin(ImageDecoder)
target_link_libraries(ImageDecoder LibIPC LibGfx)

View file

@ -0,0 +1,102 @@
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <AK/Badge.h>
#include <AK/SharedBuffer.h>
#include <ImageDecoder/ClientConnection.h>
#include <ImageDecoder/ImageDecoderClientEndpoint.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/ImageDecoder.h>
#include <LibGfx/SystemTheme.h>
namespace ImageDecoder {
static HashMap<int, RefPtr<ClientConnection>> s_connections;
ClientConnection::ClientConnection(Core::LocalSocket& socket, int client_id)
: IPC::ClientConnection<ImageDecoderServerEndpoint>(*this, socket, client_id)
{
s_connections.set(client_id, *this);
}
ClientConnection::~ClientConnection()
{
}
void ClientConnection::die()
{
s_connections.remove(client_id());
exit(0);
}
OwnPtr<Messages::ImageDecoderServer::GreetResponse> ClientConnection::handle(const Messages::ImageDecoderServer::Greet& message)
{
set_client_pid(message.client_pid());
return make<Messages::ImageDecoderServer::GreetResponse>(client_id(), getpid());
}
OwnPtr<Messages::ImageDecoderServer::DecodeImageResponse> ClientConnection::handle(const Messages::ImageDecoderServer::DecodeImage& message)
{
auto encoded_buffer = SharedBuffer::create_from_shbuf_id(message.encoded_shbuf_id());
if (!encoded_buffer) {
#ifdef IMAGE_DECODER_DEBUG
dbg() << "Could not map encoded data buffer";
#endif
return nullptr;
}
if (message.encoded_size() > (size_t)encoded_buffer->size()) {
#ifdef IMAGE_DECODER_DEBUG
dbg() << "Encoded buffer is smaller than encoded size";
#endif
return nullptr;
}
#ifdef IMAGE_DECODER_DEBUG
dbg() << "Trying to decode " << message.encoded_size() << " bytes of image(?) data in shbuf_id=" << message.encoded_shbuf_id() << " (shbuf size: " << encoded_buffer->size() << ")";
#endif
auto decoder = Gfx::ImageDecoder::create((const u8*)encoded_buffer->data(), message.encoded_size());
auto bitmap = decoder->bitmap();
if (!bitmap) {
#ifdef IMAGE_DECODER_DEBUG
dbg() << "Could not decode image from encoded data";
#endif
return make<Messages::ImageDecoderServer::DecodeImageResponse>(-1, Gfx::IntSize(), (i32)Gfx::BitmapFormat::Invalid, Vector<u32>());
}
// FIXME: We should fix ShareableBitmap so you can send it in responses as well as requests..
m_shareable_bitmap = bitmap->to_bitmap_backed_by_shared_buffer();
m_shareable_bitmap->shared_buffer()->share_with(client_pid());
Vector<u32> palette;
if (m_shareable_bitmap->is_indexed()) {
palette = m_shareable_bitmap->palette_to_vector();
}
return make<Messages::ImageDecoderServer::DecodeImageResponse>(m_shareable_bitmap->shbuf_id(), m_shareable_bitmap->size(), (i32)m_shareable_bitmap->format(), palette);
}
}

View file

@ -0,0 +1,55 @@
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once
#include <AK/HashMap.h>
#include <ImageDecoder/Forward.h>
#include <ImageDecoder/ImageDecoderServerEndpoint.h>
#include <LibIPC/ClientConnection.h>
#include <LibWeb/Forward.h>
namespace ImageDecoder {
class ClientConnection final
: public IPC::ClientConnection<ImageDecoderServerEndpoint>
, public ImageDecoderServerEndpoint {
C_OBJECT(ClientConnection);
public:
explicit ClientConnection(Core::LocalSocket&, int client_id);
~ClientConnection() override;
virtual void die() override;
private:
virtual OwnPtr<Messages::ImageDecoderServer::GreetResponse> handle(const Messages::ImageDecoderServer::Greet&) override;
virtual OwnPtr<Messages::ImageDecoderServer::DecodeImageResponse> handle(const Messages::ImageDecoderServer::DecodeImage&) override;
RefPtr<Gfx::Bitmap> m_shareable_bitmap;
};
}

View file

@ -0,0 +1,34 @@
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once
namespace WebContent {
class ClientConnection;
class PageHost;
}

View file

@ -0,0 +1,4 @@
endpoint ImageDecoderClient = 7002
{
Dummy() =|
}

View file

@ -0,0 +1,7 @@
endpoint ImageDecoderServer = 7001
{
Greet(i32 client_pid) => (i32 client_id, i32 server_pid)
DecodeImage(i32 encoded_shbuf_id, u32 encoded_size) => (i32 decoded_shbuf_id, Gfx::IntSize size, i32 bitmap_format, Vector<u32> palette)
}

View file

@ -0,0 +1,51 @@
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <LibCore/EventLoop.h>
#include <LibCore/LocalServer.h>
#include <LibIPC/ClientConnection.h>
#include <ImageDecoder/ClientConnection.h>
int main(int, char**)
{
Core::EventLoop event_loop;
if (pledge("stdio shared_buffer unix", nullptr) < 0) {
perror("pledge");
return 1;
}
if (unveil(nullptr, nullptr) < 0) {
perror("unveil");
return 1;
}
auto socket = Core::LocalSocket::take_over_accepted_socket_from_system_server();
IPC::new_client_connection<ImageDecoder::ClientConnection>(*socket, 1);
if (pledge("stdio shared_buffer", nullptr) < 0) {
perror("pledge");
return 1;
}
return event_loop.exec();
}