frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename oauth auth scheme to strategy as it works for openid

This commit is contained in:
Nick O'Leary 2017-04-21 21:54:48 +01:00
parent fb05960d79
commit 72da7e6c54
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/js/user.js
View File

@ -109,7 +109,7 @@ RED.user = (function() {
event.preventDefault(); event.preventDefault();
}); });
} else if (data.type == "oauth") { } else if (data.type == "strategy") {
i = 0; i = 0;
for (;i<data.prompts.length;i++) { for (;i<data.prompts.length;i++) {
var field = data.prompts[i]; var field = data.prompts[i];

17
red/api/auth/index.js
View File

@ -86,10 +86,10 @@ function login(req,res) {
"type":"credentials", "type":"credentials",
"prompts":[{id:"username",type:"text",label:"Username"},{id:"password",type:"password",label:"Password"}] "prompts":[{id:"username",type:"text",label:"Username"},{id:"password",type:"password",label:"Password"}]
} }
} else if (settings.adminAuth.type === "oauth") { } else if (settings.adminAuth.type === "strategy") {
response = { response = {
"type":"oauth", "type":"strategy",
"prompts":[{type:"button",label:settings.adminAuth.strategy.label, url:"/auth/oauth"}] "prompts":[{type:"button",label:settings.adminAuth.strategy.label, url:"/auth/strategy"}]
} }
if (settings.adminAuth.strategy.icon) { if (settings.adminAuth.strategy.icon) {
response.prompts[0].icon = settings.adminAuth.strategy.icon; response.prompts[0].icon = settings.adminAuth.strategy.icon;
@ -120,6 +120,7 @@ function revoke(req,res) {
function completeVerify(profile,done) { function completeVerify(profile,done) {
Users.authenticate(profile).then(function(user) { Users.authenticate(profile).then(function(user) {
console.log(user);
if (user) { if (user) {
Tokens.create(user.username,"node-red-editor",user.permissions).then(function(tokens) { Tokens.create(user.username,"node-red-editor",user.permissions).then(function(tokens) {
log.audit({event: "auth.login",username:user.username,scope:user.permissions}); log.audit({event: "auth.login",username:user.username,scope:user.permissions});
@ -127,7 +128,7 @@ function completeVerify(profile,done) {
done(null,user); done(null,user);
}); });
} else { } else {
log.audit({event: "auth.login.fail.oauth",username:profile.id}); log.audit({event: "auth.login.fail.oauth",username:typeof profile === "string"?profile:profile.username});
done(null,false); done(null,false);
} }
}); });
@ -147,11 +148,11 @@ module.exports = {
}, },
login: login, login: login,
revoke: revoke, revoke: revoke,
oauthStrategy: function(adminApp,strategy) { genericStrategy: function(adminApp,strategy) {
var session = require('express-session'); var session = require('express-session');
var crypto = require("crypto"); var crypto = require("crypto");
adminApp.use(session({ adminApp.use(session({
// As the session is only used across the life-span of an oauth // As the session is only used across the life-span of an auth
// hand-shake, we can use a instance specific random string // hand-shake, we can use a instance specific random string
secret: crypto.randomBytes(20).toString('hex'), secret: crypto.randomBytes(20).toString('hex'),
resave: false, resave: false,
@ -184,8 +185,8 @@ module.exports = {
} }
)); ));
adminApp.get('/auth/oauth', passport.authenticate(strategy.name)); adminApp.get('/auth/strategy', passport.authenticate(strategy.name));
adminApp.get('/auth/oauth/callback', adminApp.get('/auth/strategy/callback',
passport.authenticate(strategy.name, {session:false, failureRedirect: '/' }), passport.authenticate(strategy.name, {session:false, failureRedirect: '/' }),
function(req, res) { function(req, res) {
var tokens = req.user.tokens; var tokens = req.user.tokens;

11
red/api/auth/users.js
View File

@ -24,15 +24,14 @@ var passwords = {};
var defaultUser = null; var defaultUser = null;
function authenticate() { function authenticate() {
var username; var username = arguments[0];
if (arguments.length === 2) { if (typeof username !== 'string') {
username = arguments[0]; username = username.username;
} else {
username = arguments[0].username;
} }
var user = users[username]; var user = users[username];
if (user) { if (user) {
if (arguments.length === 2) { if (arguments.length === 2) {
// Username/password authentication
var password = arguments[1]; var password = arguments[1];
return when.promise(function(resolve,reject) { return when.promise(function(resolve,reject) {
bcrypt.compare(password, passwords[username], function(err, res) { bcrypt.compare(password, passwords[username], function(err, res) {
@ -66,7 +65,7 @@ function init(config) {
users = {}; users = {};
passwords = {}; passwords = {};
defaultUser = null; defaultUser = null;
if (config.type == "credentials" || config.type == "oauth") { if (config.type == "credentials" || config.type == "strategy") {
if (config.users) { if (config.users) {
if (typeof config.users === "function") { if (typeof config.users === "function") {
api.get = config.users; api.get = config.users;

4
red/api/index.js
View File

@ -107,8 +107,8 @@ function init(_server,_runtime) {
adminApp.get("/auth/login",auth.login,errorHandler); adminApp.get("/auth/login",auth.login,errorHandler);
if (settings.adminAuth) { if (settings.adminAuth) {
if (settings.adminAuth.type === "oauth") { if (settings.adminAuth.type === "strategy") {
auth.oauthStrategy(adminApp,settings.adminAuth.strategy); auth.genericStrategy(adminApp,settings.adminAuth.strategy);
} else if (settings.adminAuth.type === "credentials") { } else if (settings.adminAuth.type === "credentials") {
adminApp.use(passport.initialize()); adminApp.use(passport.initialize());
adminApp.post("/auth/token", adminApp.post("/auth/token",