Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow apps using the bridge to respond to powerbox requests & offers #3222

Merged
merged 18 commits into from
Feb 22, 2020
Merged

Allow apps using the bridge to respond to powerbox requests & offers #3222

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5411aba
Bridge: specify methods for info re: powerbox requests/offers.
zenhack Feb 14, 2020
e234257
Update docs to describe using non-http apis via the bridge.
zenhack Feb 14, 2020
9b11ed8
Add a little bit of info about offer sessions.
zenhack Feb 14, 2020
786e958
Include X-Sandstorm-Session-Type: normal in existing sessions.
zenhack Feb 15, 2020
9f76633
Fix some clerical errors
zenhack Feb 15, 2020
f4fee3d
BridgeContext: make the sessions map private.
zenhack Feb 16, 2020
9cde256
First pass at handling get{Request,Offer}Session.
zenhack Feb 17, 2020
37e787e
Bugfix: Don't double-increment the session id.
zenhack Feb 18, 2020
b6000e8
Tweak the way we allocate the results for getSessionOffer/Request.
zenhack Feb 18, 2020
ad25e75
Fix the segfault when fetching request/offer info.
zenhack Feb 19, 2020
0cec873
Reverse inverted comparison.
zenhack Feb 21, 2020
d6ce8c4
Use kj::str in a couple new places.
zenhack Feb 21, 2020
2af079e
More kj::str when inserting into maps.
zenhack Feb 21, 2020
47524a5
Fix some broken logic re: ownership of map keys.
zenhack Feb 21, 2020
719e6f9
Remove left over include from print debugging.
zenhack Feb 22, 2020
383963d
Fix build error due to merge.
zenhack Feb 22, 2020
d99cfa1
bridge: use one map for session info
zenhack Feb 22, 2020
66c7d7a
Get rid of redundant kj::Own reference.
zenhack Feb 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 52 additions & 81 deletions src/sandstorm/sandstorm-http-bridge.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,59 +1239,31 @@ public:
}
}

kj::Maybe<SessionContext::Client&> findSession(const kj::StringPtr& id) {
return findInMap(sessions, id);
}

