Skip to content
This repository was archived by the owner on Apr 6, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions config/user.example.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- username: foo
password: bar
- username: user
password: pass
4 changes: 4 additions & 0 deletions config/user.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- username: foo
password: bar
- username: user
password: pass
27 changes: 19 additions & 8 deletions lib/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -278,14 +278,10 @@ var config = convict({


var configFilename = __dirname + '/../config/' + config.get('application.config') + '.yml';
if (fs.existsSync(configFilename)) {
console.log('Using custom config', configFilename);
try {
var doc = yaml.safeLoad(fs.readFileSync(configFilename, 'utf8'));
config.load(doc);
} catch (e) {
console.error(e);
}
var appConfig = tryLoadYamlFile(configFilename);

if (appConfig) {
config.load(appConfig);
}

try {
Expand All @@ -296,4 +292,19 @@ try {
process.exit();
}

config.user = tryLoadYamlFile(__dirname + '/../config/user.yml')

module.exports = config;

function tryLoadYamlFile(configFilename) {
if (fs.existsSync(configFilename)) {
console.log('Using custom config', configFilename);
try {
return yaml.safeLoad(fs.readFileSync(configFilename, 'utf8'));
} catch (e) {
console.error(e);
}
}

return false;
}
1 change: 1 addition & 0 deletions lib/ffrk-proxy.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ function FFRKProxy(certStore) {
cert: certStore.defaultCaCert,
key: certStore.defaultCaKey,
whitelist: this.whitelist,
user: config.user || false,
});

this.proxy.use(this.middleware.bind(this));
Expand Down
99 changes: 99 additions & 0 deletions node_modules/thin/lib/auth.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 46 additions & 29 deletions node_modules/thin/lib/thin.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.