Merge pull request #94 from Turbasen/duplicate-to-dev

Regenerate keys

Author: Håvard Ranum

.gitignore

@@ -1,3 +1,4 @@
+node_modules
 *.log
 .env
 coverage

Gruntfile.js

@@ -1,7 +1,6 @@
 'use strict';
 
-module.exports = function(grunt) {
-
+module.exports = (grunt) => {
   // Project configuration.
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
@@ -34,7 +33,7 @@ module.exports = function(grunt) {
         },
         files: {
           'static/css/app.css': 'static/less/app.less',
-        }
+        },
       },
     },
 

apps/app/controller.js

@@ -6,6 +6,7 @@ const route = new Router();
 
 const ApiUser = require('./model').ApiUser;
 const filters = require('./filters');
+const keygen = require('../../lib/keygen');
 
 const APPS_FREE = process.env.APPS_FREE || 1;
 
@@ -153,6 +154,14 @@ route.post('/:id', (req, res, next) => {
   req.app.set('url', req.body.url || undefined);
   req.app.set('desc', req.body.desc);
 
+  if (req.body.generate_key_dev) {
+    req.app.set('key.dev', keygen());
+  }
+
+  if (req.body.generate_key_prod) {
+    req.app.set('key.prod', keygen());
+  }
+
   // Prod rate-limit change request
   if (parseInt(req.body.limit_prod, 10) !== req.app.limit.prod) {
     req.app.limit.prodRequest = parseInt(req.body.limit_prod, 10);
@@ -183,8 +192,8 @@ route.post('/:id', (req, res, next) => {
 
     req.session.message = {
       class: 'positive',
-      title: 'App ppdatert',
-      message: `Applikasjon "${req.body.name}" ble oppdatert suksessfullt.`,
+      title: 'App oppdatert',
+      message: `Applikasjonen «${req.body.name}» ble oppdatert.`,
       app: req.app._id,
     };
 
@@ -205,7 +214,7 @@ route.post('/:id/disable', (req, res, next) => {
     req.session.message = {
       class: 'positive',
       title: 'App deaktivert',
-      message: `Applikasjon "${req.app.name}" ble deaktivert!`,
+      message: `Applikasjonen «${req.app.name}» ble deaktivert!`,
       app: req.app._id,
     };
 

apps/app/model.js

@@ -2,6 +2,7 @@
 
 const Schema = require('../../lib/db').Schema;
 const db = require('../../lib/db');
+
 const keygen = require('../../lib/keygen');
 const appsort = require('../../lib/appsort');
 

docker-compose.yml

@@ -4,6 +4,9 @@ services:
   node:
     image: node:argon
     network_mode: 'bridge'
+    logging:
+      options:
+        max-size: "500k"
     working_dir: /usr/src/app
     ports:
       - "8080"
@@ -22,15 +25,21 @@ services:
       - NPM_CONFIG_LOGLEVEL=silent
       - NPM_CONFIG_PROGRESS=false
       - NPM_CONFIG_SPIN=false
-      - VIRTUAL_HOST=developer.turbasen.privat
+      - VIRTUAL_HOST=developer.nasjonalturbase.local
       - VIRTUAL_PORT=8080
       - APP_SECRET=not-a-secret
-      - APP_ADMINS=Starefossen,kvikshaug
+      - APP_ADMINS=Starefossen,kvikshaug,geekus
 
   redis:
     image: redis:3
     network_mode: 'bridge'
+    logging:
+      options:
+        max-size: "500k"
 
   mongo:
     image: mongo:3.0
     network_mode: 'bridge'
+    logging:
+      options:
+        max-size: "500k"

package.json

@@ -18,6 +18,7 @@
     "grunt": "grunt",
     "grunt:watch": "grunt watch",
     "lint": "eslint test/ lib/ apps/ index.js",
+    "lint:watch": "esw --color --watch *.js test/ lib/ apps/ index.js",
     "nsp": "nsp check",
     "semantic-release": "semantic-release",
     "start": "supervisor -w index.js,apps,lib -e js index.js",
@@ -46,6 +47,7 @@
     "eslint": "^3.1.1",
     "eslint-config-airbnb-base": "^4.0.2",
     "eslint-plugin-import": "^1.11.0",
+    "eslint-watch": "^2.1.14",
     "greenkeeper-postpublish": "^1.0.0",
     "grunt-contrib-watch": "^1.0.0",
     "istanbul": "^0.4.3",

static/js/app.js

@@ -9,3 +9,11 @@ clipboard.on('success', function(e) {
 $('.button.copy').on('click', function(e) {
   e.preventDefault();
 });
+
+$('input[name^="generate_key"]').on('change', function(e) {
+  if (e.target.checked) {
+    $(e.target).parent().nextAll('.message').addClass('visible');
+  } else {
+    $(e.target).parent().nextAll('.message').removeClass('visible');
+  }
+});

views/app/index.html

@@ -52,7 +52,7 @@ <h4 class="ui header">
             </div>
             <div class="fields">
               <div class="twelve wide field">
-                <label>Prod Nøkkel</label>
+                <label>Prod-nøkkel</label>
                 <div class="ui action input">
                   <input
                     type="text"
@@ -75,9 +75,21 @@ <h4 class="ui header">
                   value="{{ app.limit.prodRequest | d(app.limit.prod) }}">
               </div>
             </div>
+            <div class="fields">
+              <div class="sixteen wide field">
+                <div class="ui checkbox">
+                  <input type="checkbox" name="generate_key_prod">
+                  <label>Generer ny API-nøkkel</label>
+                </div>
+                <div class="ui warning message generate_key_prod">
+                  <i class="icon warning"></i>
+                  Ny API-nøkkel vil genereres ved lagring, og vil erstatte den nåværende umiddelbart.
+                </div>
+              </div>
+            </div>
             <div class="fields">
               <div class="twelve wide field">
-                <label>Dev Nøkkel</label>
+                <label>Dev-nøkkel</label>
                 <div class="ui action input">
                   <input
                     type="text"
@@ -100,6 +112,18 @@ <h4 class="ui header">
                   value="{{ app.limit.devRequest | d(app.limit.dev) }}">
               </div>
             </div>
+            <div class="fields">
+              <div class="sixteen wide field">
+                <div class="ui checkbox">
+                  <input type="checkbox" name="generate_key_dev">
+                  <label>Generer ny API-nøkkel</label>
+                </div>
+                <div class="ui warning message generate_key_dev">
+                  <i class="icon warning"></i>
+                  Ny API-nøkkel vil genereres ved lagring, og vil erstatte den nåværende umiddelbart.
+                </div>
+              </div>
+            </div>
             <button class="ui blue submit button" type="submit">
               Lagre
             </button>