Use log helper #449
Merged
Use log helper #449
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I hope it is alright to log to stdout, I am uncertain what the result of our discussions on this topic was. Stdout is just easier because on stderr we would also have to worry about warnings (issued using |
christian-intra2net
force-pushed
the
use-log_helper
branch
from
da40b41
to
2d66e1f
Compare
|
Rebased onto current master |
christian-intra2net
force-pushed
the
use-log_helper
branch
2 times, most recently
from
424a68b
to
739cf8a
Compare
christian-intra2net
force-pushed
the
use-log_helper
branch
from
739cf8a
to
81f2569
Compare
|
Required a rebase after merging #365 |
christian-intra2net
force-pushed
the
use-log_helper
branch
from
81f2569
to
401ceb6
Compare
|
Rebased to keep up-to-date. Anything I can do to simplify review/merging? |
Need something like this for when modules are imported by other modules (no main in oletools is run, so no log_helper.enable_logging)
So glad we have the unittests, otherwise would never have found this
This is slightly more complicated since olevba has its own json-print functions that need to be made compatible with log_helper's json formatting
Make log_helper compatible with olevba which has its own print_json function and does not (yet?) use logging to create json.
Logging uses the default StreamHandler, which per default sends its output to sys.stderr. However, the surrounding '[', ']' are printed to stdout. Fix that.
This constant is needed for enable_logging() functions. It is the only reason for `import logging` in common-logging-enabled modules. Easier to provide it in log_helper
This is part of LoggerAdapter only since python 3.2
Do not need the last meta-information return code json output from olevba any more
Help debugging
Logging in mraptor is used for debugging olevba only
VBA stomping warning might occur here
On my test VM this reduces test time for this one test from 33s to 10s
christian-intra2net
force-pushed
the
use-log_helper
branch
from
401ceb6
to
b8ba847
Compare
|
Rebased onto current master |
decalage2
approved these changes
Mar 29, 2022
decalage2
added a commit
that referenced
this pull request
Mar 29, 2022
|
Thanks :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a much improved version over PR #447
Starting point is the "TODO: use log_helper" in crypto.py. This lead to using log_helper also in olevba which in turn meant making log_helper and olevba's own json-output compatible.
During work on this I realized that some logging output goes to stdout, some to stderr. Fixed that by making stdout the default for all log output.
As decalage noticed:
enable_loggingfunctions are required to allow logging output when importing oletools modules from other packages. Added/Updated these for olevba, crypto and record_base. Added a unittest to ensure this works.