Phase III Task 4

docker-compose.yml

@@ -3,13 +3,9 @@ version: '3'
 services:
   nginx:
     container_name: nginx
-    # depends_on:
-    #   - app
     restart: always
     build: ./nginx
     image: custom/nginx
-    # ports:
-    #   - 80:80
     links:
         - app
         - prometheus
@@ -26,26 +22,18 @@ services:
       - network_1
   app:
     container_name: app
-    # depends_on:
-    #   - mongo
-    restart: always
     build: ./node
     image: custom/node
     ports:
       - 3001:3001
     networks:
       - network_1
-      # - network_2
-    deploy:
-      resources:
-        limits:
-          memory: 50M
-        reservations:
-          memory: 20M
   mongo:
     container_name: mongo
     build: ./mongo
     image: custom/mongo
+    volumes:
+      - mongodata:/data/db
     environment:
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: ruth
@@ -65,18 +53,18 @@ services:
   grafana:
     container_name: grafana
     image: grafana/grafana
+    volumes:
+      - grafanadata:/var/lib/grafana
     networks:
       - network_1
     ports:
       - 3000:3000
+volumes:
+  mongodata:
+  grafanadata:
 networks:
   network_1:
     ipam:
       driver: default
       config:
         - subnet: 192.168.5.0/24
-  # network_2:
-  #   ipam:
-  #     driver: default
-  #     config:
-  #       - subnet: 192.168.6.0/24

node/app.js

@@ -11,6 +11,7 @@ const marked = require('marked');
 const jwt = require('jsonwebtoken');
 const bodyParser= require('body-parser');
 const colors = require('colors');
+const secret = 'wowmuchsecretveryhiddenwow'; 
 
 // const morgan = require('morgan');
 // use morgan to log requests to the console
@@ -57,7 +58,7 @@ collectDefaultMetrics({ timeout: 5000 });
 
 // new schema model object based on the structure of what I want to put on MongoDB collection
 var testSchema = new Schema({
-  color: {
+  thingies: {
     type: String
   }
 },{
@@ -65,7 +66,7 @@ var testSchema = new Schema({
 });
 
 // new object that will hold the data using model structure made above
-var thingies = mongoose.model('colorName', testSchema);
+var thingies = mongoose.model('thingieName', testSchema);
 
 // Default message for testing
 app.get('/', (req, res)=>{
@@ -130,10 +131,10 @@ app.post('/token', function(req, res) {
   switch(req.body.username) {
       case 'user1':
       if (req.body.password === 'pass1') {
-          token = jwt.sign(claims_user, 'wowmuchsecretveryhiddenwow');
+          token = jwt.sign(claims_user, secret);
           console.log('JWT Token: ' + token);
           console.log(jwt.decode(token));
-          req.headers['access-token'] = token;
+          // req.headers['access-token'] = token;
           res.redirect('http://localhost/yay.html');
       } else {
           res.redirect('http://localhost/nay.html');
@@ -141,10 +142,10 @@ app.post('/token', function(req, res) {
       break;
       case 'power':
       if (req.body.password === 'weak') {
-          token = jwt.sign(claims_power, 'wowmuchsecretveryhiddenwow');
+          token = jwt.sign(claims_power, secret);
           console.log('JWT Token: ' + token);
           console.log(jwt.decode(token));
-          req.headers['access-token'] = token;
+          // req.headers['access-token'] = token;
           res.redirect('http://localhost/yay.html');
       } else {
       res.redirect('http://localhost/nay.html');
@@ -153,15 +154,34 @@ app.post('/token', function(req, res) {
       default:
       res.status(500).send('User not found');
   } 
-  console.log('HEADER (req.headers): ' + req.headers['access-token']);
+  console.log('http headers below:')
+  console.log(req.headers);
 });
 
 
-// Restricted endpoint
+// Restricted route
-const restrictRoutes = express.Router();
+// const restrictedRoutes = express.Router();
-app.use('/restricted', restrictRoutes);
+// app.use('/restricted', restrictedRoutes);
+
+// restrictedRoutes.use((req, res, next) => {
+//   if (req.headers['access-token']) {
+//     jwt.verify(req.headers['access-token'], secret), (err, decoded) => {
+//       if (err) {
+//         return res.json({ message: 'invalid token' });
+//       } else {
+//         req.decoded = decoded;
+//         next();
+//       }
+//     }
+//   } else {
+//     res.status(500).send('no token found');
+//   }
+// });
 
-restrictRoutes.use((req, res, next) => {});
+// Restricted endpoint
+// restrictedRoutes.get('/restricted', (req, res) => {
+//   res.json([{secret:'you can see this message if you have access'}])
+// });
 
 // Mongo query
 app.get('/info', function(req, res){
@@ -176,7 +196,7 @@ app.post('/info/add/:name', function(req, res){
   var item = {thingies: req.params.name};
   var data = new thingies(item);
   data.save();
-  res.send('thingie ' + req.params.name + ' added to database');
+  res.send('thingie ' + req.params.name + ' added to database' + '\n');
 });
 
 connectWithRetry();