From 8165416c5deea402832df63eb1747db621c3207d Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Sun, 13 Dec 2015 16:53:09 +0700 Subject: [PATCH 1/5] Rename repo to mail --- .elasticbeanstalk/config.yml | 6 +++--- package.json | 15 --------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/.elasticbeanstalk/config.yml b/.elasticbeanstalk/config.yml index b19dc9e..46b687e 100644 --- a/.elasticbeanstalk/config.yml +++ b/.elasticbeanstalk/config.yml @@ -1,10 +1,10 @@ branch-defaults: release/prod: - environment: mail-html5-prod + environment: mail-prod release/test: - environment: mail-html5-test + environment: mail-test global: - application_name: mail-html5 + application_name: mail default_ec2_keyname: null default_platform: Node.js default_region: eu-central-1 diff --git a/package.json b/package.json index 65aba8f..01a4804 100644 --- a/package.json +++ b/package.json @@ -3,21 +3,6 @@ "description": "Mail App with integrated OpenPGP encryption.", "author": "Whiteout Networks", "homepage": "https://whiteout.io", - "repository": { - "type": "git", - "url": "https://github.com/whiteout-io/mail-html5.git" - }, - "keywords": [ - "email", - "mail", - "client", - "app", - "openpgp", - "pgp", - "gpg", - "imap", - "smtp" - ], "engines": { "node": ">=0.10" }, From 8b36a719c373cbb567a38b1e1d04b03431537ad5 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Mon, 14 Dec 2015 10:30:25 +0700 Subject: [PATCH 2/5] Use faster container based travis builds, remove whiteout build email notification from travis --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 367d039..839b29f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,7 @@ +sudo: false language: node_js node_js: - "0.12" before_install: - gem install sass - npm install -g grunt-cli -notifications: - email: - - build@whiteout.io From 853be194d9084e56586cac7ff91049f3105f6569 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Thu, 17 Dec 2015 09:50:06 +0700 Subject: [PATCH 3/5] Fix dompurify build and upgrade to new version --- Gruntfile.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 86c2cd9..bc4fe2f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -307,7 +307,7 @@ module.exports = function(grunt) { }, readSandbox: { src: [ - 'node_modules/dompurify/purify.js', + 'node_modules/dompurify/src/purify.js', 'node_modules/iframe-resizer/js/iframeResizer.contentWindow.min.js', 'src/js/controller/app/read-sandbox.js' ], diff --git a/package.json b/package.json index 01a4804..9a182f6 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "browsersmtp": "https://github.com/whiteout-io/browsersmtp/tarball/master", "chai": "~1.9.2", "crypto-lib": "~0.2.1", - "dompurify": "~0.6.3", + "dompurify": "~0.7.3", "grunt": "~0.4.1", "grunt-angular-templates": "~0.5.7", "grunt-autoprefixer": "~0.7.2", From 137c8c7c2421ae9558c6898a7b19520315314b44 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Thu, 17 Dec 2015 16:00:49 +0700 Subject: [PATCH 4/5] Update links in readme --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 42c7707..e4b7951 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Whiteout Mail [![Build Status](https://travis-ci.org/whiteout-io/mail-html5.svg?branch=master)](https://travis-ci.org/whiteout-io/mail-html5) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/whiteout-io/mail-html5?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +Whiteout Mail [![Build Status](https://travis-ci.org/whiteout-io/mail.svg?branch=master)](https://travis-ci.org/whiteout-io/mail) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/whiteout-io/mail?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ========== 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). @@ -7,7 +7,7 @@ Whiteout Mail is an easy to use email client with integrated OpenPGP encryption ### 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 @@ -17,7 +17,7 @@ We take the privacy of your data very seriously. Here are some of the technical * 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). -* Users have the option to use [encrypted private key sync](https://github.com/whiteout-io/mail-html5/wiki/Secure-OpenPGP-Key-Pair-Synchronization-via-IMAP) if they want to use Whiteout on multiple devices. +* 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. * [Content Security Policy (CSP)](http://www.html5rocks.com/en/tutorials/security/content-security-policy/) is enforced to prevent injection attacks. @@ -27,7 +27,7 @@ We take the privacy of your data very seriously. Here are some of the technical * 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-html5/releases) in order to prevent [problems with host-based security](https://blog.whiteout.io/2014/04/13/heartbleed-and-javascript-crypto/). +* 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.** @@ -39,11 +39,11 @@ We take the privacy of your data very seriously. Here are some of the technical * 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 From b05aeea34250b63434008a96d57bfa678a49a281 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Thu, 17 Dec 2015 16:02:55 +0700 Subject: [PATCH 5/5] Remove gitter link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e4b7951..e049f5d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Whiteout Mail [![Build Status](https://travis-ci.org/whiteout-io/mail.svg?branch=master)](https://travis-ci.org/whiteout-io/mail) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/whiteout-io/mail?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +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](https://whiteout.io/#product).