yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 02:09:32 +02:00
Code Issues Releases Wiki Activity

Start auth-mock with stf local and make the log tag clearer.

Browse source
This commit is contained in:
Simo Kinnunen 2014-01-27 11:07:32 +09:00
parent 2b46ff41d3
commit e924b73394
3 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/cli.js
View file

@ -262,9 +262,17 @@ program
, 'device pull endpoint' , 'device pull endpoint'
, String , String
, 'tcp://127.0.0.1:7116') , 'tcp://127.0.0.1:7116')
.option('--auth-port <port>'
, 'auth port'
, Number
, 7120)
.option('--auth-secret <secret>'
, 'auth secret'
, String
, 'kute kittykat')
.action(function() { .action(function() {
var log = logger.createLogger('cli') var log = logger.createLogger('cli')
var options = cliutil.lastArg(arguments) , options = cliutil.lastArg(arguments)
// app triproxy // app triproxy
procutil.fork(__filename, [ procutil.fork(__filename, [
@ -317,6 +325,16 @@ program
.catch(function(err) { .catch(function(err) {
log.error('provider died', err.stack) log.error('provider died', err.stack)
}) })
// auth-mock
procutil.fork(__filename, [
'auth-mock'
, '--port', options.authPort
, '--secret', options.authSecret
])
.catch(function(err) {
log.error('auth-mock died', err.stack)
})
}) })
program.parse(process.argv) program.parse(process.argv)

4
lib/roles/auth/ldap.js
View file

@ -9,7 +9,7 @@ var ldaputil = require('../../util/ldaputil')
var jwtutil = require('../../util/jwtutil') var jwtutil = require('../../util/jwtutil')
module.exports = function(options) { module.exports = function(options) {
var log = logger.createLogger('app') var log = logger.createLogger('auth-ldap')
, app = express() , app = express()
app.use(express.cookieParser()) app.use(express.cookieParser())
@ -26,7 +26,7 @@ module.exports = function(options) {
}) })
app.post('/auth', function(req, res) { app.post('/auth', function(req, res) {
var log = logger.createLogger('auth') var log = logger.createLogger('auth-ldap')
log.setLocalIdentifier(req.ip) log.setLocalIdentifier(req.ip)
switch (req.accepts(['json'])) { switch (req.accepts(['json'])) {
case 'json': case 'json':

4
lib/roles/auth/mock.js
View file

@ -9,7 +9,7 @@ var jwtutil = require('../../util/jwtutil')
var pathutil = require('../../util/pathutil') var pathutil = require('../../util/pathutil')
module.exports = function(options) { module.exports = function(options) {
var log = logger.createLogger('app') var log = logger.createLogger('auth-mock')
, app = express() , app = express()
app.set('view engine', 'jade') app.set('view engine', 'jade')
@ -52,7 +52,7 @@ module.exports = function(options) {
}) })
app.post('/api/v1/auth', function(req, res) { app.post('/api/v1/auth', function(req, res) {
var log = logger.createLogger('auth') var log = logger.createLogger('auth-mock')
log.setLocalIdentifier(req.ip) log.setLocalIdentifier(req.ip)
switch (req.accepts(['json'])) { switch (req.accepts(['json'])) {
case 'json': case 'json':