Merge pull request snoopysecurity#26 from lacksfish/update-node16-pyt…

…hon3.7-and-deps

QOL - Update node to v16.14.0, update python to v3.7.12, add image name to docker-compose.yml

Dockerfile

@@ -1,8 +1,8 @@
-FROM node:13.14.0-stretch-slim
+FROM nikolaik/python-nodejs:python3.7-nodejs16-slim
 RUN mkdir /home/dvws-node
 WORKDIR /home/dvws-node
-RUN apt-get update && apt-get install -y git python3 build-essential --no-install-recommends
+RUN apt-get update && apt-get install -y git build-essential --no-install-recommends
 COPY . .
 RUN npm install --build-from-source
-ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.7.3/wait /wait
+ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.9.0/wait /wait
 RUN chmod +x /wait

docker-compose.yml

@@ -7,6 +7,7 @@ services:
         environment:
             MYSQL_ROOT_PASSWORD: mysecretpassword
     web:
+        image: snoopysecurity/dvws-node:latest
         build: .
         ports:
         - "80:80"

index.html

@@ -1,8 +1,8 @@
 
-<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.9/angular.min.js"></script>
-<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-<script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
+<script src="./js/jquery.min.js"></script>
+<script type="text/javascript" src="./js/angular.min.js"></script>
+<link href="./css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
+<script src="./js/bootstrap.min.js"></script>
 <link href="index.css" rel="stylesheet" id="inline-css">
 <!------ Include the above in your HEAD tag ---------->
 

index.js

@@ -5,6 +5,7 @@ const bodyParser = require('body-parser');
 const cors = require('cors');
 const swaggerUI = require('swagger-ui-express');
 const fileUpload = require('express-fileupload');
+const path = require('path');
 
 const swaggerDocument = require('./swagger'); //Swagger
 const soapservice = require('./soapserver/dvwsuserservice'); //SOAP Service
@@ -23,6 +24,11 @@ const stage = require('./config')[environment];
 const routes = require('./routes/index.js');
 
 app.use(express.static('public'));
+app.use("/css", express.static(path.join(__dirname, "node_modules/bootstrap/dist/css")));
+app.use("/js", express.static(path.join(__dirname, "node_modules/bootstrap/dist/js")));
+app.use("/js", express.static(path.join(__dirname, "node_modules/jquery/dist")));
+app.use("/js", express.static(path.join(__dirname, "node_modules/angular")));
+
 app.use(bodyParser.urlencoded({ extended: true }));
 app.use('/api-docs', swaggerUI.serve, swaggerUI.setup(swaggerDocument));
 app.use('/dvwsuserservice', soapservice);

package.json

@@ -19,19 +19,22 @@
   "homepage": "https://github.com/snoopysecurity/dvws-node#readme",
   "dependencies": {
     "@graphql-tools/schema": "^8.3.1",
+    "angular": "1.3.9",
     "apollo-server": "^3.5.0",
     "bcrypt": "^3.0.1",
     "body-parser": "^1.18.3",
+    "bootstrap": "4.0.0",
     "cors": "^2.8.5",
     "dotenv": "^6.0.0",
     "express": "^4.16.3",
-    "express-fileupload": "richardgirges/express-fileupload#1.1.7-alpha.4",
+    "express-fileupload": "1.1.7-alpha.4",
     "express-jwt": "^5.3.1",
     "express-jwt-permissions": "^1.3.3",
     "graphql": "^16.1.0",
     "graphql-tools": "^8.2.0",
     "http-proxy-middleware": "^1.0.3",
     "install": "^0.13.0",
+    "jquery": "1.11.1",
     "jsonwebtoken": "^8.3.0",
     "libxmljs": "^0.19.7",
     "mongoose": "^5.10.15",

public/home.html

@@ -1,7 +1,7 @@
-<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.9/angular.min.js"></script>
-<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-<script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
+<script src="./js/jquery.min.js"></script>
+<script type="text/javascript" src="./js/angular.min.js"></script>
+<link href="./css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
+<script src="./js/bootstrap.min.js"></script>
 <link href="index.css" rel="stylesheet" id="inline-css">
 <!------ Include the above in your HEAD tag ---------->
 
@@ -37,10 +37,8 @@ <h2>Damn Vulnerable Web Services<br> Home Area</h2>
       </div>
 
       <br><br><br><br><br><br>
-      <p>Log-out:<script>
-         document.write(`<a href="/api/v2/users/logout/${document.domain}">
-            <span class="glyphicon glyphicon-log-out"></span>
-          </a>`);
+      <script>
+         document.write(`<a href="/api/v2/users/logout/${document.domain}">Logout</a>`);
       </script>
    </p>
 

public/index.html

@@ -1,8 +1,8 @@
 
-<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.9/angular.min.js"></script>
-<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-<script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
+<script src="./js/jquery.min.js"></script>
+<script type="text/javascript" src="./js/angular.min.js"></script>
+<link href="./css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
+<script src="./js/bootstrap.min.js"></script>
 <link href="index.css" rel="stylesheet" id="inline-css">
 <!------ Include the above in your HEAD tag ---------->
 

public/notes.html

@@ -2,10 +2,10 @@
 <html>
 
 <head>
-<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.9/angular.min.js"></script>
-<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-<script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
+<script src="./js/jquery.min.js"></script>
+<script type="text/javascript" src="./js/angular.min.js"></script>
+<link href="./css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
+<script src="./js/bootstrap.min.js"></script>
 <link href="index.css" rel="stylesheet" id="inline-css">
 <!------ Include the above in your HEAD tag ---------->
 

public/passphrasegen.html

@@ -1,10 +1,10 @@
 <html>
 
 <head>
-    <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
-    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.9/angular.min.js"></script>
-    <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-    <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
+    <script src="./js/jquery.min.js"></script>
+    <script type="text/javascript" src="./js/angular.min.js"></script>
+    <link href="./css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
+    <script src="./js/bootstrap.min.js"></script>
     <link href="index.css" rel="stylesheet" id="inline-css">
     <script type="text/javascript" src="passgen.js"></script>
     <!------ Include the above in your HEAD tag ---------->

public/search.html

@@ -1,8 +1,8 @@
 
-<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.9/angular.min.js"></script>
-<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
-<script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
+<script src="./js/jquery.min.js"></script>
+<script type="text/javascript" src="./js/angular.min.js"></script>
+<link href="./css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
+<script src="./js/bootstrap.min.js"></script>
 <link href="index.css" rel="stylesheet" id="inline-css">
 <!------ Include the above in your HEAD tag ---------->