-
Notifications
You must be signed in to change notification settings - Fork 5
Conversation
@@ -23,7 +23,7 @@ exports.createKey = function(root_dir, from_port, to_port, key_id, secret, cb) { | |||
/* istanbul ignore if */ | |||
if (err) return cb(err); | |||
|
|||
var keyfile = keystore_path + path.sep + key_id; | |||
var keyfile = path.join(keystore_path, key_id); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is one instance in the PR where "/var" + path.sep + "logs/"
concatenation is replaced by the platform-agostic path.join()
function.
@rb when you get a chance, please let me know if this looks good to merge. I'll squash the commits now. |
Yep, I'll try to take a closer look today. I'm not super particular about commit history, so no need to squash. |
- Fix process.env var name in readme. It's OAUTH_REVERSE_PROXY_CONFIG_DIR not ()_PATH. - Use path.join() - Bump version to 1.5.9 - Minor: indents and readme - Require config files to end in '.json' - Reject dot files in any keystore. - Config files can be xml, case insensitive - More "Getting Started" info in readme - Support relative paths in config vars - Let logger format error stacks itself. - Better support for relative path names. - Use snake_case for local var names. - Undo log format changes (using format strings again). - Add test resources for abnormal config filenames. - Add cases to test that ProxyManager does not load disallowed filenames - !fixup - More snake_case - Fix indents - Fix test should syntax
Already squashed everything, I don't even know if it's possible to undo a force push. Enjoy your aggressively clean commit history. |
fs.readdir(CONFIG_DIR, function(err, files) { | ||
/* istanbul ignore if */ | ||
if (err) return cb(err); | ||
|
||
// Require a '.json' or '.xml' file ending and reject dotfiles |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We only support json. Any reason to include xml config files?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, I don't remember what I was thinking. I'll fix this line. I'll also remove the TODO comment since it's done.
Looks great, thanks! |
1.5.9 published |
Please do not merge yet. I'm actively working on this PR, and opening it now so that Travis-CI + Coveralls checks everything correctly.UPDATE: I'm done. Looks ok?TODO: Version 1.5.9
path.sep
with use of.path.join()
orpath.resolve()
instead.