Some tests (and now logging can be disabled).

Author: sebadoom

Gruntfile.js

@@ -5,6 +5,7 @@ module.exports = grunt => {
   grunt.loadNpmTasks('grunt-webpack');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-mocha-test');
 
   grunt.initConfig({
     clean: {
@@ -99,6 +100,7 @@ module.exports = grunt => {
       websiteDev: require('./webpack.website-dev.js'),
       extensionProd: require('./webpack.extension-prod.js'),
       extensionDev: require('./webpack.extension-dev.js'),
+      test: require('./webpack.website-tests.js')
     },
 
     watch: {
@@ -150,6 +152,13 @@ module.exports = grunt => {
         ],
         tasks: ['build-extension-views']
       }
+    },
+
+    mochaTest: {
+      all: {
+        options: {},
+        src: ['dist/test/*.js']
+      }
     }
   });
 
@@ -197,6 +206,8 @@ module.exports = grunt => {
     'build-website-dev',
     'build-extension-dev'
   ]);
+
+  grunt.registerTask('test', ['webpack:test', 'mochaTest']);
 
   grunt.registerTask('default', ['build-dev', 'watch']);
 };

package.json

@@ -12,6 +12,8 @@
     "@babel/preset-env": "^7.0.0-beta.36",
     "babel-loader": "^8.0.0-beta.0",
     "bootstrap": "^3.3.7",
+    "chai": "^4.1.2",
+    "chai-as-promised": "^7.1.1",
     "codemirror": "^5.33.0",
     "flipclock": "^0.7.8",
     "grunt": "^1.0.1",
@@ -21,17 +23,22 @@
     "grunt-contrib-pug": "^1.0.0",
     "grunt-contrib-stylus": "^1.2.0",
     "grunt-contrib-watch": "^1.0.0",
+    "grunt-mocha-test": "^0.13.3",
     "grunt-webpack": "^3.0.2",
     "highlight.js": "^9.12.0",
     "isotope-layout": "^3.0.5",
     "jquery": "^3.2.1",
     "jsrsasign": "^8.0.4",
     "jstransformer-markdown-it": "^2.0.0",
+    "loglevel": "^1.6.1",
+    "mocha": "^5.0.0",
     "pug": "^2.0.0-rc.4",
+    "source-map-support": "^0.5.3",
     "stylus": "^0.54.5",
     "uglifyjs-webpack-plugin": "^1.1.6",
     "webpack": "^3.10.0",
-    "webpack-merge": "^4.1.1"
+    "webpack-merge": "^4.1.1",
+    "xhr-mock": "^2.0.3"
   },
   "scripts": {
     "test": "echo UNIMPLEMENTED",

src/editor/index.js

@@ -36,6 +36,8 @@ import {
   decodedTabElement
 } from '../dom-elements.js';
 
+import * as log from 'loglevel';
+
 // The event manager lets us enable/disable events as needed without
 // manually tracking them. Events that need to be disabled should be
 // passed to the event manager.
@@ -97,7 +99,7 @@ function selectAlgorithm(algorithm) {
       algorithmSelect.querySelector(`option[value="${algorithm}"]`);
 
     if(!selected) {
-      console.log(`Invalid algorithm ${algorithm}, ignoring...`);
+      log.info(`Invalid algorithm ${algorithm}, ignoring...`);
       return;
     }
 
@@ -148,7 +150,7 @@ function setAlgorithmInHeader(algorithm) {
       // errors.
       if(!(e instanceof SyntaxError)) {
         // If it's not a SyntaxError, log the error.
-        console.error('Failed to encode token: ', e);
+        log.warn('Failed to encode token: ', e);
       }
     }
 
@@ -254,7 +256,7 @@ function encodeToken() {
 
       saveAsLastToken();
     } catch(e) {
-      console.error('Failed to sign/encode token: ', e);      
+      log.warn('Failed to sign/encode token: ', e);      
       markAsInvalid();
       tokenEditor.setValue('');
     }    
@@ -291,7 +293,7 @@ function decodeToken() {
         verifyToken();
       }
     } catch(e) {
-      console.error('Failed to decode token: ', e);
+      log.warn('Failed to decode token: ', e);
     }  
   });
 }

src/editor/jwt.js

