LibreOffice/online
1
0
Fork 0
mirror of https://github.com/LibreOffice/online.git synced 2025-07-25 16:04:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

kit: parse anonymized tokens in doc options

Browse Source 
Also optimize the parsing in general.

Change-Id: Id1f5b5c12e867c98e523d1e32397853d7d4a6ee4
This commit is contained in:
Ashod Nakashian
2018-06-10 13:53:39 -04:00
parent 0264dba09e
commit f25575181c
2 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/Session.hpp
View File

@ -88,7 +88,8 @@ protected:
Session(const std::string& name, const std::string& id, bool readonly);
virtual ~Session();
/// Parses the options of the "load" command, shared between MasterProcessSession::loadDocument() and ChildProcessSession::loadDocument().
/// Parses the options of the "load" command,
/// shared between MasterProcessSession::loadDocument() and ChildProcessSession::loadDocument().
void parseDocOptions(const std::vector<std::string>& tokens, int& part, std::string& timestamp);
void updateLastActivityTime()
@ -137,6 +138,9 @@ protected:
/// The Jailed document path.
std::string _jailedFilePath;
/// The Jailed document path, anonymized for logging.
std::string _jailedFilePathAnonym;
/// Password provided, if any, to open the document
std::string _docPassword;
@ -149,12 +153,18 @@ protected:
/// Document options: a JSON string, containing options (rendering, also possibly load in the future).
std::string _docOptions;
/// Id of the user to whom the session belongs to
/// Id of the user to whom the session belongs to.
std::string _userId;
/// Name of the user to whom the session belongs to
/// Id of the user to whom the session belongs to, anonymized for logging.
std::string _userIdAnonym;
/// Name of the user to whom the session belongs to.
std::string _userName;
/// Name of the user to whom the session belongs to, anonymized for logging.
std::string _userNameAnonym;
/// Extra info per user, mostly mail, avatar, links, etc.
std::string _userExtraInfo;