Compare commits

..

No commits in common. "3524ffb6effba91bd40ac26471b18553fc1d3ab1" and "cd28397223cfcced549f3ba9dd645f1715106e48" have entirely different histories.

View file

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