kj::Maybe<SandstormHttpBridge::GetSessionOfferResults::Reader&> findOffer(const kj::StringPtr& id) {
KJ_IF_MAYBE(ret, findInMap(offers, id)) {
return ret->get();
kj::Maybe<SessionContext::Client&> findSessionContext(const kj::StringPtr& id) {
KJ_IF_MAYBE(record, findInMap(sessions, id)) {
return record->sessionCtx;
} else {
return nullptr;
}
}

kj::Maybe<SandstormHttpBridge::GetSessionRequestResults::Reader&> findRequest(const kj::StringPtr& id) {
KJ_IF_MAYBE(ret, findInMap(requests, id)) {
return ret->get();
kj::Maybe<kj::Own<SessionInfo::Reader>&> findSessionInfo(const kj::StringPtr& id) {
KJ_IF_MAYBE(record, findInMap(sessions, id)) {
return record->sessionInfo;
} else {
return nullptr;
}
}

void eraseSession(const kj::StringPtr& id) {
sessions.erase(id);
offers.erase(id);
requests.erase(id);
}

void insertSession(const kj::StringPtr& id, SessionContext::Client& session) {
sessions.insert({kj::StringPtr(id), session});
}

void insertRequest(
const kj::StringPtr& id,
capnp::List<PowerboxDescriptor>::Reader descriptor) {

auto msg = capnp::MallocMessageBuilder();
auto results = msg.initRoot<SandstormHttpBridge::GetSessionRequestResults>();
results.setRequestInfo(descriptor);

requests.insert({kj::StringPtr(id), capnp::clone(results.asReader())});
}

void insertOffer(
const kj::StringPtr& id,
capnp::Capability::Client&& offer,
PowerboxDescriptor::Reader descriptor) {

auto msg = capnp::MallocMessageBuilder();
auto results = msg.initRoot<SandstormHttpBridge::GetSessionOfferResults>();

results.setOffer(offer);
results.setDescriptor(descriptor);

offers.insert({kj::StringPtr(id), capnp::clone(results.asReader())});
void insertSession(const kj::StringPtr& id, SessionContext::Client& session, kj::Own<SessionInfo::Reader>& sessionInfo) {
sessions.insert({
kj::StringPtr(id),
SessionRecord {session, sessionInfo}
});
}

private:
Expand All @@ -1300,17 +1272,14 @@ private:
kj::AutoCloseFd identitiesDir;
kj::AutoCloseFd trashDir;

// These maps store information relating to active sessions. `sessions` always has an entry
// for any active session that is handled by the app. `requests` and `offers` will only
// have an entry for request and offer sessions, respectively.
//
// In all cases the keys are owned by the session object, which is responsible for deleting
// the session from these maps (via eraseSession) on cleanup. For `sessions`, the value
// is also owned by the session. For `requests` and `offers`, the value is owned by the map
// itself.
std::map<kj::StringPtr, SessionContext::Client&> sessions;
std::map<kj::StringPtr, kj::Own<SandstormHttpBridge::GetSessionRequestResults::Reader>> requests;
std::map<kj::StringPtr, kj::Own<SandstormHttpBridge::GetSessionOfferResults::Reader>> offers;
struct SessionRecord {
SessionRecord(const SessionRecord& other) = delete;
SessionRecord(SessionRecord&& other) = default;

SessionContext::Client& sessionCtx;
kj::Own<SessionInfo::Reader>& sessionInfo;
zenhack marked this conversation as resolved.
Show resolved Hide resolved
};
std::map<kj::StringPtr, SessionRecord> sessions;

struct IdentityRecord {
IdentityRecord(const IdentityRecord& other) = delete;
Expand Down Expand Up @@ -1444,32 +1413,15 @@ public:
rootPath(kj::mv(rootPath)),
remoteAddress(kj::mv(remoteAddress)),
apiInfo(kj::mv(apiInfo)),
sessionType(sessionInfo.which()) {
sessionInfo(capnp::clone(sessionInfo)) {
if (userInfo.hasIdentityId()) {
userId = textIdentityId(userInfo.getIdentityId());
}
if (this->sessionId != nullptr) {
bridgeContext.insertSession(kj::StringPtr(this->sessionId), this->sessionContext);
switch(sessionInfo.which()) {
case SessionInfo::NORMAL:
break;
case SessionInfo::REQUEST:
bridgeContext.insertRequest(
kj::StringPtr(this->sessionId),
sessionInfo.getRequest().getRequestInfo());
break;
case SessionInfo::OFFER:
{
auto offerInfo = sessionInfo.getOffer();
bridgeContext.insertOffer(
kj::StringPtr(this->sessionId),
offerInfo.getOffer(),
offerInfo.getDescriptor());
}
break;
default:
KJ_FAIL_ASSERT("Unknown session type.");
}
bridgeContext.insertSession(
kj::StringPtr(this->sessionId),
this->sessionContext,
this->sessionInfo);
}
}

Expand Down Expand Up @@ -1731,7 +1683,7 @@ private:
spk::BridgeConfig::Reader config;
kj::Maybe<kj::String> remoteAddress;
kj::Maybe<OwnCapnp<BridgeObjectId::HttpApi>> apiInfo;
SessionInfo::Which sessionType;
kj::Own<SessionInfo::Reader> sessionInfo;

kj::String makeHeaders(kj::StringPtr method, kj::StringPtr path,
WebSession::Context::Reader context,
Expand Down Expand Up @@ -1800,7 +1752,7 @@ private:
auto setHeader = [&](const char *value) {
lines.add(kj::str("X-Sandstorm-Session-Type: ", value));
};
switch(sessionType) {
switch(sessionInfo->which()) {
case SessionInfo::Which::NORMAL:
setHeader("normal");
break;
Expand Down Expand Up @@ -2359,7 +2311,7 @@ public:

kj::Promise<void> getSessionContext(GetSessionContextContext context) override {
auto id = context.getParams().getId();
KJ_IF_MAYBE(value, bridgeContext.findSession(id)) {
KJ_IF_MAYBE(value, bridgeContext.findSessionContext(id)) {
context.getResults().setContext(*value);
} else {
KJ_FAIL_ASSERT("Session ID not found", id);
Expand All @@ -2369,20 +2321,39 @@ public:

kj::Promise<void> getSessionOffer(GetSessionOfferContext context) override {
auto id = context.getParams().getId();
KJ_IF_MAYBE(value, bridgeContext.findOffer(id)) {
context.setResults(*value);
KJ_IF_MAYBE(sessionInfo, bridgeContext.findSessionInfo(id)) {
switch((*sessionInfo)->which()) {
case SessionInfo::OFFER:
{
auto offerInfo = (*sessionInfo)->getOffer();
auto results = context.initResults();
results.setOffer(offerInfo.getOffer());
results.setDescriptor(offerInfo.getDescriptor());
}
break;
default:
KJ_FAIL_ASSERT("Session ID ", id, " is not an offer session.");
}
} else {
KJ_FAIL_ASSERT("Session ID not found; maybe this isn't an offer session?");
KJ_FAIL_ASSERT("Session ID ", id, " not found");
}
return kj::READY_NOW;
}

kj::Promise<void> getSessionRequest(GetSessionRequestContext context) override {
auto id = context.getParams().getId();
KJ_IF_MAYBE(value, bridgeContext.findRequest(id)) {
context.setResults(*value);
KJ_IF_MAYBE(sessionInfo, bridgeContext.findSessionInfo(id)) {
switch((*sessionInfo)->which()) {
case SessionInfo::REQUEST:
context
.initResults()
.setRequestInfo((*sessionInfo)->getRequest().getRequestInfo());
break;
default:
KJ_FAIL_ASSERT("Session ID ", id, " is not a request session.");
}
} else {
KJ_FAIL_ASSERT("Session ID not found; maybe this isn't a request session?");
KJ_FAIL_ASSERT("Session ID ", id, " not found");
}
return kj::READY_NOW;
}
Expand Down