strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wsd: handle WOPI access failure

Browse source 
Show the user that authorization failed.

Change-Id: Iad63c11ac2033eee80062ecd43dff76f776924c3
Reviewed-on: https://gerrit.libreoffice.org/37610
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Ashod Nakashian 2017-05-14 22:58:02 -04:00 committed by Ashod Nakashian
parent 484fcd63a5
commit 6e63c80763
3 changed files with 94 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
wsd/Exceptions.hpp
View file

@ -58,6 +58,21 @@ public:
using LoolException::LoolException;
};
/// An access-denied exception that is meant to signify
/// a storage authentication error.
class AccessDeniedException : public LoolException
{
public:
using LoolException::LoolException;
};
/// A service-unavailable exception that is meant to signify
/// an internal error.
class ServiceUnavailableException : public LoolException
{
public:
using LoolException::LoolException;
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

131
wsd/LOOLWSD.cpp
View file

@ -2049,79 +2049,102 @@ private:
// First Upgrade.
WebSocketHandler ws(_socket, request);
if (LOOLWSD::NumConnections >= MAX_CONNECTIONS)
// Response to clients beyond this point is done via WebSocket.
try
{
LOG_ERR("Limit on maximum number of connections of " << MAX_CONNECTIONS << " reached.");
shutdownLimitReached(ws);
return;
}
LOG_INF("Starting GET request handler for session [" << _id << "] on url [" << url << "].");
// Indicate to the client that document broker is searching.
const std::string status("statusindicator: find");
LOG_TRC("Sending to Client [" << status << "].");
ws.sendMessage(status);
const auto uriPublic = DocumentBroker::sanitizeURI(url);
const auto docKey = DocumentBroker::getDocKey(uriPublic);
LOG_INF("Sanitized URI [" << url << "] to [" << uriPublic.toString() <<
"] and mapped to docKey [" << docKey << "] for session [" << _id << "].");
// Check if readonly session is required
bool isReadOnly = false;
for (const auto& param : uriPublic.getQueryParameters())
{
LOG_DBG("Query param: " << param.first << ", value: " << param.second);
if (param.first == "permission" && param.second == "readonly")
if (LOOLWSD::NumConnections >= MAX_CONNECTIONS)
{
isReadOnly = true;
LOG_ERR("Limit on maximum number of connections of " << MAX_CONNECTIONS << " reached.");
shutdownLimitReached(ws);
return;
}
}
LOG_INF("URL [" << url << "] is " << (isReadOnly ? "readonly" : "writable") << ".");
LOG_INF("Starting GET request handler for session [" << _id << "] on url [" << url << "].");
// Request a kit process for this doc.
auto docBroker = findOrCreateDocBroker(ws, url, docKey, _id, uriPublic);
if (docBroker)
{
auto clientSession = createNewClientSession(&ws, _id, uriPublic, docBroker, isReadOnly);
if (clientSession)
// Indicate to the client that document broker is searching.
const std::string status("statusindicator: find");
LOG_TRC("Sending to Client [" << status << "].");
ws.sendMessage(status);
const auto uriPublic = DocumentBroker::sanitizeURI(url);
const auto docKey = DocumentBroker::getDocKey(uriPublic);
LOG_INF("Sanitized URI [" << url << "] to [" << uriPublic.toString() <<
"] and mapped to docKey [" << docKey << "] for session [" << _id << "].");
// Check if readonly session is required
bool isReadOnly = false;
for (const auto& param : uriPublic.getQueryParameters())
{
// Transfer the client socket to the DocumentBroker when we get back to the poll:
disposition.setMove([docBroker, clientSession]
(const std::shared_ptr<Socket> &moveSocket)
LOG_DBG("Query param: " << param.first << ", value: " << param.second);
if (param.first == "permission" && param.second == "readonly")
{
// Make sure the thread is running before adding callback.
docBroker->startThread();
isReadOnly = true;
}
}
// We no longer own this socket.
moveSocket->setThreadOwner(std::thread::id(0));
LOG_INF("URL [" << url << "] is " << (isReadOnly ? "readonly" : "writable") << ".");
docBroker->addCallback([docBroker, moveSocket, clientSession]()
// Request a kit process for this doc.
auto docBroker = findOrCreateDocBroker(ws, url, docKey, _id, uriPublic);
if (docBroker)
{
auto clientSession = createNewClientSession(&ws, _id, uriPublic, docBroker, isReadOnly);
if (clientSession)
{
// Transfer the client socket to the DocumentBroker when we get back to the poll:
disposition.setMove([docBroker, clientSession]
(const std::shared_ptr<Socket> &moveSocket)
{
auto streamSocket = std::static_pointer_cast<StreamSocket>(moveSocket);
// Make sure the thread is running before adding callback.
docBroker->startThread();
// Set the ClientSession to handle Socket events.
streamSocket->setHandler(clientSession);
LOG_DBG("Socket #" << moveSocket->getFD() << " handler is " << clientSession->getName());
// We no longer own this socket.
moveSocket->setThreadOwner(std::thread::id(0));
// Move the socket into DocBroker.
docBroker->addSocketToPoll(moveSocket);
docBroker->addCallback([docBroker, moveSocket, clientSession]()
{
try
{
auto streamSocket = std::static_pointer_cast<StreamSocket>(moveSocket);
// Add and load the session.
docBroker->addSession(clientSession);
// Set the ClientSession to handle Socket events.
streamSocket->setHandler(clientSession);
LOG_DBG("Socket #" << moveSocket->getFD() << " handler is " << clientSession->getName());
// Move the socket into DocBroker.
docBroker->addSocketToPoll(moveSocket);
// Add and load the session.
docBroker->addSession(clientSession);
}
catch (const std::exception& exc)
{
LOG_ERR("Error while handling loading : " << exc.what());
const std::string msg = "error: cmd=internal kind=unauthorized";
clientSession->sendMessage(msg);
docBroker->stop();
}
});
});
});
}
else
{
LOG_WRN("Failed to create Client Session with id [" << _id << "] on docKey [" << docKey << "].");
cleanupDocBrokers();
}
}
else
{
LOG_WRN("Failed to create Client Session with id [" << _id << "] on docKey [" << docKey << "].");
cleanupDocBrokers();
throw ServiceUnavailableException("Failed to create DocBroker with docKey [" + docKey + "].");
}
}
else
LOG_WRN("Failed to create DocBroker with docKey [" << docKey << "].");
catch (const std::exception& exc)
{
LOG_ERR("Error while handling Client WS Request: " << exc.what());
const std::string msg = "error: cmd=internal kind=load";
ws.sendMessage(msg);
ws.shutdown(WebSocketHandler::StatusCodes::ENDPOINT_GOING_AWAY, msg);
}
}
private:

3
wsd/Storage.cpp
View file

@ -493,7 +493,8 @@ std::unique_ptr<WopiStorage::WOPIFileInfo> WopiStorage::getWOPIFileInfo(const st
}
else
{
LOG_ERR("WOPI::CheckFileInfo is missing JSON payload");
LOG_ERR("WOPI::CheckFileInfo failed and no JSON payload returned. Access denied.");
throw UnauthorizedRequestException("Access denied.");
}
Poco::Timestamp modifiedTime = Poco::Timestamp::fromEpochTime(0);