Skip to content
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.

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

Update OOXML to accomodate more features #7

Merged
merged 14 commits into from
Jul 12, 2018
Merged

Update OOXML to accomodate more features #7

merged 14 commits into from
Jul 12, 2018

Conversation

NPDW
Copy link
Contributor

@NPDW NPDW commented Jul 4, 2018

Added the ability for OOXML to know if it was a successful decryption, outputting 0 if successful and 1 if not. Also added a command line argument to check for encryption on OOXML files, using the ouputs in a similar manner

NPDW added 3 commits July 4, 2018 10:12
Added the ability for OOXML to know if it was a successful decryption. Also added a command line argument to check for encryption on OOXML files
@NPDW NPDW closed this Jul 4, 2018
@NPDW NPDW reopened this Jul 4, 2018
@codecov-io
Copy link

codecov-io commented Jul 4, 2018

Codecov Report

Merging #7 into master will decrease coverage by 0.9%.
The diff coverage is 10.71%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master       #7      +/-   ##
==========================================
- Coverage   41.33%   40.42%   -0.91%     
==========================================
  Files           9        9              
  Lines         496      512      +16     
==========================================
+ Hits          205      207       +2     
- Misses        291      305      +14
Impacted Files Coverage Δ
msoffcrypto/format/doc97.py 35.91% <0%> (-0.2%) ⬇️
msoffcrypto/__main__.py 0% <0%> (ø) ⬆️
msoffcrypto/format/ooxml.py 41.59% <60%> (+0.3%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c131c1e...824409f. Read the comment docs.

@NPDW NPDW closed this Jul 4, 2018
@NPDW NPDW reopened this Jul 4, 2018
@nolze
Copy link
Owner

nolze commented Jul 5, 2018

Thanks! I totally agree we need a way to check if the file encrypted or not.

I added some commits to your PR:

  • In order to keep -e flag for encryption (which is to come), instead of -e, use -t for --test as in gzip command.
  • Make messages meaningful rather than 0 or 1, but keep these values for exit codes.
  • Print messages to stderr instead of stdout.
  • Return exit code 1 if the file is not enctypted, as this program expects encrypted files by deafult.
  • Implement less heuristic (I hope) method to test if OOXML file is successfully decrypted, using zipfile module.

Please tell me if anything needed is missing after my changes. I'll merge this if everything is OK.

@nolze nolze merged commit 3c52eab into nolze:master Jul 12, 2018
@nolze
Copy link
Owner

nolze commented Jul 12, 2018

Merged. Thanks again!

@nolze nolze removed the in progress label Jul 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants