1

Author: skadefro

Dockerfile

@@ -1,12 +1,23 @@
-FROM node:10.16.0-jessie
+FROM node:latest
 EXPOSE 80
 EXPOSE 5858
 WORKDIR /data
-# RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
-RUN apt update && apt install node-gyp -y
-run npm i x509
 COPY package*.json ./
 RUN npm install
 COPY dist ./
 
-ENTRYPOINT ["/usr/local/bin/node", "--inspect=0.0.0.0:5858", "index.js"]
+ENTRYPOINT ["/usr/local/bin/node", "--inspect=0.0.0.0:5858", "index.js"]
+
+
+# FROM node:10.16.0-jessie
+# EXPOSE 80
+# EXPOSE 5858
+# WORKDIR /data
+# # RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
+# RUN apt update && apt install node-gyp -y
+# run npm i x509
+# COPY package*.json ./
+# RUN npm install
+# COPY dist ./
+
+# ENTRYPOINT ["/usr/local/bin/node", "--inspect=0.0.0.0:5858", "index.js"]

OpenFlow/src/LoginProvider.ts

@@ -7,7 +7,7 @@ import * as bodyParser from "body-parser";
 import * as SAMLStrategy from "passport-saml";
 import * as GoogleStrategy from "passport-google-oauth20";
 import * as LocalStrategy from "passport-local";
-import * as wsfed from "wsfed";
+// import * as wsfed from "wsfed";
 
 import * as passport from "passport";
 import { Config } from "./Config";
@@ -250,13 +250,13 @@ export class LoginProvider {
         strategy.name = key;
         this._logger.info(options.callbackUrl);
 
-        app.get("/" + key + "/FederationMetadata/2007-06/FederationMetadata.xml",
-            wsfed.metadata({
-                cert: Buffer.from(Config.signing_crt, "base64").toString("ascii"),
-                issuer: issuer
-            }));
+        // app.get("/" + key + "/FederationMetadata/2007-06/FederationMetadata.xml",
+        //     wsfed.metadata({
+        //         cert: Buffer.from(Config.signing_crt, "base64").toString("ascii"),
+        //         issuer: issuer
+        //     }));
         var CertPEM = Buffer.from(Config.signing_crt, "base64").toString("ascii").replace(/(-----(BEGIN|END) CERTIFICATE-----|\n)/g, '');
-        app.get("/" + key + "2/FederationMetadata/2007-06/FederationMetadata.xml",
+        app.get("/" + key + "/FederationMetadata/2007-06/FederationMetadata.xml",
             (req: express.Request, res: express.Response, next: express.NextFunction) => {
                 res.set("Content-Type", "text/xml");
                 res.send(`

OpenFlowNodeRED/src/index.ts

@@ -16,8 +16,6 @@ import { NoderedUtil } from "./nodered/nodes/NoderedUtil";
 
 const logger: winston.Logger = Logger.configure();
 
-Config.DumpConfig();
-
 process.on('unhandledRejection', up => {
     console.error(up);
     throw up

package.json

@@ -52,7 +52,6 @@
     "ssl-root-cas": "^1.3.1",
     "winston": "^3.2.1",
     "ws": "^6.2.1",
-    "wsfed": "^4.0.0",
     "x509": "^0.3.4"
   }
 }