fix: protect possible empty ipfsModule option#449
Merged
hugomrdias merged 1 commit intomasterfrom Jan 29, 2020
Merged
Conversation
With this change only when `type === go` the option can be an empty object.
achingbrain
reviewed
Jan 29, 2020
| this.overrides[options.type || this.opts.type], | ||
| this.overrides[type], | ||
| // conditionally include ipfs based on which type of daemon we will spawn when none has been specifed | ||
| (type === 'js' || type === 'proc') ? { |
Member
There was a problem hiding this comment.
What about when the user does:
factory.spawn({
type: 'js',
ipfsModule: {
path: require.resolve('some/other/path/to/ipfs'),
ref: require('some/other/path/to/ipfs'),
}
})I think with this change the ipfsModule option the user passes in will get ignored
Member
Author
There was a problem hiding this comment.
no, user options is the last arg and overrides everything above
Member
There was a problem hiding this comment.
Yeah, just thought of that :)
Member
There was a problem hiding this comment.
It still evaluates require('ipfs') which does not work when used in js-ipfs.
achingbrain
reviewed
Jan 29, 2020
| ) | ||
|
|
||
| // conditionally include ipfs based on which type of daemon we will spawn when none has been specifed | ||
| if ((opts.type === 'js' || opts.type === 'proc') && !opts.ipfsModule) { |
Member
There was a problem hiding this comment.
I was thinking this needed to be something more like:
if ((opts.type === 'js' || opts.type === 'proc') && !opts.ipfsModule) {
opts.ipfsModule = {}
}
if (opts.ipfsModule) {
if (!opts.ipfsModule.path) {
opts.ipfsModule.path = require.resolve('ipfs')
}
if (!opts.ipfsModule.ref) {
opts.ipfsModule.ref = require(opts.ipfsModule.path)
}
}
Member
Author
There was a problem hiding this comment.
with the current changes we don't need to protect it like that, its already safe
achingbrain
approved these changes
Jan 29, 2020
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
With this change only when
type === gothe option can be an empty object.