test

skadefro · skadefro · commit 4d51d0871bbf · 2019-11-06T09:51:12.000+01:00
diff --git a/OpenFlow/src/LoginProvider.ts b/OpenFlow/src/LoginProvider.ts
@@ -67,7 +67,7 @@ export class samlauthstrategyoptions {
 }
 export class LoginProvider {
     private static _logger: winston.Logger;
-    private static _providers: any = {};
+    public static _providers: any = {};
     private static login_providers: Provider[] = [];
 
     public static redirect(res: any, originalUrl: string) {
@@ -153,6 +153,20 @@ export class LoginProvider {
         });
 
         app.get("/Signout", (req: any, res: any, next: any): void => {
+            var providerid: string = req.cookies.provider;
+            var provider: passport.Strategy;
+            if (providerid != null && providerid != undefined && providerid != "") {
+                provider = LoginProvider._providers[providerid];
+            }
+            if (provider != null && provider != undefined) {
+                (provider as any).logout(req, function (err, requestUrl) {
+                    // LOCAL logout
+                    req.logout();
+                    // redirect to the IdP with the encrypted SAML logout request
+                    res.redirect(requestUrl);
+                });
+                return;
+            }
             req.logout();
             var originalUrl: any = req.cookies.originalUrl;
             if (!Util.IsNullEmpty(originalUrl)) {
@@ -510,6 +524,7 @@ export class LoginProvider {
             passport.authenticate(key, { failureRedirect: "/" + key, failureFlash: true }),
             function (req: any, res: any): void {
                 var originalUrl: any = req.cookies.originalUrl;
+                res.cookie("provider", key, { maxAge: 900000, httpOnly: true });
                 if (!Util.IsNullEmpty(originalUrl)) {
                     res.cookie("originalUrl", "", { expires: new Date(0) });
                     LoginProvider.redirect(res, originalUrl);
diff --git a/OpenFlow/src/SamlProvider.ts b/OpenFlow/src/SamlProvider.ts
@@ -6,6 +6,7 @@ import * as samlp from "samlp";
 import { Config } from "./Config";
 import { TokenUser } from "./TokenUser";
 import { Audit } from "./Audit";
+import { LoginProvider } from "./LoginProvider";
 
 export class SamlProvider {
     private static _logger: winston.Logger;
@@ -62,7 +63,7 @@ export class SamlProvider {
         var cert: string = Buffer.from(Config.signing_crt, "base64").toString("ascii");
         var key: string = Buffer.from(Config.singing_key, "base64").toString("ascii");
 
-        var samlpoptions: any  = {
+        var samlpoptions: any = {
             issuer: Config.saml_issuer,
             cert: cert,
             key: key,
@@ -83,7 +84,7 @@ export class SamlProvider {
                 return req.user;
             },
             profileMapper: SamlProvider.profileMapper,
-            lifetimeInSeconds: (3600*24)
+            lifetimeInSeconds: (3600 * 24)
         };
 
         app.get("/issue/", (req: any, res: any, next: any): void => {
@@ -130,14 +131,28 @@ export class SamlProvider {
         // }));
 
         // TODO: FIX !!!!
-        app.get('/logout', (req: any, res: any, next: any): void => {
+        app.get('/logout', async (req: any, res: any, next: any) => {
             var referer: string = req.headers.referer;
             req.logout();
             if (referer !== null && referer !== undefined && referer !== "") {
+                // var providers = await LoginProvider.getProviders();
                 res.redirect(referer);
+                // var html = "<html><head></head><body>";
+                // providers.forEach(provider => {
+                //     if (provider.provider === "saml") {
+                //         html += "<iframe src='https://www.w3schools.com'></iframe>"
+                //     }
+                // });
+
+
+
+                // // https://sso.slagelse.dk/adfs/ls/?wa=wsignout1.0
+
+                // res.send(html)
             } else {
                 res.redirect("/");
             }
+
             // samlp.logout({
             //     issuer: Config.saml_issuer,
             //     protocolBinding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.361
+0.0.362