@@ -1,3 +1,5 @@
+import { isValidBase64String } from '../utils.js';
+
 import { 
   jws,
   KEYUTIL,
@@ -6,6 +8,8 @@ import {
   utf8tohex 
 } from 'jsrsasign';
 
+import * as log from 'loglevel';
+
 export function sign(header, 
                      payload,
                      secretOrPrivateKeyString,
@@ -25,6 +29,10 @@ export function sign(header,
 }
 
 export function verify(jwt, secretOrPublicKeyString, base64Secret = false) {
+  if(!isToken(jwt)) {
+    return false;
+  }
+
   const decoded = decode(jwt);
 
   if(!decoded.header.alg) {
@@ -41,7 +49,7 @@ export function verify(jwt, secretOrPublicKeyString, base64Secret = false) {
       return jws.JWS.verify(jwt, secretOrPublicKeyString);
     }
   } catch(e) {
-    console.error('Could not verify token, ' +
+    log.warn('Could not verify token, ' +
                   'probably due to bad data in it or the keys: ', e);
     return false;
   }
@@ -78,7 +86,20 @@ export function decode(jwt) {
   return result;
 }
 
-export function isToken(jwt) {
+export function isToken(jwt, checkTypClaim = false) {
   const decoded = decode(jwt);
-  return !decoded.errors && decoded.header.typ === 'JWT';
+
+  if(decoded.errors) {
+    return false;
+  }
+
+  if(checkTypClaim && decoded.header.typ !== 'JWT') {
+    return false;
+  }
+
+  const split = jwt.split('.');
+  let valid = true;
+  split.forEach(s => valid = valid && isValidBase64String(s, true));
+
+  return valid;
 }

src/utils.js

@@ -1,4 +1,5 @@
 import { KEYUTIL } from 'jsrsasign';
+import * as log from 'loglevel';
 
 export function httpGet(url, cache = true) {
   return new Promise((resolve, reject) => {
@@ -154,7 +155,7 @@ export function copyTextToClipboard(text) {
   try {
     document.execCommand('copy');
   } catch (err) {
-    console.error(err);
+    log.warn(err);
   }
 
   document.body.removeChild(textArea);
@@ -197,7 +198,7 @@ export function safeLocalStorageSetItem(key, value) {
   try {
     localStorage.setItem(key, value);
   } catch (e) {
-    console.log('Cannot save token to Local Storage ' + 
+    log.info('Cannot save token to Local Storage ' + 
                 '(private browsing enabled?), ignoring...', e);
     // Safari when in private browsing doesn't allow it
   }

src/website/counter.js

@@ -5,6 +5,7 @@ import { httpGet } from '../utils.js';
 import $ from 'jquery';
 import jQuery from 'jquery';
 import 'flipclock/compiled/flipclock.js';
+import * as log from 'loglevel';
 
 const initialCount = 80482701;
 const pollIntervalWhenVisible = 5000;
@@ -24,7 +25,7 @@ function updateCounterFromWebtask() {
       const parsed = JSON.parse(data);
       flipCounter.setTime(parsed.logins);
     }).catch(e => {
-      console.error('Failed to set count from Webtask: ', e);
+      log.warn('Failed to set count from Webtask: ', e);
     });
   });
 }

src/website/libraries.js

@@ -7,6 +7,7 @@ import {
 } from './dom-elements.js';
 
 import Isotope from 'isotope-layout';
+import * as log from 'loglevel';
 
 const librariesGrid = new Isotope(librariesElement, {
   layoutMode: 'fitRows',
@@ -58,7 +59,7 @@ function getStarsForGitHubRepos() {
       }
     } catch (e) {
       // Ignore bad data
-      console.error('Bad data in stored stars count, ignoring...', e);
+      log.warn('Bad data in stored stars count, ignoring...', e);
     }
 
     const url = `https://api.github.com/repos/${repo}`;
@@ -70,7 +71,7 @@ function getStarsForGitHubRepos() {
 
       insertStarCount(element, count);
     }).catch(e => {
-      console.error('Failed to get GitHub stars count for repository, ' + 
+      log.warn('Failed to get GitHub stars count for repository, ' + 
                     'is the repository URL OK? ', e);
     });
   });

src/website/smooth-scrolling.js

@@ -2,6 +2,7 @@ import { menuScrollableLinks, navbarElement } from './dom-elements.js';
 import { isWideScreen } from '../utils.js';
 
 import $ from 'jquery';
+import * as log from 'loglevel';
 
 // This is the only function that really requires jQuery, other than some
 // of the dependencies. Consider this when adding code that depends on
@@ -30,7 +31,7 @@ export function setupSmoothScrolling() {
 
       const start = scrollable.href.indexOf('#');
       if (start === -1) {
-        console.error('<a> element with .scrollto set and bad link: ',
+        log.warn('<a> element with .scrollto set and bad link: ',
           scrollable.href);
         return;
       }

test/functional/index.js

@@ -0,0 +1 @@
+import 'source-map-support/register';