evin/nodebb-plugin-sso-saml
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: evin:cd28397223cfcced549f3ba9dd645f1715106e48
Branches Tags
evin:master
...
compare: evin:3524ffb6effba91bd40ac26471b18553fc1d3ab1
Branches Tags
evin:master

3 commits
cd28397223 ... 3524ffb6ef

Author SHA1 Message Date
Christian Ulrich
3524ffb6ef initialize samlObj in getStrategy 2020-04-30 12:18:42 +02:00
Christian Ulrich
1d194ff2b2 Revert "fix checks for empty config options" 
This reverts commit ef6cdb11cd.
 2020-04-30 12:12:18 +02:00
Christian Ulrich
c590cab920 Revert "additional null checks" 
This reverts commit cd28397223.
 2020-04-30 12:12:06 +02:00
1 changed files with 25 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

60
library.js
View file

@ -38,14 +38,23 @@
params.router.get('/admin/plugins/sso-saml', params.middleware.admin.buildHeader, render);
params.router.get('/api/admin/plugins/sso-saml', render);
if (master_config.idp_entry_point != null &&
master_config.idp_entry_point !== "" &&
master_config.callback_path != null &&
master_config.callback_path !== "" &&
master_config.issuer != null &&
master_config.issuer !== "" &&
master_config.metadata != null &&
master_config.metadata !== "") {
console.log("[sso-saml] init done");
callback();
};
SAML.get_config = function(options, callback) {
meta.settings.get('sso_saml', function(err, settings) {
if (err) {
return callback(null, options);
}
master_config = settings;
options.sso_saml = settings;
callback(null, options);
});
},
SAML.initSaml = function() {
if (master_config.idp_entry_point && master_config.callback_path && master_config.issuer && master_config.metadata) {
console.log("creating samlObj");
samlObj = new passportSAML({
path: master_config.callback_path,
@ -82,13 +91,11 @@
);
}
console.log("[sso-saml] samlObj", samlObj);
if (samlObj){
if (master_config.metadata != null && master_config.metadata !== "") {
if (master_config.metadata) {
params.router.get(master_config.metadata, function(req, res) {
if (master_config.metadata != null && master_config.server_crt !== ""){
if (master_config.server_crt){
var cert = fs.readFileSync(master_config.server_crt, 'utf-8');
res.header("Content-Type", "application/xml");
res.send(samlObj.generateServiceProviderMetadata(cert))
@ -102,8 +109,7 @@
params.router.post(master_config.callback_path,
passport.authenticate('saml'),
function(req, res, next){
if (master_config.login_redirect_url != null &&
master_config.login_redirect_url !== ""){
if (master_config.login_redirect_url){
res.redirect(master_config.login_redirect_url);
}
else{
@ -114,8 +120,7 @@
);
if (master_config.logout_url != null &&
master_config.logout_url !== "") {
if (master_config.logout_url) {
params.router.get(master_config.logout_url,function(req,res){
if (req.user && parseInt(req.user.uid, 10) > 0) {
@ -126,8 +131,7 @@
req.logout();
if (master_config.logout_redirect_url != null &&
master_config.logout_redirect_url !== ""){
if (master_config.logout_redirect_url){
res.redirect(master_config.logout_redirect_url);
}
else{
@ -143,26 +147,12 @@
else {
console.log("[sso-saml] Cannot create samlObj");
}
console.log("[sso-saml] init done");
callback();
};
SAML.get_config = function(options, callback) {
meta.settings.get('sso_saml', function(err, settings) {
if (err) {
return callback(null, options);
}
master_config = settings;
options.sso_saml = settings;
callback(null, options);
});
},
}
SAML.getStrategy = function(strategies, callback) {
initSaml();
if (samlObj){
passport.use(samlObj);