maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

local sync: added sanity checks for syncURL (BMC #712) 

Don't allow sync inside same context, too easy to configure incorrectly.
Also don't allow referencing a peer (leads to incorrect session dirs
in client and cannot override peer files).
This commit is contained in:
Patrick Ohly 2010-08-02 13:22:01 +02:00
parent eba8a74779
commit c2f57528a0
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/syncevo/LocalTransportAgent.cpp
View File

@ -46,7 +46,7 @@ LocalTransportAgent::LocalTransportAgent(SyncContext *server,
const std::string &clientContext,
void *loop) :
m_server(server),
m_clientContext(clientContext),
m_clientContext(SyncConfig::normalizeConfigString(clientContext)),
m_loop(static_cast<GMainLoop *>(loop)),
m_status(INACTIVE),
m_receiveBufferSize(0),
@ -62,6 +62,22 @@ void LocalTransportAgent::start()
{
int sockets[2];
// compare normalized context names to detect forbidden sync
// within the same context; they could be set up, but are more
// likely configuration mistakes
string peer, context;
SyncConfig::splitConfigString(m_clientContext, peer, context);
if (!peer.empty()) {
SE_THROW(StringPrintf("invalid local sync URL: '%s' references a peer config, should point to a context like @%s instead",
m_clientContext.c_str(),
context.c_str()));
}
SyncConfig::splitConfigString(m_server->getConfigName(),
peer, context);
if (m_clientContext == string("@") + context) {
SE_THROW(StringPrintf("invalid local sync inside context '%s', need second context with different databases", context.c_str()));
}
if (socketpair(AF_LOCAL,
SOCK_STREAM,
0, sockets)) {