Skip to content

[FIX] Setting values being showed up in logs when using log level for debug #18239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sampaiodiego merged 3 commits into from
Oct 20, 2020
Merged

[FIX] Setting values being showed up in logs when using log level for debug #18239

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd6138c
[FIX] Setting values being showed up in logs when using log level for…
rodrigok Jul 10, 2020
758ce51
Merge branch 'develop' into settings-hide-on-logs
rodrigok Aug 24, 2020
07034a3
Merge branch 'develop' into settings-hide-on-logs
pierre-lehnen-rc Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions app/lib/server/lib/debug.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,19 @@ const traceConnection = (enable, filter, prefix, name, connection, userId) => {
}
};

const omitKeyArgs = (args) => args.map((arg) =>
(typeof arg !== 'object'
const omitKeyArgs = (args, name) => {
if (name === 'saveSettings') {
return [args[0].map((arg) => _.omit(arg, 'value'))];
}

if (name === 'saveSetting') {
return [args[0], args[2]];
}

return args.map((arg) => (typeof arg !== 'object'
? arg
: _.omit(arg, 'password', 'msg', 'pass', 'username', 'message')));
};

const wrapMethods = function(name, originalHandler, methodsMap) {
methodsMap[name] = function(...originalArgs) {
Expand All @@ -63,7 +72,7 @@ const wrapMethods = function(name, originalHandler, methodsMap) {
has_user: this.userId != null,
});
const args = name === 'ufsWrite' ? Array.prototype.slice.call(originalArgs, 1) : originalArgs;
logger.method(() => `${ name } -> userId: ${ Meteor.userId() }, arguments: ${ JSON.stringify(omitKeyArgs(args)) }`);
logger.method(() => `${ name } -> userId: ${ Meteor.userId() }, arguments: ${ JSON.stringify(omitKeyArgs(args, name)) }`);
const result = originalHandler.apply(this, originalArgs);
end();
return result;
Expand Down