Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1646 from G10h4ck/fixup_channels_api

Browse Source 
Avoid crash when subscribeToChannel is fed with invalid channel id
This commit is contained in:
csoler 2019-10-03 20:31:31 +02:00 committed by GitHub
commit b539ebe826
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libretroshare/src/gxs/rsdataservice.cc
View File

@ -1493,6 +1493,11 @@ int RsDataService::retrieveGxsGrpMetaData(RsGxsGrpMetaTemporaryMap& grp)
std::cerr << "RsDataService::retrieveGxsGrpMetaData() " << mDbName << ", Requests: " << requestedGroups << ", Results: " << resultCount << ", Time: " << timer.duration() << std::endl; std::cerr << "RsDataService::retrieveGxsGrpMetaData() " << mDbName << ", Requests: " << requestedGroups << ", Results: " << resultCount << ", Time: " << timer.duration() << std::endl;
#endif #endif
/* Remove not found entries as stated in the documentation */
for(auto i = grp.begin(); i != grp.end();)
if(!i->second) i = grp.erase(i);
else ++i;
return 1; return 1;
} }

8
libretroshare/src/gxs/rsgxsdataaccess.cc
View File

@ -1009,18 +1009,14 @@ bool RsGxsDataAccess::getGroupSummary(GroupMetaReq* req)
} }
bool RsGxsDataAccess::getGroupList(GroupIdReq* req) bool RsGxsDataAccess::getGroupList(GroupIdReq* req)
{ { return getGroupList(req->mGroupIds, req->Options, req->mGroupIdResult); }
getGroupList(req->mGroupIds, req->Options, req->mGroupIdResult);
return true;
}
bool RsGxsDataAccess::getGroupList(const std::list<RsGxsGroupId>& grpIdsIn, const RsTokReqOptions& opts, std::list<RsGxsGroupId>& grpIdsOut) bool RsGxsDataAccess::getGroupList(const std::list<RsGxsGroupId>& grpIdsIn, const RsTokReqOptions& opts, std::list<RsGxsGroupId>& grpIdsOut)
{ {
RsGxsGrpMetaTemporaryMap grpMeta; RsGxsGrpMetaTemporaryMap grpMeta;
for(auto lit = grpIdsIn.begin(); lit != grpIdsIn.end(); ++lit) for(auto lit = grpIdsIn.begin(); lit != grpIdsIn.end(); ++lit)
grpMeta[*lit] = NULL; grpMeta[*lit] = nullptr;
mDataStore->retrieveGxsGrpMetaData(grpMeta); mDataStore->retrieveGxsGrpMetaData(grpMeta);

3
libretroshare/src/retroshare/rsgxschannels.h
View File

@ -101,7 +101,6 @@ class RsGxsChannels: public RsGxsIfaceHelper, public RsGxsCommentService
{ {
public: public:
explicit RsGxsChannels(RsGxsIface& gxs) : RsGxsIfaceHelper(gxs) {} explicit RsGxsChannels(RsGxsIface& gxs) : RsGxsIfaceHelper(gxs) {}
virtual ~RsGxsChannels() {}
/** /**
* @brief Create channel. Blocking API. * @brief Create channel. Blocking API.
@ -544,4 +543,6 @@ public:
RS_DEPRECATED_FOR(turtleChannelRequest) RS_DEPRECATED_FOR(turtleChannelRequest)
virtual bool retrieveDistantGroup(const RsGxsGroupId& group_id,RsGxsChannelGroup& distant_group)=0; virtual bool retrieveDistantGroup(const RsGxsGroupId& group_id,RsGxsChannelGroup& distant_group)=0;
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
virtual ~RsGxsChannels();
}; };

4
libretroshare/src/services/p3gxschannels.cc
View File

@ -1015,7 +1015,7 @@ bool p3GxsChannels::getChannelsInfo(
opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA; opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
if( !requestGroupInfo(token, opts, chanIds) if( !requestGroupInfo(token, opts, chanIds)
|| waitToken(token) != RsTokenService::COMPLETE ) return false; || waitToken(token) != RsTokenService::COMPLETE ) return false;
return getGroupData(token, channelsInfo); return getGroupData(token, channelsInfo) && !channelsInfo.empty();
} }
bool p3GxsChannels::getContentSummaries( bool p3GxsChannels::getContentSummaries(
@ -2532,3 +2532,5 @@ void p3GxsChannels::cleanTimedOutCallbacks()
else ++cbpt; else ++cbpt;
} // RS_STACK_MUTEX(mDistantChannelsCallbacksMapMutex) } // RS_STACK_MUTEX(mDistantChannelsCallbacksMapMutex)
} }
RsGxsChannels::~RsGxsChannels() = default;

55
libretroshare/src/services/p3gxschannels.h
View File

@ -111,13 +111,13 @@ virtual bool getChannelDownloadDirectory(const RsGxsGroupId &groupId, std::strin
/// @see RsGxsChannels::turtleSearchRequest /// @see RsGxsChannels::turtleSearchRequest
virtual bool turtleSearchRequest(const std::string& matchString, virtual bool turtleSearchRequest(const std::string& matchString,
const std::function<void (const RsGxsGroupSummary&)>& multiCallback, const std::function<void (const RsGxsGroupSummary&)>& multiCallback,
rstime_t maxWait = 300 ); rstime_t maxWait = 300 ) override;
/// @see RsGxsChannels::turtleChannelRequest /// @see RsGxsChannels::turtleChannelRequest
virtual bool turtleChannelRequest( virtual bool turtleChannelRequest(
const RsGxsGroupId& channelId, const RsGxsGroupId& channelId,
const std::function<void (const RsGxsChannelGroup& result)>& multiCallback, const std::function<void (const RsGxsChannelGroup& result)>& multiCallback,
rstime_t maxWait = 300 ); rstime_t maxWait = 300 ) override;
/// @see RsGxsChannels::localSearchRequest /// @see RsGxsChannels::localSearchRequest
virtual bool localSearchRequest(const std::string& matchString, virtual bool localSearchRequest(const std::string& matchString,
@ -178,26 +178,26 @@ virtual bool ExtraFileRemove(const RsFileHash &hash);
/// Implementation of @see RsGxsChannels::getChannelsSummaries /// Implementation of @see RsGxsChannels::getChannelsSummaries
virtual bool getChannelsSummaries(std::list<RsGroupMetaData>& channels); bool getChannelsSummaries(std::list<RsGroupMetaData>& channels) override;
/// Implementation of @see RsGxsChannels::getChannelsInfo /// Implementation of @see RsGxsChannels::getChannelsInfo
virtual bool getChannelsInfo( bool getChannelsInfo(
const std::list<RsGxsGroupId>& chanIds, const std::list<RsGxsGroupId>& chanIds,
std::vector<RsGxsChannelGroup>& channelsInfo ); std::vector<RsGxsChannelGroup>& channelsInfo ) override;
/// Implementation of @see RsGxsChannels::getChannelContent /// Implementation of @see RsGxsChannels::getChannelContent
virtual bool getChannelContent( const RsGxsGroupId& channelId, bool getChannelContent( const RsGxsGroupId& channelId,
const std::set<RsGxsMessageId>& contentsIds, const std::set<RsGxsMessageId>& contentsIds,
std::vector<RsGxsChannelPost>& posts, std::vector<RsGxsChannelPost>& posts,
std::vector<RsGxsComment>& comments ); std::vector<RsGxsComment>& comments ) override;
/// Implementation of @see RsGxsChannels::getContentSummaries /// Implementation of @see RsGxsChannels::getContentSummaries
virtual bool getContentSummaries( bool getContentSummaries(
const RsGxsGroupId& channelId, const RsGxsGroupId& channelId,
std::vector<RsMsgMetaData>& summaries ) override; std::vector<RsMsgMetaData>& summaries ) override;
/// Implementation of @see RsGxsChannels::createChannelV2 /// Implementation of @see RsGxsChannels::createChannelV2
virtual bool createChannelV2( bool createChannelV2(
const std::string& name, const std::string& description, const std::string& name, const std::string& description,
const RsGxsImage& thumbnail = RsGxsImage(), const RsGxsImage& thumbnail = RsGxsImage(),
const RsGxsId& authorId = RsGxsId(), const RsGxsId& authorId = RsGxsId(),
@ -207,12 +207,8 @@ virtual bool ExtraFileRemove(const RsFileHash &hash);
std::string& errorMessage = RS_DEFAULT_STORAGE_PARAM(std::string) std::string& errorMessage = RS_DEFAULT_STORAGE_PARAM(std::string)
) override; ) override;
/// @deprecated Implementation of @see RsGxsChannels::createComment
RS_DEPRECATED_FOR(createCommentV2)
virtual bool createComment(RsGxsComment& comment) override;
/// Implementation of @see RsGxsChannels::createComment /// Implementation of @see RsGxsChannels::createComment
virtual bool createCommentV2( bool createCommentV2(
const RsGxsGroupId& channelId, const RsGxsGroupId& channelId,
const RsGxsMessageId& threadId, const RsGxsMessageId& threadId,
const std::string& comment, const std::string& comment,
@ -224,11 +220,7 @@ virtual bool ExtraFileRemove(const RsFileHash &hash);
) override; ) override;
/// Implementation of @see RsGxsChannels::editChannel /// Implementation of @see RsGxsChannels::editChannel
virtual bool editChannel(RsGxsChannelGroup& channel) override; bool editChannel(RsGxsChannelGroup& channel) override;
/// @deprecated Implementation of @see RsGxsChannels::createPost
RS_DEPRECATED_FOR(createPostV2)
virtual bool createPost(RsGxsChannelPost& post) override;
/// Implementation of @see RsGxsChannels::createPostV2 /// Implementation of @see RsGxsChannels::createPostV2
bool createPostV2( bool createPostV2(
@ -241,12 +233,8 @@ virtual bool ExtraFileRemove(const RsFileHash &hash);
std::string& errorMessage = RS_DEFAULT_STORAGE_PARAM(std::string) std::string& errorMessage = RS_DEFAULT_STORAGE_PARAM(std::string)
) override; ) override;
/// @deprecated Implementation of @see RsGxsChannels::createVote
RS_DEPRECATED_FOR(createVoteV2)
virtual bool createVote(RsGxsVote& vote) override;
/// Implementation of @see RsGxsChannels::createVoteV2 /// Implementation of @see RsGxsChannels::createVoteV2
virtual bool createVoteV2( bool createVoteV2(
const RsGxsGroupId& channelId, const RsGxsMessageId& postId, const RsGxsGroupId& channelId, const RsGxsMessageId& postId,
const RsGxsMessageId& commentId, const RsGxsId& authorId, const RsGxsMessageId& commentId, const RsGxsId& authorId,
RsGxsVoteType vote, RsGxsVoteType vote,
@ -255,8 +243,8 @@ virtual bool ExtraFileRemove(const RsFileHash &hash);
) override; ) override;
/// Implementation of @see RsGxsChannels::subscribeToChannel /// Implementation of @see RsGxsChannels::subscribeToChannel
virtual bool subscribeToChannel( const RsGxsGroupId &groupId, bool subscribeToChannel( const RsGxsGroupId &groupId,
bool subscribe ); bool subscribe ) override;
/// Implementation of @see RsGxsChannels::setPostRead /// Implementation of @see RsGxsChannels::setPostRead
virtual bool markRead(const RsGxsGrpMsgIdPair& msgId, bool read); virtual bool markRead(const RsGxsGrpMsgIdPair& msgId, bool read);
@ -266,7 +254,20 @@ virtual bool ExtraFileRemove(const RsFileHash &hash);
/// Implementation of @see RsGxsChannels::createChannel /// Implementation of @see RsGxsChannels::createChannel
RS_DEPRECATED_FOR(createChannelV2) RS_DEPRECATED_FOR(createChannelV2)
virtual bool createChannel(RsGxsChannelGroup& channel) override; bool createChannel(RsGxsChannelGroup& channel) override;
/// @deprecated Implementation of @see RsGxsChannels::createPost
RS_DEPRECATED_FOR(createPostV2)
bool createPost(RsGxsChannelPost& post) override;
/// @deprecated Implementation of @see RsGxsChannels::createComment
RS_DEPRECATED_FOR(createCommentV2)
bool createComment(RsGxsComment& comment) override;
/// @deprecated Implementation of @see RsGxsChannels::createVote
RS_DEPRECATED_FOR(createVoteV2)
bool createVote(RsGxsVote& vote) override;
protected: protected:
// Overloaded from GxsTokenQueue for Request callbacks. // Overloaded from GxsTokenQueue for Request callbacks.