Commit 2ee45de

committed

Added audit log header

1 parent 0ac551b commit 2ee45deCopy full SHA for 2ee45de

File tree

+6263

-6118

lines changed

+6263

-6118

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ class AuditLog {`
`157`	`157`	`bool setFilePath1(const std::basic_string<char>& path);`
`158`	`158`	`bool setFilePath2(const std::basic_string<char>& path);`
`159`	`159`	`bool setStorageDir(const std::basic_string<char>& path);`
	`160`	`+ bool setHeader(const std::basic_string<char>& header);`
`160`	`161`	`bool setFormat(AuditLogFormat fmt);`
`161`	`162`
`162`	`163`	`int getDirectoryPermission() const;`
`@@ -185,6 +186,7 @@ class AuditLog {`
`185`	`186`	`std::string m_path1;`
`186`	`187`	`std::string m_path2;`
`187`	`188`	`std::string m_storage_dir;`
	`189`	`+ std::string m_header;`
`188`	`190`
`189`	`191`	`AuditLogFormat m_format;`
`190`	`192`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ class Transaction : public TransactionAnchoredVariables, public TransactionSecMa`
`411`	`411`	`int getRuleEngineState() const;`
`412`	`412`
`413`	`413`	`std::string toJSON(int parts);`
`414`		`- std::string toOldAuditLogFormat(int parts, const std::string &trailer);`
	`414`	`+ std::string toOldAuditLogFormat(int parts, const std::string &trailer, const std::string &header);`
`415`	`415`	`std::string toOldAuditLogFormatIndex(const std::string &filename,`
`416`	`416`	`double size, const std::string &md5);`
`417`	`417`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ AuditLog::AuditLog()`
`55`	`55`	`: m_path1(""),`
`56`	`56`	`m_path2(""),`
`57`	`57`	`m_storage_dir(""),`
	`58`	`+ m_header(""),`
`58`	`59`	`m_format(NotSetAuditLogFormat),`
`59`	`60`	`m_parts(-1),`
`60`	`61`	`m_filePermission(-1),`
`@@ -131,6 +132,13 @@ bool AuditLog::setFilePath2(const std::basic_string<char>& path) {`
`131`	`132`	`return true;`
`132`	`133`	`}`
`133`	`134`
	`135`	`+`
	`136`	`+bool AuditLog::setHeader(const std::basic_string<char>& header) {`
	`137`	`+ this->m_header = header;`
	`138`	`+ return true;`
	`139`	`+}`
	`140`	`+`
	`141`	`+`
`134`	`142`	`bool AuditLog::setFormat(AuditLogFormat fmt) {`
`135`	`143`	`this->m_format = fmt;`
`136`	`144`	`return true;`
`@@ -208,7 +216,6 @@ bool AuditLog::setType(AuditLogType audit_type) {`
`208`	`216`	`}`
`209`	`217`
`210`	`218`
`211`		`-`
`212`	`219`	`bool AuditLog::init(std::string *error) {`
`213`	`220`	`audit_log::writer::Writer *tmp_writer;`
`214`	`221`
`@@ -337,6 +344,7 @@ bool AuditLog::merge(AuditLog from, std::string error) {`
`337`	`344`	`AL_MERGE_STRING_CONF(from->m_path2, m_path2);`
`338`	`345`	`AL_MERGE_STRING_CONF(from->m_storage_dir, m_storage_dir);`
`339`	`346`	`AL_MERGE_STRING_CONF(from->m_relevant, m_relevant);`
	`347`	`+ AL_MERGE_STRING_CONF(from->m_header, m_header);`
`340`	`348`
`341`	`349`	`if (from->m_filePermission != -1) {`
`342`	`350`	`m_filePermission = from->m_filePermission;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ bool Parallel::write(Transaction transaction, int parts, std::string error) {`
`119`	`119`	`} else {`
`120`	`120`	`std::string boundary;`
`121`	`121`	`generateBoundary(&boundary);`
`122`		`- log = transaction->toOldAuditLogFormat(parts, "-" + boundary + "--");`
	`122`	`+ log = transaction->toOldAuditLogFormat(parts, "-" + boundary + "--", m_audit->m_header);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`const auto &logPath = m_audit->m_storage_dir;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ bool Serial::write(Transaction transaction, int parts, std::string error) {`
`42`	`42`	`} else {`
`43`	`43`	`std::string boundary;`
`44`	`44`	`generateBoundary(&boundary);`
`45`		`- msg = transaction->toOldAuditLogFormat(parts, "-" + boundary + "--");`
	`45`	`+ msg = transaction->toOldAuditLogFormat(parts, "-" + boundary + "--", m_audit->m_header);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`return utils::SharedFiles::getInstance().write(m_audit->m_path1, msg,`

Comments

(0)