Validate ssl related filepaths beforehand. #197
Merged
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
mfussenegger
reviewed
Jul 3, 2017
src/crate/crash/command.py
Outdated
| @@ -481,11 +481,22 @@ def main(): | |||
| sys.exit(cmd.exit_code) | |||
|
|
|||
| def _create_cmd(crate_hosts, error_trace, output_writer, is_tty, args): | |||
|
|
|||
| # Validate paths for certificate and key files | |||
| cert_file = args.cert_file | |||
There was a problem hiding this comment.
Did you consider using the type functionality of argparse?
E.g. something like this:
def file_with_permissions(f):
if not os.access(f, os.R_OK):
raise Exception("foo")
return f
parser = argparse.ArgumentParser()
parser.add_argument('--file', type=file_with_permissions, required=True)
try:
parser.parse_args()
except Exception as e:
print(str(e))
There was a problem hiding this comment.
no didn't know that :-) thx!
mfussenegger
reviewed
Jul 3, 2017
src/crate/crash/command.py
Outdated
| @@ -499,5 +503,10 @@ def _create_cmd(crate_hosts, error_trace, output_writer, is_tty, args): | |||
| ca_cert_file=args.ca_cert_file, | |||
| username=args.username) | |||
|
|
|||
| def file_with_permissions(path): | |||
| if not os.access(path, os.R_OK): | |||
| raise Exception('[' + path + '] does not exist or is not readable') | |||
There was a problem hiding this comment.
I think it would make sense to raise a exception that is a bit more specific here
There was a problem hiding this comment.
What kind of Exception? Should I create a new class like ValidationError or ParseError?
Codecov Report
@@ Coverage Diff @@
## master #197 +/- ##
==========================================
+ Coverage 82.09% 82.26% +0.16%
==========================================
Files 16 16
Lines 1910 1945 +35
==========================================
+ Hits 1568 1600 +32
- Misses 342 345 +3
Continue to review full report at Codecov.
|
mfussenegger
approved these changes
Jul 4, 2017
matriv
force-pushed
the
mt/validate-file-paths
branch
from
54cedbd
to
f9e1d7d
Compare
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.
No description provided.