Add GPG support for reading router.db #674
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
ytti
reviewed
Jan 24, 2017
| crypto = GPGME::Crypto.new :password => @cfg.gpg_password | ||
| file = crypto.decrypt(File.open(@cfg.file)).to_s | ||
| else | ||
| file = open(File.expand_path @cfg.file) |
There was a problem hiding this comment.
Perhaps
file = File.expand_path(@cfg.file)
file = if @cfg.gpg?
crypto = GPGME::Crypto.new password: @cfg.gpg_password
crypto.decrypt(file)
else
open(file)
end
ytti
reviewed
Jan 24, 2017
| ``` | ||
| source: | ||
| default: csv | ||
| csv: | ||
| file: ~/.config/oxidized/router.db | ||
| delimiter: !ruby/regexp /:/ | ||
| gpg: 'false' |
ytti
reviewed
Jan 24, 2017
| @@ -1,3 +1,3 @@ | |||
| source 'https://rubygems.org' | |||
|
|
|||
| gem 'gpgme' | |||
There was a problem hiding this comment.
We don't put requirements in Gemfile, they're in spec file. But I would not want to mandate installing gpgme. I would put it in CVS#setup as require 'gpgme' if @cfg.gpg, so that we only load it, if user is actually using it.
|
@ytti apologies :) hows that looking? |
ytti
reviewed
Jan 24, 2017
| @@ -10,15 +10,23 @@ def setup | |||
| Oxidized.asetus.user.source.csv.file = File.join(Config::Root, 'router.db') | |||
| Oxidized.asetus.user.source.csv.delimiter = /:/ | |||
| Oxidized.asetus.user.source.csv.map.name = 0 | |||
| Oxidized.asetus.user.source.csv.map.model = 1 | |||
There was a problem hiding this comment.
Is this line being removed intentionally? If so, can you try to elaborate why.
There was a problem hiding this comment.
Sorry! Back in again :)
|
Many 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.
Add support for GPG encryption for router.db, open for feedback!