mirror of
https://github.com/capnproto/pycapnp.git
synced 2025-03-04 16:35:04 +01:00
e614da1025
This patch fixes a problem of reading random values for reader options in pycapnp. The code which adds task to the list captures 'opts' by reference and that causes a problem in case when 'opts' is allocated on on the caller's stack. By the time when task is handled the stack frame holding the 'opts' is gone which leaves dangling reference to 'opts' in lambda's captures. As a result pycapnp reads random values for reader options which sometimes causes unexpected errors (for example an error that nesting level ius negative).
69 lines
2.9 KiB
C++
69 lines
2.9 KiB
C++
#pragma once
|
|
|
|
#include "capnp/dynamic.h"
|
|
#include <capnp/rpc.capnp.h>
|
|
#include "capnp/rpc-twoparty.h"
|
|
#include "Python.h"
|
|
#include "capabilityHelper.h"
|
|
|
|
capnp::Capability::Client bootstrapHelper(capnp::RpcSystem<capnp::rpc::twoparty::SturdyRefHostId>& client) {
|
|
capnp::MallocMessageBuilder hostIdMessage(8);
|
|
auto hostId = hostIdMessage.initRoot<capnp::rpc::twoparty::SturdyRefHostId>();
|
|
hostId.setSide(capnp::rpc::twoparty::Side::SERVER);
|
|
return client.bootstrap(hostId);
|
|
}
|
|
|
|
capnp::Capability::Client bootstrapHelperServer(capnp::RpcSystem<capnp::rpc::twoparty::SturdyRefHostId>& client) {
|
|
capnp::MallocMessageBuilder hostIdMessage(8);
|
|
auto hostId = hostIdMessage.initRoot<capnp::rpc::twoparty::SturdyRefHostId>();
|
|
hostId.setSide(capnp::rpc::twoparty::Side::CLIENT);
|
|
return client.bootstrap(hostId);
|
|
}
|
|
|
|
class ErrorHandler : public kj::TaskSet::ErrorHandler {
|
|
void taskFailed(kj::Exception&& exception) override {
|
|
kj::throwFatalException(kj::mv(exception));
|
|
}
|
|
};
|
|
|
|
struct ServerContext {
|
|
kj::Own<kj::AsyncIoStream> stream;
|
|
capnp::TwoPartyVatNetwork network;
|
|
capnp::RpcSystem<capnp::rpc::twoparty::SturdyRefHostId> rpcSystem;
|
|
|
|
ServerContext(kj::Own<kj::AsyncIoStream>&& stream, capnp::Capability::Client client, capnp::ReaderOptions & opts)
|
|
: stream(kj::mv(stream)),
|
|
network(*this->stream, capnp::rpc::twoparty::Side::SERVER, opts),
|
|
rpcSystem(makeRpcServer(network, client)) {}
|
|
};
|
|
|
|
void acceptLoop(kj::TaskSet & tasks, capnp::Capability::Client client, kj::Own<kj::ConnectionReceiver>&& listener, capnp::ReaderOptions & opts) {
|
|
auto ptr = listener.get();
|
|
tasks.add(ptr->accept().then(kj::mvCapture(kj::mv(listener),
|
|
[&, client, opts](kj::Own<kj::ConnectionReceiver>&& listener,
|
|
kj::Own<kj::AsyncIoStream>&& connection) mutable {
|
|
acceptLoop(tasks, client, kj::mv(listener), opts);
|
|
|
|
auto server = kj::heap<ServerContext>(kj::mv(connection), client, opts);
|
|
|
|
// Arrange to destroy the server context when all references are gone, or when the
|
|
// EzRpcServer is destroyed (which will destroy the TaskSet).
|
|
tasks.add(server->network.onDisconnect().attach(kj::mv(server)));
|
|
})));
|
|
}
|
|
|
|
kj::Promise<PyObject *> connectServer(kj::TaskSet & tasks, capnp::Capability::Client client, kj::AsyncIoContext * context, kj::StringPtr bindAddress, capnp::ReaderOptions & opts) {
|
|
auto paf = kj::newPromiseAndFulfiller<unsigned int>();
|
|
auto portPromise = paf.promise.fork();
|
|
|
|
tasks.add(context->provider->getNetwork().parseAddress(bindAddress)
|
|
.then(kj::mvCapture(paf.fulfiller,
|
|
[&, client, opts](kj::Own<kj::PromiseFulfiller<unsigned int>>&& portFulfiller,
|
|
kj::Own<kj::NetworkAddress>&& addr) mutable {
|
|
auto listener = addr->listen();
|
|
portFulfiller->fulfill(listener->getPort());
|
|
acceptLoop(tasks, client, kj::mv(listener), opts);
|
|
})));
|
|
|
|
return portPromise.addBranch().then([&](unsigned int port) { return PyLong_FromUnsignedLong(port); });
|
|
}
|