Merge pull request #412 from tanx/master

Minor fixes to master

.elasticbeanstalk/config.yml

@@ -0,0 +1,12 @@
+branch-defaults:
+  release/prod:
+    environment: mail-prod
+  release/test:
+    environment: mail-test
+global:
+  application_name: mail
+  default_ec2_keyname: null
+  default_platform: Node.js
+  default_region: eu-central-1
+  profile: eb-cli
+  sc: git

.gitignore

@@ -5,10 +5,10 @@ test/lib/
 .sass-cache
 src/css/
 dist/
+compile/
 release/
 test/integration/src/
-src/lib/*.js
+src/img/icons/all.svg
-src/js/crypto/aes-cbc.js
+test/*/index.js
-src/js/crypto/crypto-batch.js
+**/*.browserified.js
-src/js/crypto/rsa.js
+**/*.js.map
-src/js/crypto/util.js

.jshintrc

@@ -18,31 +18,37 @@
     "unused": true,
 
     "predef": [
-			"console",
+        "$",
-			"importScripts",
+        "inject",
-			"process",
+        "Promise",
-			"QUnit",
+        "resolves",
-			"test",
+        "rejects",
-			"asyncTest",
-			"ok",
-			"equal",
-			"deepEqual",
-			"start",
-			"chrome",
-			"requirejs",
-			"define",
         "self",
-			"describe",
+        "importScripts",
-			"it",
+        "console",
-			"chai",
+        "process",
+        "chrome",
+        "Notification",
+        "Event",
         "sinon",
         "mocha",
+        "chai",
+        "expect",
+        "describe",
+        "it",
         "before",
         "beforeEach",
         "after",
-            "afterEach"
+        "afterEach",
+        "FastClick",
+        "angular",
+        "forge",
+        "Lawnchair",
+        "_",
+        "openpgp",
+        "PhoneNumber",
+        "DOMPurify"
     ],
 
-	"globals": {
+    "globals": {}
-	}
 }

.travis.yml

@@ -1,9 +1,7 @@
+sudo: false
 language: node_js
 node_js:
-  - "0.10"
+  - "0.12"
 before_install:
   - gem install sass
   - npm install -g grunt-cli
-notifications:
-  email:
-    - build@whiteout.io

Gruntfile.js

@@ -1,175 +1,66 @@
 module.exports = function(grunt) {
     'use strict';
 
+    require('time-grunt')(grunt);
+
     var version = grunt.option('release'),
         zipName = (version) ? version : 'DEV';
 
+    var browserifyOpt = {
+        exclude: ['openpgp', 'node-forge', 'net', 'tls', 'crypto'], // node apis not required at build time
+        ignore: ['buffer'], // node apis to be stubbed for runtime
+        browserifyOptions: {
+            debug: true
+        }
+    };
+
     // Project configuration.
     grunt.initConfig({
-        connect: {
-            dev: {
-                options: {
-                    port: 8580,
-                    base: '.',
-                    keepalive: true
-                }
-            },
-            test: {
-                options: {
-                    port: 8581,
-                    base: '.'
-                }
-            },
-            prod: {
-                options: {
-                    port: process.env.PORT || 8585,
-                    base: './dist/',
-                    keepalive: true,
-                    middleware: function(connect, options) {
-                        // Return array of whatever middlewares you want
-                        return [
-                            function(req, res, next) {
-                                res.setHeader('Content-Security-Policy', "default-src 'self'; object-src 'none'; connect-src 'self' https://keys.whiteout.io; img-src 'self' data:;");
 
-                                return next();
+        // General
-                            },
 
-                            // Serve static files.
+        shell: {
-                            connect.static(options.base)
-                        ];
-                    }
-                }
-            }
-        },
-
-        jshint: {
-            all: ['Gruntfile.js', 'src/*.js', 'src/js/**/*.js', 'test/new-unit/*.js', 'test/unit/*.js', 'test/integration/*.js'],
             options: {
-                jshintrc: '.jshintrc'
+                stderr: false
-            }
             },
-
+            target: {
-        qunit: {
+                command: 'dir=$(pwd) && cd node_modules/mailreader/ && npm install --production && cd $dir'
-            all: {
-                options: {
-                    timeout: 20000,
-                    urls: ['http://localhost:<%= connect.test.options.port %>/test/unit/index.html'
-                        /*,
-                            'http://localhost:<%= connect.test.options.port %>/test/integration/index.html'*/
-                    ]
-                }
-            }
-        },
-
-        mocha: {
-            all: {
-                options: {
-                    urls: ['http://localhost:<%= connect.test.options.port %>/test/new-unit/index.html'],
-                    run: false,
-                    reporter: 'Spec'
-                }
             }
         },
 
         clean: {
-            dist: ['dist', 'src/lib/*.js', 'test/lib', 'test/integration/src']
+            dist: ['dist', 'compile', 'test/lib', 'test/integration/src'],
-        },
+            release: ['dist/**/*.browserified.js', 'dist/**/*.js.map', 'dist/js/app.templates.js']
-        sass: {
-            dist: {
-                files: {
-                    'src/css/all.css': 'src/sass/all.scss'
-                }
-            }
-        },
-        autoprefixer: {
-            options: {
-                browsers: ['last 2 versions']
-            },
-            dist: {
-                files: {
-                    'src/css/all.css': 'src/css/all.css'
-                }
-            }
-        },
-        csso: {
-            options: {
-                banner: '/*! Copyright © 2013, Whiteout Networks GmbH. All rights reserved.*/\n'
-            },
-            dist: {
-                files: {
-                    'dist/css/all.min.css': 'src/css/all.css'
-                }
-            }
-        },
-        watch: {
-            css: {
-                files: ['src/sass/**/*.scss'],
-                tasks: ['dist-css']
-            },
-            js: {
-                files: ['src/js/**/*.js'],
-                tasks: ['copy:js']
-            },
-            lib: {
-                files: ['src/lib/**/*.js'],
-                tasks: ['copy:lib']
-            },
-            app: {
-                files: ['src/*.js', 'src/**/*.html', 'src/**/*.json', 'src/img/**/*', 'src/font/**/*'],
-                tasks: ['copy:app', 'copy:ca', 'copy:tpl', 'copy:img', 'copy:font', 'manifest-dev']
-            }
         },
+
         copy: {
-            npm: {
+            libTest: {
                 expand: true,
                 flatten: true,
-                cwd: 'node_modules/',
+                cwd: './',
                 src: [
-                    'requirejs/require.js',
+                    'node_modules/mocha/mocha.css',
-                    'crypto-lib/node_modules/node-forge/js/*.js',
+                    'node_modules/mocha/mocha.js',
-                    'imap-client/src/*.js',
+                    'node_modules/chai/chai.js',
-                    'imap-client/node_modules/inbox/src/*.js',
+                    'node_modules/sinon/pkg/sinon.js',
-                    'imap-client/node_modules/setimmediate/setImmediate.js',
+                    'node_modules/browsercrow/src/*.js',
-                    'imap-client/node_modules/inbox/node_modules/node-shims/src/*.js',
+                    'node_modules/browsersmtp/src/*.js',
-                    'imap-client/node_modules/inbox/node_modules/utf7/src/utf7.js',
+                    'node_modules/openpgp/dist/openpgp.min.js',
-                    'imap-client/node_modules/inbox/node_modules/xoauth2/src/xoauth2.js',
+                    'node_modules/openpgp/dist/openpgp.worker.min.js',
-                    'mailreader/src/*.js',
+                    'src/lib/forge/forge.min.js',
-                    'mailreader/node_modules/mailparser/src/*.js',
+                    'dist/js/pbkdf2-worker.min.js'
-                    'mailreader/node_modules/mailparser/node_modules/encoding/src/encoding.js',
-                    'mailreader/node_modules/mailparser/node_modules/mimelib/src/mimelib.js',
-                    'mailreader/node_modules/mailparser/node_modules/mimelib/node_modules/addressparser/src/addressparser.js',
-                    'mailreader/node_modules/mailparser/node_modules/encoding/node_modules/iconv-lite/src/*.js',
-                    'mailreader/node_modules/mailparser/node_modules/mime/src/mime.js',
-                    'pgpmailer/src/*.js',
-                    'pgpmailer/node_modules/simplesmtp/src/*',
-                    'pgpbuilder/src/*.js',
-                    'pgpbuilder/node_modules/mailbuilder/src/*.js'
                 ],
-                dest: 'src/lib/'
-            },
-            npmDev: {
-                expand: true,
-                flatten: true,
-                cwd: 'node_modules/',
-                src: ['requirejs/require.js', 'mocha/mocha.css', 'mocha/mocha.js', 'chai/chai.js', 'sinon/pkg/sinon.js', 'angularjs/src/ngMock/angular-mocks.js'],
                 dest: 'test/lib/'
             },
-            cryptoLib: {
-                expand: true,
-                cwd: 'node_modules/crypto-lib/src/',
-                src: ['*.js'],
-                dest: 'src/js/crypto/'
-            },
             lib: {
                 expand: true,
-                cwd: 'src/lib/',
+                flatten: true,
-                src: ['**'],
+                cwd: './',
-                dest: 'dist/lib/'
+                src: [
-            },
+                    'node_modules/openpgp/dist/openpgp.min.js',
-            js: {
+                    'node_modules/openpgp/dist/openpgp.worker.min.js',
-                expand: true,
+                    'src/lib/forge/forge.min.js'
-                cwd: 'src/js/',
+                ],
-                src: ['**'],
                 dest: 'dist/js/'
             },
             font: {
@@ -187,29 +78,496 @@ module.exports = function(grunt) {
             tpl: {
                 expand: true,
                 cwd: 'src/tpl/',
-                src: ['*'],
+                src: ['read-sandbox.html'],
                 dest: 'dist/tpl/'
             },
-            ca: {
-                expand: true,
-                cwd: 'src/ca/',
-                src: ['*'],
-                dest: 'dist/ca/'
-            },
             app: {
                 expand: true,
                 cwd: 'src/',
-                src: ['*.html', '*.js', '*.json'],
+                src: ['*.js', '*.json', 'manifest.*'],
                 dest: 'dist/'
-            },
-            integration: {
-                expand: true,
-                cwd: 'src/',
-                src: ['**'],
-                dest: 'test/integration/src/'
             }
         },
 
+        // Stylesheets
+
+        sass: {
+            dist: {
+                files: {
+                    'src/css/read-sandbox.css': 'src/sass/read-sandbox.scss',
+                    'src/css/all.css': 'src/sass/all.scss'
+                }
+            },
+            styleguide: {
+                files: {
+                    'src/css/styleguide.css': 'src/sass/styleguide.scss'
+                }
+            }
+        },
+        autoprefixer: {
+            options: {
+                browsers: ['last 2 versions']
+            },
+            dist: {
+                files: {
+                    'src/css/read-sandbox.css': 'src/css/read-sandbox.css',
+                    'src/css/all.css': 'src/css/all.css'
+                }
+            },
+            styleguide: {
+                files: {
+                    'src/css/styleguide.css': 'src/css/styleguide.css'
+                }
+            }
+        },
+        csso: {
+            options: {
+                banner: '/*! Copyright © 2013, Whiteout Networks GmbH. All rights reserved.*/\n'
+            },
+            dist: {
+                files: {
+                    'dist/css/read-sandbox.min.css': 'src/css/read-sandbox.css',
+                    'dist/css/all.min.css': 'src/css/all.css'
+                }
+            },
+            styleguide: {
+                files: {
+                    'dist/styleguide/css/styleguide.min.css': 'src/css/styleguide.css'
+                }
+            }
+        },
+
+        // JavaScript
+
+        jshint: {
+            all: ['Gruntfile.js', 'src/*.js', 'src/js/**/*.js', 'test/unit/*-test.js', 'test/integration/*-test.js'],
+            options: {
+                jshintrc: '.jshintrc'
+            }
+        },
+
+        browserify: {
+            app: {
+                files: {
+                    'dist/js/app.browserified.js': ['src/js/app.js']
+                },
+                options: browserifyOpt
+            },
+            pbkdf2Worker: {
+                files: {
+                    'dist/js/pbkdf2-worker.browserified.js': ['src/js/crypto/pbkdf2-worker.js']
+                },
+                options: browserifyOpt
+            },
+            mailreaderWorker: {
+                files: {
+                    'dist/js/mailreader-parser-worker.browserified.js': ['node_modules/mailreader/src/mailreader-parser-worker-browserify.js']
+                },
+                options: browserifyOpt
+            },
+            tlsWorker: {
+                files: {
+                    'dist/js/tcp-socket-tls-worker.browserified.js': ['node_modules/tcp-socket/src/tcp-socket-tls-worker.js']
+                },
+                options: browserifyOpt
+            },
+            compressionWorker: {
+                files: {
+                    'dist/js/browserbox-compression-worker.browserified.js': ['node_modules/imap-client/node_modules/browserbox/src/browserbox-compression-worker.js']
+                },
+                options: browserifyOpt
+            },
+            unitTest: {
+                files: {
+                    'test/unit/index.browserified.js': [
+                        'test/main.js',
+                        'test/unit/util/dialog-test.js',
+                        'test/unit/util/connection-doctor-test.js',
+                        'test/unit/util/update-handler-test.js',
+                        'test/unit/util/status-display-test.js',
+                        'test/unit/crypto/pgp-test.js',
+                        'test/unit/crypto/crypto-test.js',
+                        'test/unit/service/rest-dao-test.js',
+                        'test/unit/service/admin-dao-test.js',
+                        'test/unit/service/auth-test.js',
+                        'test/unit/service/oauth-test.js',
+                        'test/unit/service/publickey-dao-test.js',
+                        'test/unit/service/privatekey-dao-test.js',
+                        'test/unit/service/lawnchair-dao-test.js',
+                        'test/unit/service/keychain-dao-test.js',
+                        'test/unit/service/devicestorage-dao-test.js',
+                        'test/unit/service/newsletter-service-test.js',
+                        'test/unit/service/mail-config-service-test.js',
+                        'test/unit/service/invitation-dao-test.js',
+                        'test/unit/service/publickey-verifier-test.js',
+                        'test/unit/email/outbox-bo-test.js',
+                        'test/unit/email/email-dao-test.js',
+                        'test/unit/email/account-test.js',
+                        'test/unit/email/search-test.js',
+                        'test/unit/controller/login/add-account-ctrl-test.js',
+                        'test/unit/controller/login/create-account-ctrl-test.js',
+                        'test/unit/controller/login/validate-phone-ctrl-test.js',
+                        'test/unit/controller/login/login-existing-ctrl-test.js',
+                        'test/unit/controller/login/login-initial-ctrl-test.js',
+                        'test/unit/controller/login/login-new-device-ctrl-test.js',
+                        'test/unit/controller/login/login-privatekey-download-ctrl-test.js',
+                        'test/unit/controller/login/login-privatekey-upload-ctrl-test.js',
+                        'test/unit/controller/login/login-verify-public-key-ctrl-test.js',
+                        'test/unit/controller/login/login-set-credentials-ctrl-test.js',
+                        'test/unit/controller/login/login-ctrl-test.js',
+                        'test/unit/controller/app/dialog-ctrl-test.js',
+                        'test/unit/controller/app/publickey-import-ctrl-test.js',
+                        'test/unit/controller/app/account-ctrl-test.js',
+                        'test/unit/controller/app/set-passphrase-ctrl-test.js',
+                        'test/unit/controller/app/contacts-ctrl-test.js',
+                        'test/unit/controller/app/read-ctrl-test.js',
+                        'test/unit/controller/app/navigation-ctrl-test.js',
+                        'test/unit/controller/app/mail-list-ctrl-test.js',
+                        'test/unit/controller/app/write-ctrl-test.js',
+                        'test/unit/controller/app/action-bar-ctrl-test.js',
+                    ]
+                },
+                options: browserifyOpt
+            },
+            integrationTest: {
+                files: {
+                    'test/integration/index.browserified.js': [
+                        'test/main.js',
+                        'test/integration/email-dao-test.js',
+                        'test/integration/publickey-verifier-test.js'
+                    ]
+                },
+                options: browserifyOpt
+            }
+        },
+
+        exorcise: {
+            app: {
+                files: {
+                    'dist/js/app.browserified.js.map': ['dist/js/app.browserified.js'],
+                }
+            },
+            unitTest: {
+                files: {
+                    'test/unit/index.browserified.js.map': ['test/unit/index.browserified.js'],
+                }
+            },
+            integrationTest: {
+                files: {
+                    'test/integration/index.browserified.js.map': ['test/integration/index.browserified.js'],
+                }
+            }
+        },
+
+        ngtemplates: {
+            mail: {
+                src: [
+                    'tpl/**/*.html'
+                ],
+                dest: 'dist/js/app.templates.js',
+                cwd: 'src/',
+                options: {
+                    htmlmin: {
+                        collapseWhitespace: true,
+                        removeComments: true // we do not use comment directives
+                    }
+                }
+            }
+        },
+
+        concat: {
+            options: {
+                separator: ';\n',
+                sourceMap: true
+            },
+            app: {
+                src: [
+                    'src/lib/underscore/underscore.js',
+                    'node_modules/jquery/dist/jquery.min.js',
+                    'src/lib/angular/angular.js',
+                    'src/lib/angular/angular-route.js',
+                    'src/lib/angular/angular-animate.js',
+                    'src/lib/ngtagsinput/ng-tags-input.min.js',
+                    'node_modules/ng-infinite-scroll/build/ng-infinite-scroll.min.js',
+                    'node_modules/iframe-resizer/js/iframeResizer.min.js',
+                    'src/lib/fastclick/fastclick.js',
+                    'src/lib/lawnchair/lawnchair-git.js',
+                    'src/lib/lawnchair/lawnchair-adapter-webkit-sqlite-git.js',
+                    'src/lib/lawnchair/lawnchair-adapter-indexed-db-git.js',
+                    'src/lib/phonenumber/PhoneNumberMetadata.js',
+                    'src/lib/phonenumber/PhoneNumberNormalizer.js',
+                    'src/lib/phonenumber/PhoneNumber.js',
+                    'dist/js/app.browserified.js',
+                    '<%= ngtemplates.mail.dest %>'
+                ],
+                dest: 'dist/js/app.min.js',
+                options: {
+                    sourceMapName: 'dist/js/app.js.map'
+                }
+            },
+            readSandbox: {
+                src: [
+                    'node_modules/dompurify/src/purify.js',
+                    'node_modules/iframe-resizer/js/iframeResizer.contentWindow.min.js',
+                    'src/js/controller/app/read-sandbox.js'
+                ],
+                dest: 'dist/js/read-sandbox.min.js'
+            },
+            pbkdf2Worker: {
+                src: ['dist/js/pbkdf2-worker.browserified.js'],
+                dest: 'dist/js/pbkdf2-worker.min.js'
+            },
+            mailreaderWorker: {
+                src: ['dist/js/mailreader-parser-worker.browserified.js'],
+                dest: 'dist/js/mailreader-parser-worker.min.js'
+            },
+            tlsWorker: {
+                src: ['dist/js/tcp-socket-tls-worker.browserified.js'],
+                dest: 'dist/js/tcp-socket-tls-worker.min.js'
+            },
+            compressionWorker: {
+                src: ['dist/js/browserbox-compression-worker.browserified.js'],
+                dest: 'dist/js/browserbox-compression-worker.min.js'
+            },
+            unitTest: {
+                src: [
+                    'src/lib/underscore/underscore.js',
+                    'node_modules/jquery/dist/jquery.min.js',
+                    'src/lib/angular/angular.js',
+                    'src/lib/angular/angular-route.js',
+                    'src/lib/angular/angular-mocks.js',
+                    'src/lib/lawnchair/lawnchair-git.js',
+                    'src/lib/lawnchair/lawnchair-adapter-webkit-sqlite-git.js',
+                    'src/lib/lawnchair/lawnchair-adapter-indexed-db-git.js',
+                    'src/lib/phonenumber/PhoneNumberMetadata.js',
+                    'src/lib/phonenumber/PhoneNumberNormalizer.js',
+                    'src/lib/phonenumber/PhoneNumber.js',
+                    'test/unit/index.browserified.js'
+                ],
+                dest: 'test/unit/index.js',
+                options: {
+                    sourceMapName: 'test/unit/index.js.map'
+                }
+            },
+            integrationTest: {
+                src: [
+                    'src/lib/underscore/underscore.js',
+                    'node_modules/jquery/dist/jquery.min.js',
+                    'src/lib/angular/angular.js',
+                    'src/lib/angular/angular-mocks.js',
+                    'src/lib/lawnchair/lawnchair-git.js',
+                    'src/lib/lawnchair/lawnchair-adapter-webkit-sqlite-git.js',
+                    'src/lib/lawnchair/lawnchair-adapter-indexed-db-git.js',
+                    'test/integration/index.browserified.js'
+                ],
+                dest: 'test/integration/index.js',
+                options: {
+                    sourceMapName: 'test/integration/index.js.map'
+                }
+            }
+        },
+
+        uglify: {
+            app: {
+                files: {
+                    'dist/js/app.min.js': ['dist/js/app.min.js']
+                },
+                options: {
+                    mangle: false,
+                    sourceMap: true,
+                    sourceMapIn: 'dist/js/app.js.map',
+                    sourceMapIncludeSources: true,
+                    sourceMapName: 'dist/js/app.min.js.map'
+                }
+            },
+            readSandbox: {
+                files: {
+                    'dist/js/read-sandbox.min.js': ['dist/js/read-sandbox.min.js']
+                },
+                options: {
+                    sourceMap: true,
+                    sourceMapName: 'dist/js/read-sandbox.min.js.map'
+                }
+            },
+            pbkdf2Worker: {
+                files: {
+                    'dist/js/pbkdf2-worker.min.js': ['dist/js/pbkdf2-worker.min.js']
+                }
+            },
+            mailreaderWorker: {
+                files: {
+                    'dist/js/mailreader-parser-worker.min.js': ['dist/js/mailreader-parser-worker.min.js']
+                },
+                options: {
+                    sourceMap: true,
+                    sourceMapName: 'dist/js/mailreader-parser-worker.min.js.map'
+                }
+            },
+            tlsWorker: {
+                files: {
+                    'dist/js/tcp-socket-tls-worker.min.js': ['dist/js/tcp-socket-tls-worker.min.js']
+                },
+                options: {
+                    sourceMap: true,
+                    sourceMapName: 'dist/js/tcp-socket-tls-worker.min.js.map'
+                }
+            },
+            compressionWorker: {
+                files: {
+                    'dist/js/browserbox-compression-worker.min.js': ['dist/js/browserbox-compression-worker.min.js']
+                },
+                options: {
+                    sourceMap: true,
+                    sourceMapName: 'dist/js/browserbox-compression-worker.min.js.map'
+                }
+            },
+            options: {
+                banner: '/*! Copyright © <%= grunt.template.today("yyyy") %>, Whiteout Networks GmbH.*/\n'
+            }
+        },
+
+        mocha_phantomjs: {
+            all: {
+                options: {
+                    urls: [
+                        'http://localhost:<%= connect.test.options.port %>/test/unit/index.html',
+                        'http://localhost:<%= connect.test.options.port %>/test/integration/index.html'
+                    ]
+                }
+            }
+        },
+
+        // Assets
+
+        svgmin: {
+            options: {
+                plugins: [{
+                    removeViewBox: false
+                }, {
+                    removeUselessStrokeAndFill: false
+                }]
+            },
+            icons: {
+                files: [{
+                    expand: true,
+                    src: ['img/icons/*.svg', '!img/icons/all.svg'],
+                    cwd: 'src/',
+                    dest: 'compile/'
+                }]
+            }
+        },
+        svgstore: {
+            options: {
+                prefix: 'icon-',
+                svg: {
+                    viewBox: '0 0 100 100',
+                    xmlns: 'http://www.w3.org/2000/svg'
+                },
+                cleanup: ['fill', 'stroke']
+            },
+            icons: {
+                files: {
+                    'src/img/icons/all.svg': ['compile/img/icons/*.svg'],
+                }
+            }
+        },
+        'string-replace': {
+            index: {
+                files: {
+                    'dist/index.html': 'src/index.html'
+                },
+                options: {
+                    replacements: [{
+                        pattern: /<!-- @import (.*?) -->/ig,
+                        replacement: function(match, p1) {
+                            return grunt.file.read('src/' + p1);
+                        }
+                    }]
+                }
+            }
+        },
+
+        // Styleguide
+
+        assemble: {
+            options: {
+                assets: 'dist',
+                layoutdir: 'src/styleguide/layouts',
+                layout: 'default.hbs',
+                partials: ['src/styleguide/blocks/**/*.hbs'],
+                helpers: [
+                    'handlebars-helper-compose',
+                    'src/styleguide/helpers/**/*.js'
+                ],
+                data: [
+                    'dist/manifest.json'
+                ],
+                flatten: true
+            },
+            styleguide: {
+                files: [{
+                    'dist/styleguide/': ['src/styleguide/*.hbs']
+                }]
+            }
+        },
+
+        // Development
+
+        connect: {
+            dev: {
+                options: {
+                    port: 8580,
+                    base: '.',
+                    keepalive: true
+                }
+            },
+            test: {
+                options: {
+                    port: 8581,
+                    base: '.'
+                }
+            }
+        },
+
+        // Utilities
+
+        watch: {
+            css: {
+                files: ['src/sass/**/*.scss'],
+                tasks: ['dist-css', 'offline-cache', 'dist-styleguide']
+            },
+            styleguide: {
+                files: ['src/styleguide/**/*.hbs', 'src/styleguide/**/*.js'],
+                tasks: ['dist-styleguide']
+            },
+            jsApp: {
+                files: ['src/js/**/*.js', 'src/*.html', 'src/tpl/**/*.html'],
+                tasks: ['dist-js-app']
+            },
+            jsUnitTest: {
+                files: ['test/unit/**/*-test.js', 'test/*.js'],
+                tasks: ['dist-js-unitTest']
+            },
+            jsIntegrationTest: {
+                files: ['test/integration/*-test.js', 'test/*.js'],
+                tasks: ['dist-js-integrationTest']
+            },
+            icons: {
+                files: ['src/index.html', 'src/img/icons/*.svg', '!src/img/icons/all.svg'],
+                tasks: ['svgmin', 'svgstore', 'string-replace', 'dist-styleguide', 'offline-cache']
+            },
+            lib: {
+                files: ['src/lib/**/*.js'],
+                tasks: ['copy:lib', 'offline-cache']
+            },
+            app: {
+                files: ['src/*.js', 'src/*.html', 'src/tpl/**/*.html', 'src/**/*.json', 'src/manifest.*', 'src/img/**/*', 'src/font/**/*'],
+                tasks: ['copy:app', 'copy:tpl', 'copy:img', 'copy:font', 'manifest-dev', 'offline-cache']
+            }
+        },
+
+        // Deployment
+
         compress: {
             main: {
                 options: {
@@ -220,37 +578,152 @@ module.exports = function(grunt) {
                 cwd: 'dist/',
                 src: ['**/*'],
                 dest: 'release/'
-            },
-            nodeWebkit: {
-                options: {
-                    mode: 'zip',
-                    archive: 'release/whiteout-mail_' + zipName + '.nw'
-                },
-                expand: true,
-                cwd: 'dist/',
-                src: ['**/*'],
-                dest: '/'
             }
         },
 
-        nodewebkit: {
+        // Offline caching
+
+        swPrecache: {
+            prod: {
+                handleFetch: true,
+                rootDir: 'dist'
+            }
+        },
+
+        manifest: {
+            generate: {
                 options: {
-                version: '0.9.2', // node-webkit version
+                    basePath: 'dist/',
-                build_dir: './release/node-webkit/', // Where the build version of my node-webkit app is saved
+                    timestamp: true,
-                mac: true, // We want to build it for mac
+                    hash: true,
-                win: false, // We want to build it for win
+                    cache: ['socket.io/socket.io.js'],
-                linux32: false, // We don't need linux32
+                    exclude: [
-                linux64: false, // We don't need linux64
+                        'appcache.manifest',
+                        'manifest.webapp',
+                        'manifest.mobile.json',
+                        'background.js',
+                        'service-worker.js',
+                        'styleguide/css/styleguide.min.css',
+                        'styleguide/index.html',
+                        'js/app.templates.js',
+                        'js/app.js.map',
+                        'js/app.min.js.map',
+                        'js/app.browserified.js',
+                        'js/app.browserified.js.map',
+                        'js/crypto/pbkdf2-worker.browserified.js',
+                        'js/pbkdf2-worker.browserified.js',
+                        'js/pbkdf2-worker.min.js.map',
+                        'js/read-sandbox.min.js.map',
+                        'js/mailreader-parser-worker.browserified.js',
+                        'js/mailreader-parser-worker.min.js.map',
+                        'js/tcp-socket-tls-worker.browserified.js',
+                        'js/tcp-socket-tls-worker.min.js.map',
+                        'js/browserbox-compression-worker.browserified.js',
+                        'js/browserbox-compression-worker.min.js.map',
+                        'img/icon-100-ios.png',
+                        'img/icon-114-ios.png',
+                        'img/icon-120-ios.png',
+                        'img/icon-128-chrome.png',
+                        'img/icon-144-android.png',
+                        'img/icon-144-ios.png',
+                        'img/icon-152-ios.png',
+                        'img/icon-180-ios.png',
+                        'img/icon-192-android.png',
+                        'img/icon-29-ios.png',
+                        'img/icon-36-android.png',
+                        'img/icon-40-ios.png',
+                        'img/icon-48-android.png',
+                        'img/icon-50-ios.png',
+                        'img/icon-57-ios.png',
+                        'img/icon-58-ios.png',
+                        'img/icon-60-android.png',
+                        'img/icon-60-ios.png',
+                        'img/icon-72-android.png',
+                        'img/icon-72-ios.png',
+                        'img/icon-76-ios.png',
+                        'img/icon-78-android.png',
+                        'img/icon-80-ios.png',
+                        'img/icon-87-ios.png',
+                        'img/icon-96-android.png',
+                        'img/Default-568h@2x~iphone.png',
+                        'img/Default-667h.png',
+                        'img/Default-736h.png',
+                        'img/Default-Landscape-736h.png',
+                        'img/Default-Landscape@2x~ipad.png',
+                        'img/Default-Landscape~ipad.png',
+                        'img/Default-Portrait@2x~ipad.png',
+                        'img/Default-Portrait~ipad.png',
+                        'img/Default@2x~iphone.png',
+                        'img/Default~iphone.png'
+                    ],
+                    master: ['index.html']
                 },
-            src: ['./dist/**/*'] // Your node-webkit app
+                src: ['**/*.*'],
+                dest: 'dist/appcache.manifest'
+            }
+        }
+
+    });
+
+    // generate service-worker stasks
+    grunt.registerMultiTask('swPrecache', function() {
+        var fs = require('fs');
+        var path = require('path');
+        var swPrecache = require('sw-precache');
+        var packageJson = require('./package.json');
+
+        var done = this.async();
+        var rootDir = this.data.rootDir;
+        var handleFetch = this.data.handleFetch;
+
+        generateServiceWorkerFileContents(rootDir, handleFetch, function(error, serviceWorkerFileContents) {
+            if (error) {
+                grunt.fail.warn(error);
+            }
+            fs.writeFile(path.join(rootDir, 'service-worker.js'), serviceWorkerFileContents, function(error) {
+                if (error) {
+                    grunt.fail.warn(error);
+                }
+                done();
+            });
+        });
+
+        function generateServiceWorkerFileContents(rootDir, handleFetch, callback) {
+            var config = {
+                cacheId: packageJson.name,
+                // If handleFetch is false (i.e. because this is called from swPrecache:dev), then
+                // the service worker will precache resources but won't actually serve them.
+                // This allows you to test precaching behavior without worry about the cache preventing your
+                // local changes from being picked up during the development cycle.
+                handleFetch: handleFetch,
+                logger: grunt.log.writeln,
+                dynamicUrlToDependencies: {
+                    'socket.io/socket.io.js': ['node_modules/socket.io/node_modules/socket.io-client/socket.io.js'],
                 },
+                staticFileGlobs: [
+                    rootDir + '/*.html',
+                    rootDir + '/tpl/*.html',
+                    rootDir + '/js/**/*.min.js',
+                    rootDir + '/css/**/*.css',
+                    rootDir + '/img/**/*.svg',
+                    rootDir + '/img/*-universal.png',
+                    rootDir + '/font/**.*',
+                    rootDir + '/*.json'
+                ],
+                maximumFileSizeToCacheInBytes: 100 * 1024 * 1024,
+                stripPrefix: path.join(rootDir, path.sep)
+            };
+
+            swPrecache(config, callback);
+        }
     });
 
     // Load the plugin(s)
+    grunt.loadNpmTasks('grunt-browserify');
+    grunt.loadNpmTasks('grunt-contrib-concat');
+    grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-connect');
     grunt.loadNpmTasks('grunt-contrib-jshint');
-    grunt.loadNpmTasks('grunt-contrib-qunit');
-    grunt.loadNpmTasks('grunt-mocha');
     grunt.loadNpmTasks('grunt-contrib-clean');
     grunt.loadNpmTasks('grunt-csso');
     grunt.loadNpmTasks('grunt-contrib-sass');
@@ -258,17 +731,50 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-watch');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-contrib-compress');
-    grunt.loadNpmTasks('grunt-node-webkit-builder');
+    grunt.loadNpmTasks('grunt-manifest');
+    grunt.loadNpmTasks('grunt-mocha-phantomjs');
+    grunt.loadNpmTasks('grunt-exorcise');
+    grunt.loadNpmTasks('grunt-string-replace');
+    grunt.loadNpmTasks('grunt-svgmin');
+    grunt.loadNpmTasks('grunt-svgstore');
+    grunt.loadNpmTasks('grunt-shell');
+    grunt.loadNpmTasks('grunt-angular-templates');
+    grunt.loadNpmTasks('assemble');
 
     // Build tasks
-    grunt.registerTask('dist-npm', ['copy:npm', 'copy:npmDev', 'copy:cryptoLib']);
+    grunt.registerTask('dist-css', ['sass:dist', 'autoprefixer:dist', 'csso:dist']);
-    grunt.registerTask('dist-css', ['sass', 'autoprefixer', 'csso']);
+    grunt.registerTask('dist-js', ['browserify', 'exorcise', 'ngtemplates', 'concat', 'uglify']);
+    grunt.registerTask('dist-js-app', [
+        'browserify:app',
+        'browserify:pbkdf2Worker',
+        'exorcise:app',
+        'ngtemplates',
+        'concat:app',
+        'concat:readSandbox',
+        'concat:pbkdf2Worker',
+        'offline-cache'
+    ]);
+    grunt.registerTask('dist-js-unitTest', [
+        'browserify:unitTest',
+        'exorcise:unitTest',
+        'concat:unitTest'
+    ]);
+    grunt.registerTask('dist-js-integrationTest', [
+        'browserify:integrationTest',
+        'exorcise:integrationTest',
+        'concat:integrationTest'
+    ]);
     grunt.registerTask('dist-copy', ['copy']);
-    grunt.registerTask('dist', ['clean', 'dist-npm', 'dist-css', 'dist-copy']);
+    grunt.registerTask('dist-assets', ['svgmin', 'svgstore', 'string-replace']);
+    grunt.registerTask('dist-styleguide', ['sass:styleguide', 'autoprefixer:styleguide', 'csso:styleguide', 'assemble:styleguide']);
+    // generate styleguide after manifest to forward version number to styleguide
+    grunt.registerTask('dist', ['clean:dist', 'shell', 'dist-css', 'dist-js', 'dist-assets', 'dist-copy', 'manifest', 'dist-styleguide']);
+
+    grunt.registerTask('offline-cache', ['manifest', 'swPrecache:prod']);
 
     // Test/Dev tasks
     grunt.registerTask('dev', ['connect:dev']);
-    grunt.registerTask('test', ['jshint', 'connect:test', 'mocha']);
+    grunt.registerTask('test', ['jshint', 'connect:test', 'mocha_phantomjs']);
     grunt.registerTask('prod', ['connect:prod']);
 
     //
@@ -278,12 +784,12 @@ module.exports = function(grunt) {
     grunt.registerTask('manifest-dev', function() {
         patchManifest({
             suffix: ' (DEV)',
-            version: '9999.9999.9999.9999'
+            version: '9999.9999.9999'
         });
     });
     grunt.registerTask('manifest-test', function() {
         if (!version) {
-            throw new Error('You must specify the version: "--release=1.0"');
+            throw new Error('You must specify the version: "--release=1.0.0"');
         }
 
         patchManifest({
@@ -293,13 +799,12 @@ module.exports = function(grunt) {
             deleteKey: true
         });
     });
-    grunt.registerTask('manifest-stable', function() {
+    grunt.registerTask('manifest-prod', function() {
         if (!version) {
-            throw new Error('You must specify the version: "--release=1.0"');
+            throw new Error('You must specify the version: "--release=1.0.0"');
         }
 
         patchManifest({
-            suffix: ' (Alpha)',
             version: version,
             deleteKey: true,
             keyServer: 'https://keys.whiteout.io/'
@@ -331,9 +836,9 @@ module.exports = function(grunt) {
         fs.writeFileSync(path, JSON.stringify(manifest, null, 2));
     }
 
-    grunt.registerTask('release-dev', ['dist', 'manifest-dev', 'compress']);
+    grunt.registerTask('release-dev', ['dist', 'manifest-dev', 'swPrecache:prod', 'compress']);
-    grunt.registerTask('release-test', ['dist', 'manifest-test', 'compress']);
+    grunt.registerTask('release-test', ['dist', 'manifest-test', 'clean:release', 'swPrecache:prod', 'compress']);
-    grunt.registerTask('release-stable', ['dist', 'manifest-stable', 'compress']);
+    grunt.registerTask('release-prod', ['dist', 'manifest-prod', 'clean:release', 'swPrecache:prod', 'compress']);
     grunt.registerTask('default', ['release-dev']);
 
 };

LICENSE.txt

@@ -1,6 +1,21 @@
-Copyright © 2013, Whiteout Networks GmbH. All rights reserved.
+The MIT License (MIT)
 
-The code is open for inspection and peer review by the security community.
+Copyright (c) 2014 Whiteout Networks GmbH.
-The code is currently not licensed under an open source license. If you're
+
-interested in contributing or getting a license, please get in touch with
+Permission is hereby granted, free of charge, to any person obtaining a copy
-us (info@whiteout.io).
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -1,66 +1,142 @@
-mail-html5 [![Build Status](https://travis-ci.org/whiteout-io/mail-html5.png)](https://travis-ci.org/whiteout-io/mail-html5)
+Whiteout Mail [![Build Status](https://travis-ci.org/whiteout-io/mail.svg?branch=master)](https://travis-ci.org/whiteout-io/mail)
 ==========
 
-Whiteout Mail is an easy to use email client with integrated OpenPGP encryption written in pure JavaScript. Download the official version under [whiteout.io](http://whiteout.io).
+Whiteout Mail is an easy to use email client with integrated OpenPGP encryption written in pure JavaScript. Download the official version under [whiteout.io](https://whiteout.io/#product).
+
+![Screenshot](https://whiteout.io/img/screens.png)
 
 ### Features
 
-You can read about product features and our future roadmap in our [FAQ](https://github.com/whiteout-io/mail-html5/wiki/FAQ).
+You can read about product features and our future roadmap in our [FAQ](https://github.com/whiteout-io/mail/wiki/FAQ).
 
 ### Privacy and Security
 
 We take the privacy of your data very seriously. Here are some of the technical details:
 
-* Messages are [encrypted end-to-end ](http://en.wikipedia.org/wiki/End-to-end_encryption) using the [OpenPGP](http://en.wikipedia.org/wiki/Pretty_Good_Privacy) standard. This means that only you and the recipient can read your mail. Your messages and private PGP key are stored encrypted on your computer and are never sent to our our servers.
+* The code has undergone a [full security audit](https://blog.whiteout.io/2015/06/11/whiteout-mail-1-0-and-security-audit-by-cure53/) by [Cure53](https://cure53.de).
 
-* Like most native email clients whiteout mail uses raw [TCP sockets](http://developer.chrome.com/apps/socket.html) to communicate directly with your mail server via IMAP/SMTP.
+* Messages are [encrypted end-to-end ](http://en.wikipedia.org/wiki/End-to-end_encryption) using the [OpenPGP](http://en.wikipedia.org/wiki/Pretty_Good_Privacy) standard. This means that only you and the recipient can read your mail. Your messages and private PGP key are stored only on your computer (in IndexedDB).
 
-* Mail server [SSL certificates are pinned](http://security.stackexchange.com/questions/29988/what-is-certificate-pinning) under [`src/ca/`](https://github.com/whiteout-io/mail-html5/tree/master/src/ca) in order to protect against SSL certificate forgery and other man in the middle attacks.
+* Users have the option to use [encrypted private key sync](https://github.com/whiteout-io/mail/wiki/Secure-OpenPGP-Key-Pair-Synchronization-via-IMAP) if they want to use Whiteout on multiple devices.
 
-* The app is deployed as a [Chrome Packaged App](https://developer.chrome.com/apps/about_apps.html) with [auditable static versions](https://github.com/whiteout-io/mail-html5/releases) in order to prevent [problems with host-based security](http://tonyarcieri.com/whats-wrong-with-webcrypto).
+* [Content Security Policy (CSP)](http://www.html5rocks.com/en/tutorials/security/content-security-policy/) is enforced to prevent injection attacks.
 
-* [Content Security Policy (CSP)](http://www.html5rocks.com/en/tutorials/security/content-security-policy/) is enforced to prevent against injection attacks.
+* HTML mails are sanitized with [DOMPurify](https://github.com/cure53/DOMPurify) and are rendered in a sandboxed iframe.
 
-* The code is still under heavy development and is not yet recommended for production use. That being said, we have done multiple code audits and penetration tests (which will be published regularly once all reported vulnerabilities are fixed).
+* Displaying mail images is optional and opt-in by default.
+
+* Like most native email clients, whiteout mail uses raw [TCP sockets](http://developer.chrome.com/apps/socket.html) to communicate directly with your mail server via IMAP/SMTP. TLS is used to protect your password and message data in transit.
+
+* The app is deployed as a signed [Chrome Packaged App](https://developer.chrome.com/apps/about_apps.html) with [auditable static versions](https://github.com/whiteout-io/mail/releases) in order to prevent [problems with host-based security](https://blog.whiteout.io/2014/04/13/heartbleed-and-javascript-crypto/).
+
+* The app can also be used from any modern web browser in environments where installing an app is not possible (e.g. a locked down corporate desktop). The IMAP/SMTP TLS sessions are still terminated in the user's browser using JS crypto ([Forge](https://github.com/digitalbazaar/forge)), but the encrypted TLS payload is proxied via [socket.io](http://socket.io/), due to the lack of raw sockets in the browser. **Please keep in mind that this mode of operation is not as secure as using the signed packaged app, since users must trust the webserver to deliver the correct code. This mode will still protect user against passive attacks like wiretapping (since PGP and TLS are still applied in the user's browser), but not against active attacks from the webserver. So it's best to decide which threat model applies to you.**
+
+### Architecture
+
+![client architecture](https://whiteout.io/img/app_layers.png)
 
 ### Reporting bugs and feature requests
 
-* We will launch a bug bounty program later on for independant security researchers. If you find any security vulnerabilities, don't hesitate to contact us [security@whiteout.io](mailto:security@whiteout.io).
+* We will launch a bug bounty program later on for independent security researchers. If you find any security vulnerabilities, don't hesitate to contact us [security@whiteout.io](mailto:security@whiteout.io).
 
-* You can also just create an [issue](https://github.com/whiteout-io/mail-html5/issues) on GitHub if you're missing a feature or just want to give us feedback. It would be much appreciated!
+* You can also just create an [issue](https://github.com/whiteout-io/mail/issues) on GitHub if you're missing a feature or just want to give us feedback. It would be much appreciated!
 
 ### Testing
 
-You can download a prebuilt bundle under [releases](https://github.com/whiteout-io/mail-html5/releases) or build your own from source (requires [node.js](http://nodejs.org/download/), [grunt](http://gruntjs.com/getting-started#installing-the-cli) and [sass](http://sass-lang.com/install)):
+You can download a prebuilt bundle under [releases](https://github.com/whiteout-io/mail/releases) or build your own from source (requires [node.js](http://nodejs.org/download/), [grunt](http://gruntjs.com/getting-started#installing-the-cli) and [sass](http://sass-lang.com/install)):
 
     npm install && npm test
 
-This will download all dependencies, run the tests and build the Chrome Packaged App bundle **DEV.zip** which can be installed under [chrome://extensions](chrome://extensions) in developer mode.
+This will download all dependencies, run the tests and build the Chrome Packaged App bundle **release/whiteout-mail_DEV.zip** which can be installed under [chrome://extensions](chrome://extensions) in developer mode.
 
 ### Development
 For development you can start a connect dev server:
 
     grunt dev
 
-Then visit [http://localhost:8580/dist/chrome.html#/desktop](http://localhost:8580/dist/chrome.html#/desktop) for front-end code or [http://localhost:8580/test/new-unit/](http://localhost:8580/test/new-unit/) to test JavaScript changes. You can also start a watch task so you don't have rebuild everytime you make a change:
+Then visit [http://localhost:8580/dist/#/account?dev=true](http://localhost:8580/dist/#/account?dev=true) for front-end code or [http://localhost:8580/test/unit/](http://localhost:8580/test/unit/) to test JavaScript changes. You can also start a watch task so you don't have rebuild everytime you make a change:
 
     grunt watch
 
+## Releasing Chrome App
+
+    grunt release-test --release=0.0.0.x
+    grunt release-stable --release=0.x.0
+
+## Deploying Web App & Selfhosting
+
+The App can be used either as a Chrome Packaged App or just by hosting it on your own trusted web server. You can build the app from source.
+
+### Build from source
+
+Clone the git repository
+
+    git clone https://github.com/whiteout-io/mail.git
+
+Build and generate the `dist/` directory:
+
+    npm install && grunt
+
+### Running the server
+
+To test the server, start it in development mode (without SSL):
+
+    node server.js --dev
+
+Navigate to [http://localhost:8889](http://localhost:8889) (or whatever port is set using the `PORT` environment variable).
+
+To start the server for production use (this automatically redirects to `https`)
+
+    npm start
+
+**A note on security: The app should not be used without SSL so it's best to set up a reverse proxy or Loadbalancer with your SSL certificates. If you are not sure how to do this it might be easier to use our managed web hosting or packaged apps under [https://whiteout.io/#product](https://whiteout.io/#product).**
+
+You can limit incoming and outgoing connections to the socket.io proxy by setting the following environment variables:
+
+    # the web socket proxy listens to this port
+    # if unset, defaults to 8889
+    PORT=12345
+
+    # the socket.io proxy accepts connections from these origins to tunnel them to tcp,
+    # separate with commas
+    # if unset, defaults to 'localhost:' + port
+    INBOUND_ORIGINS='foo:1234,bar:569'
+
+    # the socket.io proxy opens tcp connections with these ports to tunnel them to socket.io
+    # separate with commas
+    # if unset, defaults to '143,465,587,993' (25 is forbidden by default)
+    OUTBOUND_PORTS='123,456,789'
+
+To start the server in development mode (no forced HTTPS, iframe loads http content), run `node server.js --dev`
+
 ## License
 
-    Copyright © 2013, Whiteout Networks GmbH. All rights reserved.
+    The MIT License (MIT)
 
-    The code is open for inspection and peer review by the security community.
+    Copyright (c) 2014 Whiteout Networks GmbH.
-    The code is currently not licensed under an open source license. If you're
+
-    interested in contributing or getting a license, please get in touch with
+    Permission is hereby granted, free of charge, to any person obtaining a copy
-    us (info@whiteout.io).
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
 
 ### Third party libraries
 
 We work together with existing open source projects wherever possible and contribute any changes we make back upstream. Many of theses libraries are licensed under an open source license. Here are some of them:
 
-* [OpenPGP.js](http://openpgpjs.org): An implementation of OpenPGP in Javascript
+* [OpenPGP.js](http://openpgpjs.org) (LGPL license): An implementation of OpenPGP in Javascript
-* [Inbox](https://github.com/andris9/inbox): Simple IMAP client for node.js
+* [email.js](http://emailjs.org) (MIT license): IMAP, SMTP, MIME-building and MIME-parsing engine
-* [Nodemailer](http://www.nodemailer.com): SMTP client for node.js
+* [Forge](https://github.com/digitalbazaar/forge) (BSD license): An implementation of TLS in JavaScript
-* [Forge](https://github.com/digitalbazaar/forge): An implementation of TLS in Javascript
-* [node-shims](https://github.com/whiteout-io/node-shims): Shims for wrapping node's net/tls (TCP socket) APIs around chrome.socket

config/default.js

@@ -0,0 +1,19 @@
+'use strict';
+
+var port = process.env.PORT || 8889;
+
+module.exports = {
+    server: {
+        port: port,
+        inboundOrigins: (process.env.INBOUND_ORIGINS || ('localhost:' + port)).split(',').map(function(host) {
+            return host.trim();
+        }),
+        outboundPorts: (process.env.OUTBOUND_PORTS || '143,465,587,993').split(',').map(function(i) {
+            return parseInt(i, 10);
+        })
+    },
+    log: {
+        level: "silly",
+        http: ':remote-addr [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer"'
+    }
+};

config/integration.js

@@ -0,0 +1,10 @@
+'use strict';
+
+module.exports = {
+    server: {
+        port: 8889
+    },
+    log: {
+        level: "error"
+    }
+};

config/production.js

@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports = {
+    log: {
+        level: "error"
+    }
+};

package.json

@@ -1,39 +1,68 @@
 {
-    "name": "mail-html5",
+  "name": "whiteout-mail",
-    "version": "0.1.0-dev",
+  "description": "Mail App with integrated OpenPGP encryption.",
+  "author": "Whiteout Networks",
+  "homepage": "https://whiteout.io",
   "engines": {
-        "node": ">=0.8"
+    "node": ">=0.10"
   },
   "scripts": {
-        "postinstall": "grunt dist-npm",
+    "test": "grunt && grunt test",
-        "test": "grunt test && grunt",
+    "start": "node server.js"
-        "start": "grunt && grunt dev"
   },
   "dependencies": {
-        "crypto-lib": "https://github.com/whiteout-io/crypto-lib/tarball/v0.1.0",
+    "compression": "^1.0.11",
-        "imap-client": "https://github.com/whiteout-io/imap-client/tarball/v0.1.0",
+    "config": "^1.0.2",
-        "mailreader": "https://github.com/whiteout-io/mailreader/tarball/v0.1.0",
+    "express": "^4.8.3",
-        "pgpmailer": "https://github.com/whiteout-io/pgpmailer/tarball/v0.1.0",
+    "morgan": "^1.2.3",
-        "pgpbuilder": "https://github.com/whiteout-io/pgpbuilder/tarball/v0.1.0",
+    "npmlog": "^0.1.1",
-        "requirejs": "2.1.10"
+    "socket.io": "^1.0.6"
   },
   "devDependencies": {
-        "angular": "https://github.com/angular/angular.js/tarball/v1.2.8",
+    "assemble": "~0.4.42",
+    "axe-logger": "~0.0.2",
+    "browsercrow": "https://github.com/whiteout-io/browsercrow/tarball/master",
+    "browsersmtp": "https://github.com/whiteout-io/browsersmtp/tarball/master",
+    "chai": "~1.9.2",
+    "crypto-lib": "~0.2.1",
+    "dompurify": "~0.7.3",
     "grunt": "~0.4.1",
-        "mocha": "~1.13.0",
+    "grunt-angular-templates": "~0.5.7",
-        "chai": "~1.7.2",
+    "grunt-autoprefixer": "~0.7.2",
-        "sinon": "~1.7.3",
+    "grunt-browserify": "3.7.0",
-        "grunt-contrib-connect": "~0.5.0",
+    "insert-module-globals": "6.5.0",
-        "grunt-contrib-jshint": "~0.6.4",
-        "grunt-contrib-qunit": "~0.2.2",
-        "grunt-mocha": "~0.4.1",
     "grunt-contrib-clean": "~0.5.0",
-        "grunt-csso": "~0.5.0",
-        "grunt-contrib-sass": "~0.5.0",
-        "grunt-autoprefixer": "~0.3.0",
-        "grunt-contrib-watch": "~0.5.3",
-        "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-compress": "~0.5.2",
-        "grunt-node-webkit-builder": "~0.1.17"
+    "grunt-contrib-concat": "^0.5.0",
+    "grunt-contrib-connect": "~0.5.0",
+    "grunt-contrib-copy": "~0.4.1",
+    "grunt-contrib-jshint": "~0.6.4",
+    "grunt-contrib-sass": "~0.7.3",
+    "grunt-contrib-uglify": "^0.6.0",
+    "grunt-contrib-watch": "~0.5.3",
+    "grunt-csso": "~0.6.1",
+    "grunt-exorcise": "^0.2.0",
+    "grunt-manifest": "^0.4.0",
+    "grunt-mocha-phantomjs": "^0.7.0",
+    "grunt-shell": "~1.1.1",
+    "grunt-string-replace": "~1.0.0",
+    "grunt-svgmin": "~1.0.0",
+    "grunt-svgstore": "~0.3.4",
+    "handlebars-helper-compose": "~0.2.12",
+    "iframe-resizer": "^2.8.3",
+    "imap-client": "~0.14.2",
+    "jquery": "~2.1.1",
+    "mailbuild": "^0.3.7",
+    "mailreader": "~0.4.0",
+    "mocha": "^1.21.4",
+    "ng-infinite-scroll": "~1.1.2",
+    "openpgp": "^1.0.0",
+    "pgpbuilder": "~0.6.0",
+    "pgpmailer": "~0.9.1",
+    "sinon": "~1.7.3",
+    "sw-precache": "^1.3.0",
+    "tcp-socket": "~0.5.0",
+    "time-grunt": "^1.0.0",
+    "wo-smtpclient": "~0.6.0"
   }
 }

res/Glyphicons License.txt

@@ -1,21 +0,0 @@
-THANK YOU FOR USING GLYPHICONS!
-
-If you would like to be among the first ones to hear about all the news, follow @glyphicons on Twitter.
-
-LICENSE:
-------------------- 
-GLYPHICONS FREE are released under the Creative Commons Attribution 3.0 Unported (CC BY 3.0). The Glyphicons FREE can be used both commercially and for personal use, but you must always add a link to www.glyphicons.com in a prominent place (e.g. the footer of a website), include the CC-BY license and the reference to www.glyphicons.com on every page using Glyphicons.
-
-Glyphicons Halflings are also a part of Bootstrap by Twitter, and are released under the same Apache 2.0 license as Bootstrap. While you are not required to include attribution on your Bootstrap-based projects, I'd certainly appreciate a visibile link back to glyphicons.com in any place you find appropriate (footer, docs, etc).
-
-All logos and trademarks in social icons are the property of the respective trademark owners.®
-
-CONTACT:
--------------------
-Web: http://glyphicons.com/
-Email: glyphicons@gmail.com
-Twitter: http://twitter.com/glyphicons
-
-If you want to use the icons without restrictions, please buy any version on www.glyphicons.com, thank you.
-
-Jan Kovařík

res/android-release-keys.properties

@@ -0,0 +1,2 @@
+storeFile=/Users/tanx/.keystore
+keyAlias=mykey

res/aws_release.sh

@@ -0,0 +1,45 @@
+#!/bin/sh
+
+# go to root
+cd `dirname $0`
+cd ..
+
+if [ "$#" -ne 3 ] || [ "$1" != "prod" ] && [ "$1" != "test" ] ; then
+    echo 'Usage: ./res/aws_release prod|test from-branch 1.0.0'
+    exit 0
+fi
+
+# switch branch
+git checkout $2
+git branch -D release/$1
+git checkout -b release/$1
+git merge $2 --no-edit
+
+# abort if tests fail
+set -e
+
+# build and test
+rm -rf node_modules/
+npm cache clear
+npm install
+npm test
+grunt release-$1 --release=$3
+
+# install only production dependencies
+rm -rf node_modules/
+npm install --production
+
+# delete .gitignore files before adding to git for aws deployment
+find node_modules/ -name ".gitignore" -exec rm -rf {} \;
+
+# Add runtime dependencies to git
+sed -i "" '/dist/d' .gitignore
+sed -i "" '/node_modules/d' .gitignore
+git add .gitignore node_modules/ dist/
+git commit -m "Update release"
+
+# push to aws
+eb deploy
+
+# switch back to $2 branch
+git checkout $2

res/cca_build.sh

@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# reads values from JSON
+jsonValue() {
+  KEY=$1
+  num=$2
+  awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/'$KEY'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p
+}
+
+# go to root
+cd `dirname $0`
+cd ..
+
+DIR=release/cca
+PROJNAME=`less dist/manifest.json | jsonValue name 1 | sed -e 's/^ *//' -e 's/ *$//'`
+
+# create
+rm -rf $DIR
+mkdir -p $DIR
+cca create $DIR/Whiteout --link-to=dist/manifest.json
+
+#prepare
+cd $DIR/Whiteout
+cca prepare
+
+# 
+# post-build tweaks
+# 
+
+echo ""
+echo "## Running post-build tweaks"
+
+# cp signing config
+echo "Copy Android signing config"
+cp ../../../res/android-release-keys.properties .
+
+# status bar should not overlay the web view
+echo "Tweaking iOS status bar to not overlay the web view"
+sed -i "" 's/StatusBarOverlaysWebView" value="true"/StatusBarOverlaysWebView" value="false"/' "platforms/ios/$PROJNAME/config.xml"
+
+# status bar should use dark font on light background
+echo "Tweaking iOS status bar to use dark font on light background"
+sed -i "" 's/StatusBarStyle" value="lightcontent"/StatusBarStyle" value="darkcontent"/' "platforms/ios/$PROJNAME/config.xml"
+
+# copy splash screens
+echo "Copying splash screens"
+cp ../../../src/img/Default* "platforms/ios/$PROJNAME/Resources/splash"
+
+# fixing missing/wrong icons
+echo "Fixing wrong/missing iOS icons"
+cp ../../../src/img/icon-40-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-40.png"
+cp ../../../src/img/icon-80-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-40@2x.png"
+cp ../../../src/img/icon-120-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-40@3x.png"
+cp ../../../src/img/icon-50-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-50.png"
+cp ../../../src/img/icon-100-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-50@2x.png"
+cp ../../../src/img/icon-60-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-60.png"
+cp ../../../src/img/icon-120-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-60@2x.png"
+cp ../../../src/img/icon-180-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-60@3x.png"
+cp ../../../src/img/icon-72-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-72.png"
+cp ../../../src/img/icon-144-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-72@2x.png"
+cp ../../../src/img/icon-76-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-76.png"
+cp ../../../src/img/icon-152-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-76@2x.png"
+cp ../../../src/img/icon-29-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-small.png"
+cp ../../../src/img/icon-58-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-small@2x.png"
+cp ../../../src/img/icon-87-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-small@3x.png"
+cp ../../../src/img/icon-57-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon.png"
+cp ../../../src/img/icon-114-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon@2x.png"
+
+# print reminder for manual work in xcode
+echo ""
+echo "### Reminder for manual steps required for iOS release"
+echo "### Change deployment target to iOS 8.1"
+echo "### Add retina icons to build, migrate to icon set, fix splash screens config"

res/cca_release_android.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# go to root
+cd `dirname $0`
+cd ..
+
+DIR=release/cca
+
+#prepare
+cd $DIR/Whiteout
+cca build android --release

res/cca_run_android.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# go to root
+cd `dirname $0`
+cd ..
+
+cd release/cca/Whiteout
+cca run android --device

res/cca_run_ios.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# go to root
+cd `dirname $0`
+cd ..
+
+cd release/cca/Whiteout
+cca run ios