v2.2.0

Localization authors:
- Arash Mousavi <mousavi.arash@gmail.com>

app/experiments.js

@@ -1,10 +1,10 @@
 import hash from 'string-hash';
 
 const experiments = {
-  'SyI-hI7gT9agiH-f3f0BYg': {
+  XnN0idVWSxO6A0kiNkxzGw: {
-    id: 'SyI-hI7gT9agiH-f3f0BYg',
+    id: 'XnN0idVWSxO6A0kiNkxzGw',
     run: function(variant, state, emitter) {
-      state.promo = variant === 1 ? 'body' : 'header';
+      state.promo = variant === 1 ? 'blue' : 'grey';
       emitter.emit('render');
     },
     eligible: function() {

app/fileManager.js

@@ -97,6 +97,13 @@ export default function(state, emitter) {
     lastRender = Date.now();
   });
 
+  emitter.on('changeLimit', async ({ file, value }) => {
+    await FileSender.changeLimit(file.id, file.ownerToken, value);
+    file.dlimit = value;
+    state.storage.writeFiles();
+    metrics.changedDownloadLimit(file);
+  });
+
   emitter.on('delete', async ({ file, location }) => {
     try {
       metrics.deletedUpload({
@@ -108,7 +115,7 @@ export default function(state, emitter) {
         location
       });
       state.storage.remove(file.id);
-      await FileSender.delete(file.id, file.deleteToken);
+      await FileSender.delete(file.id, file.ownerToken);
     } catch (e) {
       state.raven.captureException(e);
     }

app/fileReceiver.js

@@ -116,7 +116,8 @@ export default class FileReceiver extends Nanobus {
     // TODO
   }
 
-  fetchMetadata(sig) {
+  async fetchMetadata(nonce) {
+    const authHeader = await this.getAuthHeader(nonce);
     return new Promise((resolve, reject) => {
       const xhr = new XMLHttpRequest();
       xhr.onreadystatechange = () => {
@@ -126,13 +127,15 @@ export default class FileReceiver extends Nanobus {
           if (xhr.status === 200) {
             return resolve(xhr.response);
           }
-          reject(new Error(xhr.status));
+          const err = new Error(xhr.status);
+          err.nonce = nonce;
+          reject(err);
         }
       };
       xhr.onerror = () => reject(new Error(0));
       xhr.ontimeout = () => reject(new Error(0));
       xhr.open('get', `/api/metadata/${this.file.id}`);
-      xhr.setRequestHeader('Authorization', `send-v1 ${arrayToB64(sig)}`);
+      xhr.setRequestHeader('Authorization', authHeader);
       xhr.responseType = 'json';
       xhr.timeout = 2000;
       xhr.send();
@@ -140,16 +143,18 @@ export default class FileReceiver extends Nanobus {
   }
 
   async getMetadata(nonce) {
+    let data = null;
     try {
-      const authKey = await this.authKeyPromise;
+      try {
-      const sig = await window.crypto.subtle.sign(
+        data = await this.fetchMetadata(nonce);
-        {
+      } catch (e) {
-          name: 'HMAC'
+        if (e.message === '401' && nonce !== e.nonce) {
-        },
+          // allow one retry for changed nonce
-        authKey,
+          data = await this.fetchMetadata(e.nonce);
-        b64ToArray(nonce)
+        } else {
-      );
+          throw e;
-      const data = await this.fetchMetadata(new Uint8Array(sig));
+        }
+      }
       const metaKey = await this.metaKeyPromise;
       const json = await window.crypto.subtle.decrypt(
         {
@@ -174,7 +179,8 @@ export default class FileReceiver extends Nanobus {
     }
   }
 
-  downloadFile(sig) {
+  async downloadFile(nonce) {
+    const authHeader = await this.getAuthHeader(nonce);
     return new Promise((resolve, reject) => {
       const xhr = new XMLHttpRequest();
 
@@ -190,9 +196,10 @@ export default class FileReceiver extends Nanobus {
           reject(new Error('notfound'));
           return;
         }
-
         if (xhr.status !== 200) {
-          return reject(new Error(xhr.status));
+          const err = new Error(xhr.status);
+          err.nonce = xhr.getResponseHeader('WWW-Authenticate').split(' ')[1];
+          return reject(err);
         }
 
         const blob = new Blob([xhr.response]);
@@ -205,26 +212,39 @@ export default class FileReceiver extends Nanobus {
       };
 
       xhr.open('get', this.url);
-      xhr.setRequestHeader('Authorization', `send-v1 ${arrayToB64(sig)}`);
+      xhr.setRequestHeader('Authorization', authHeader);
       xhr.responseType = 'blob';
       xhr.send();
     });
   }
 
+  async getAuthHeader(nonce) {
+    const authKey = await this.authKeyPromise;
+    const sig = await window.crypto.subtle.sign(
+      {
+        name: 'HMAC'
+      },
+      authKey,
+      b64ToArray(nonce)
+    );
+    return `send-v1 ${arrayToB64(new Uint8Array(sig))}`;
+  }
+
   async download(nonce) {
     this.state = 'downloading';
     this.emit('progress', this.progress);
     try {
       const encryptKey = await this.encryptKeyPromise;
-      const authKey = await this.authKeyPromise;
+      let ciphertext = null;
-      const sig = await window.crypto.subtle.sign(
+      try {
-        {
+        ciphertext = await this.downloadFile(nonce);
-          name: 'HMAC'
+      } catch (e) {
-        },
+        if (e.message === '401' && nonce !== e.nonce) {
-        authKey,
+          ciphertext = await this.downloadFile(e.nonce);
-        b64ToArray(nonce)
+        } else {
-      );
+          throw e;
-      const ciphertext = await this.downloadFile(new Uint8Array(sig));
+        }
+      }
       this.msg = 'decryptingFile';
       this.emit('decrypting');
       const plaintext = await window.crypto.subtle.decrypt(

app/fileSender.js

@@ -1,6 +1,17 @@
 import Nanobus from 'nanobus';
 import { arrayToB64, b64ToArray, bytes } from './utils';
 
+async function getAuthHeader(authKey, nonce) {
+  const sig = await window.crypto.subtle.sign(
+    {
+      name: 'HMAC'
+    },
+    authKey,
+    b64ToArray(nonce)
+  );
+  return `send-v1 ${arrayToB64(new Uint8Array(sig))}`;
+}
+
 export default class FileSender extends Nanobus {
   constructor(file) {
     super('FileSender');
@@ -35,7 +46,26 @@ export default class FileSender extends Nanobus {
         }
       };
 
-      xhr.send(JSON.stringify({ delete_token: token }));
+      xhr.send(JSON.stringify({ owner_token: token }));
+    });
+  }
+
+  static changeLimit(id, owner_token, dlimit) {
+    return new Promise((resolve, reject) => {
+      if (!id || !owner_token) {
+        return reject();
+      }
+      const xhr = new XMLHttpRequest();
+      xhr.open('POST', `/api/params/${id}`);
+      xhr.setRequestHeader('Content-Type', 'application/json');
+
+      xhr.onreadystatechange = () => {
+        if (xhr.readyState === XMLHttpRequest.DONE) {
+          resolve();
+        }
+      };
+
+      xhr.send(JSON.stringify({ owner_token, dlimit }));
     });
   }
 
@@ -100,7 +130,7 @@ export default class FileSender extends Nanobus {
               url: responseObj.url,
               id: responseObj.id,
               secretKey: arrayToB64(this.rawSecret),
-              deleteToken: responseObj.delete,
+              ownerToken: responseObj.owner,
               nonce
             });
           }
@@ -229,13 +259,7 @@ export default class FileSender extends Nanobus {
       true,
       ['sign']
     );
-    const sig = await window.crypto.subtle.sign(
+    const authHeader = await getAuthHeader(authKey, file.nonce);
-      {
-        name: 'HMAC'
-      },
-      authKey,
-      b64ToArray(file.nonce)
-    );
     const pwdKey = await window.crypto.subtle.importKey(
       'raw',
       encoder.encode(password),
@@ -278,10 +302,7 @@ export default class FileSender extends Nanobus {
       xhr.onerror = () => reject(new Error(0));
       xhr.ontimeout = () => reject(new Error(0));
       xhr.open('post', `/api/password/${file.id}`);
-      xhr.setRequestHeader(
+      xhr.setRequestHeader('Authorization', authHeader);
-        'Authorization',
-        `send-v1 ${arrayToB64(new Uint8Array(sig))}`
-      );
       xhr.setRequestHeader('Content-Type', 'application/json');
       xhr.responseType = 'json';
       xhr.timeout = 2000;

app/main.js

@@ -1,3 +1,4 @@
+import 'fluent-intl-polyfill';
 import app from './routes';
 import locale from '../common/locales';
 import fileManager from './fileManager';

app/metrics.js

@@ -205,6 +205,16 @@ function stoppedUpload(params) {
   });
 }
 
+function changedDownloadLimit(params) {
+  return sendEvent('sender', 'download-limit-changed', {
+    cm1: params.size,
+    cm5: storage.totalUploads,
+    cm6: storage.files.length,
+    cm7: storage.totalDownloads,
+    cm8: params.dlimit
+  });
+}
+
 function completedDownload(params) {
   return sendEvent('recipient', 'download-stopped', {
     cm1: params.size,
@@ -272,6 +282,7 @@ export {
   cancelledUpload,
   stoppedUpload,
   completedUpload,
+  changedDownloadLimit,
   deletedUpload,
   startedDownload,
   cancelledDownload,

app/routes/index.js

@@ -10,7 +10,7 @@ const app = choo();
 function body(template) {
   return function(state, emit) {
     const b = html`<body>
-      ${state.promo === 'header' ? fxPromo(state, emit) : ''}
+      ${state.promo ? fxPromo(state, emit) : ''}
       ${header(state)}
       <div class="all">
         <noscript>

app/templates/completed.js

@@ -1,7 +1,6 @@
 const html = require('choo/html');
 const progress = require('./progress');
 const { fadeOut } = require('../utils');
-const fxPromo = require('./fxPromo');
 
 module.exports = function(state, emit) {
   const div = html`
@@ -21,7 +20,6 @@ module.exports = function(state, emit) {
       sendNew
     }>${state.translate('sendYourFilesLink')}</a>
   </div>
-  ${state.promo === 'body' ? fxPromo(state, emit) : ''}
   </div>
   `;
 

app/templates/download.js

@@ -1,9 +1,8 @@
 const html = require('choo/html');
 const progress = require('./progress');
 const { bytes } = require('../utils');
-const fxPromo = require('./fxPromo');
 
-module.exports = function(state, emit) {
+module.exports = function(state) {
   const transfer = state.transfer;
   const div = html`
   <div id="page-one">
@@ -24,7 +23,6 @@ module.exports = function(state, emit) {
       )}</div>
     </div>
     </div>
-    ${state.promo === 'body' ? fxPromo(state, emit) : ''}
   </div>
   `;
 

app/templates/file.js

@@ -18,7 +18,9 @@ module.exports = function(file, state, emit) {
   const remaining = timeLeft(ttl) || state.translate('linkExpiredAlt');
   const row = html`
   <tr id="${file.id}">
-    <td class="overflow-col" title="${file.name}">${file.name}</td>
+    <td class="overflow-col" title="${
+      file.name
+    }"><a class="link" href="/share/${file.id}">${file.name}</a></td>
     <td class="center-col">
       <img onclick=${copyClick} src="${assets.get(
     'copy-16.svg'

app/templates/footer.js

@@ -18,6 +18,9 @@ module.exports = function(state) {
       <a href="https://www.mozilla.org/privacy/websites/#cookies">${state.translate(
         'footerLinkCookies'
       )}</a>
+      <a href="https://www.mozilla.org/about/legal/report-infringement/">${state.translate(
+        'reportIPInfringement'
+      )}</a>
     </div>
     <div class="social-links">
       <a href="https://github.com/mozilla/send" role="presentation"><img class="github" src="${assets.get(

app/templates/fxPromo.js

@@ -19,8 +19,10 @@ module.exports = function(state, emit) {
     emit('exit', evt);
   }
 
+  const classes = state.promo === 'blue' ? 'banner banner-blue' : 'banner';
+
   return html`
-    <div class="banner">
+    <div class="${classes}">
       <div>
         <img
         src="${assets.get('firefox_logo-only.svg')}"

app/templates/header.js

@@ -1,5 +1,16 @@
 const html = require('choo/html');
 const assets = require('../../common/assets');
+/*
+  The current weback config uses package.json to generate
+  version.json for /__version__ meaning `require` returns the
+  string 'version.json' in the frontend context but the json
+  on the server.
+
+  We want `version` to be constant at build time so this file
+  has a custom loader (/build/version_loader.js) just to replace
+  string with the value from package.json. 🤢
+*/
+const version = require('../../package.json').version || 'VERSION';
 
 module.exports = function(state) {
   return html`<header class="header">
@@ -14,8 +25,9 @@ module.exports = function(state) {
       <div>${state.translate('siteSubtitle')}</div>
     </div>
   </div>
-  <a href="https://qsurvey.mozilla.com/s3/txp-firefox-send" rel="noreferrer noopener" class="feedback" target="_blank">${state.translate(
+  <a href="https://qsurvey.mozilla.com/s3/txp-firefox-send?ver=${version}"
-    'siteFeedback'
+    rel="noreferrer noopener"
-  )}</a>
+    class="feedback"
+    target="_blank">${state.translate('siteFeedback')}</a>
 </header>`;
 };

app/templates/preview.js

@@ -3,7 +3,6 @@ const assets = require('../../common/assets');
 const notFound = require('./notFound');
 const downloadPassword = require('./downloadPassword');
 const { bytes } = require('../utils');
-const fxPromo = require('./fxPromo');
 
 function getFileFromDOM() {
   const el = document.getElementById('dl-file');
@@ -62,7 +61,6 @@ module.exports = function(state, emit) {
       </div>
       <a class="send-new" href="/">${state.translate('sendYourFilesLink')}</a>
     </div>
-    ${state.promo === 'body' ? fxPromo(state, emit) : ''}
   </div>
   `;
 

app/templates/selectbox.js

@@ -0,0 +1,56 @@
+const html = require('choo/html');
+
+module.exports = function(selected, options, translate, changed) {
+  const id = `select-${Math.random()}`;
+  let x = selected;
+
+  function close() {
+    const ul = document.getElementById(id);
+    const body = document.querySelector('body');
+    ul.classList.remove('active');
+    body.removeEventListener('click', close);
+  }
+
+  function toggle(event) {
+    event.stopPropagation();
+    const ul = document.getElementById(id);
+    if (ul.classList.contains('active')) {
+      close();
+    } else {
+      ul.classList.add('active');
+      const body = document.querySelector('body');
+      body.addEventListener('click', close);
+    }
+  }
+
+  function choose(event) {
+    event.stopPropagation();
+    const target = event.target;
+    const value = +target.dataset.value;
+    target.parentNode.previousSibling.firstElementChild.textContent = translate(
+      value
+    );
+    if (x !== value) {
+      x = value;
+      changed(value);
+    }
+    close();
+  }
+  return html`
+    <div class="selectbox">
+      <div onclick=${toggle}>
+        <span class="link">${translate(selected)}</span>
+        <svg width="32" height="32">
+          <polygon points="8 18 17 28 26 18" fill="#0094fb"/>
+        </svg>
+      </div>
+      <ul id="${id}" class="selectOptions">
+        ${options.map(
+          i =>
+            html`<li class="selectOption" onclick=${choose} data-value="${i}">${
+              i
+            }</li>`
+        )}
+      </ul>
+    </div>`;
+};

app/templates/share.js

@@ -2,6 +2,7 @@ const html = require('choo/html');
 const assets = require('../../common/assets');
 const notFound = require('./notFound');
 const uploadPassword = require('./uploadPassword');
+const selectbox = require('./selectbox');
 const { allowedCopy, delay, fadeOut } = require('../utils');
 
 function passwordComplete(state, password) {
@@ -14,6 +15,24 @@ function passwordComplete(state, password) {
   return el;
 }
 
+function expireInfo(file, translate, emit) {
+  const el = html([
+    `<div>${translate('expireInfo', {
+      downloadCount: '<select></select>',
+      timespan: translate('timespanHours', { num: 24 })
+    })}</div>`
+  ]);
+  const select = el.querySelector('select');
+  const options = [1, 2, 3, 4, 5, 20];
+  const t = num => translate('downloadCount', { num });
+  const changed = value => emit('changeLimit', { file, value });
+  select.parentNode.replaceChild(
+    selectbox(file.dlimit || 1, options, t, changed),
+    select
+  );
+  return el;
+}
+
 module.exports = function(state, emit) {
   const file = state.storage.getFileById(state.params.id);
   if (!file) {
@@ -27,7 +46,7 @@ module.exports = function(state, emit) {
     : uploadPassword(state, emit);
   const div = html`
   <div id="share-link" class="fadeIn">
-    <div class="title">${state.translate('uploadSuccessTimingHeader')}</div>
+    <div class="title">${expireInfo(file, state.translate, emit)}</div>
     <div id="share-window">
       <div id="copy-text">
         ${state.translate('copyUrlFormLabelWithName', {

app/templates/unsupported.js

@@ -29,7 +29,7 @@ module.exports = function(state) {
       <div class="description"><a href="https://github.com/mozilla/send/blob/master/docs/faq.md#why-is-my-browser-not-supported">${state.translate(
         'notSupportedLink'
       )}</a></div>
-      <a id="dl-firefox" href="https://www.mozilla.org/firefox/new/?scene=2">
+      <a id="dl-firefox" href="https://www.mozilla.org/firefox/new/?utm_campaign=send-acquisition&utm_medium=referral&utm_source=send.firefox.com">
         <img src="${assets.get(
           'firefox_logo-only.svg'
         )}" class="firefox-logo" alt="Firefox"/>

app/templates/welcome.js

@@ -1,7 +1,6 @@
 const html = require('choo/html');
 const assets = require('../../common/assets');
 const fileList = require('./fileList');
-const fxPromo = require('./fxPromo');
 const { fadeOut } = require('../utils');
 
 module.exports = function(state, emit) {
@@ -36,7 +35,6 @@ module.exports = function(state, emit) {
         title="${state.translate('uploadPageBrowseButton1')}">
         ${state.translate('uploadPageBrowseButton1')}</label>
     </div>
-    ${state.promo === 'body' ? fxPromo(state, emit) : ''}
     ${fileList(state, emit)}
   </div>
   `;

assets/main.css

@@ -600,6 +600,7 @@ tbody {
   color: white;
   cursor: pointer;
   font-size: 15px;
+  padding-bottom: 4px;
   padding-left: 10px;
   padding-right: 10px;
   white-space: nowrap;
@@ -839,7 +840,11 @@ tbody {
   border: 1px solid #0297f8;
   color: white;
   cursor: pointer;
+
+  /* Force flat button look */
+  -webkit-appearance: none;
   font-size: 15px;
+  padding-bottom: 3px;
   padding-left: 10px;
   padding-right: 10px;
   white-space: nowrap;
@@ -933,12 +938,11 @@ tbody {
 #addPasswordWrapper label {
   line-height: 20px;
   cursor: pointer;
-  position: relative;
+  color: #737373;
-  opacity: 0.6;
 }
 
 #addPassword:checked + label {
-  opacity: 1;
+  color: #000;
 }
 
 #addPasswordWrapper label::before {
@@ -980,6 +984,62 @@ tbody {
   margin-left: 10px;
 }
 
+.banner-blue {
+  background-color: #0098f7;
+  color: #fff;
+}
+
+.banner-blue a {
+  color: #fff;
+  font-weight: bold;
+}
+
+.banner-blue a:hover {
+  color: #eee;
+  font-weight: bold;
+}
+
+.selectbox {
+  display: inline-block;
+  position: relative;
+  cursor: pointer;
+}
+
+.selectSelected {
+  cursor: pointer;
+}
+
+.selectOptions {
+  display: none;
+}
+
+.selectOptions.active {
+  display: block;
+  position: absolute;
+  top: 0;
+  left: 0;
+  padding: 0;
+  margin: 40px 0;
+  background-color: white;
+  border: 1px solid rgba(12, 12, 13, 0.3);
+  border-radius: 4px;
+  box-shadow: 1px 2px 4px rgba(12, 12, 13, 0.3);
+}
+
+.selectOption {
+  color: #737373;
+  font-size: 12pt;
+  list-style: none;
+  user-select: none;
+  white-space: nowrap;
+  padding: 0 60px;
+  border-bottom: 1px solid rgba(12, 12, 13, 0.3);
+}
+
+.selectOption:hover {
+  background-color: #f4f4f4;
+}
+
 @media (max-device-width: 992px), (max-width: 992px) {
   .popup .popuptext {
     left: auto;

build/version_loader.js

@@ -0,0 +1,5 @@
+const version = require('../package.json').version;
+
+module.exports = function(source) {
+  return source.replace('VERSION', version);
+};

docs/metrics.md

@@ -27,6 +27,7 @@ Data will be collected with Google Analytics and follow [Test Pilot standards](h
 - `cm5` - the number of files the user has ever uploaded.
 - `cm6` - the number of unexpired files the user has uploaded.
 - `cm7` - the number of files the user has ever downloaded.
+- `cm8` - the number of downloads permitted by the uploader.
 
 ### Custom Dimensions
 - `cd1` - the method by which the user initiated an upload. One of `drag`, `click`.
@@ -67,6 +68,17 @@ Triggered whenever a user stops uploading a file. Includes:
 - `cd2`
 - `cd6`
 
+#### `download-limit-changed`
+Triggered whenever the sender changes the download limit. Includes:
+
+- `ec` - `sender`
+- `ea` - `download-limit-changed`
+- `cm1`
+- `cm5`
+- `cm6`
+- `cm7`
+- `cm8`
+
 #### `password-added`
 Triggered whenever a password is added to a file. Includes:
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "firefox-send",
   "description": "File Sharing Experiment",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "author": "Mozilla (https://mozilla.org)",
   "repository": "mozilla/send",
   "homepage": "https://github.com/mozilla/send/",
@@ -43,39 +43,40 @@
     "node": ">=8.2.0"
   },
   "devDependencies": {
-    "autoprefixer": "^7.1.6",
+    "autoprefixer": "^7.2.1",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
-    "babel-plugin-yo-yoify": "^1.0.1",
+    "babel-plugin-yo-yoify": "^1.0.2",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.1",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-stage-2": "^6.24.1",
     "base64-js": "^1.2.1",
-    "copy-webpack-plugin": "^4.2.0",
+    "copy-webpack-plugin": "^4.2.3",
     "cross-env": "^5.1.1",
     "css-loader": "^0.28.7",
     "css-mqpacker": "^6.0.1",
     "cssnano": "^3.10.0",
-    "eslint": "^4.10.0",
+    "eslint": "^4.12.0",
     "eslint-plugin-mocha": "^4.11.0",
     "eslint-plugin-node": "^5.2.1",
     "eslint-plugin-security": "^1.4.0",
-    "expose-loader": "^0.7.3",
+    "expose-loader": "^0.7.4",
     "extract-loader": "^1.0.1",
     "file-loader": "^1.1.5",
+    "fluent-intl-polyfill": "^0.1.0",
     "git-rev-sync": "^1.9.1",
     "github-changes": "^1.1.1",
     "html-loader": "^0.5.1",
     "husky": "^0.14.3",
     "lint-staged": "^4.3.0",
     "mocha": "^3.5.3",
-    "nanobus": "^4.3.0",
+    "nanobus": "^4.3.1",
     "npm-run-all": "^4.1.2",
-    "postcss-loader": "^2.0.8",
+    "postcss-loader": "^2.0.9",
     "prettier": "^1.8.2",
     "proxyquire": "^1.8.0",
-    "raven-js": "^3.19.1",
+    "raven-js": "^3.20.1",
     "redis-mock": "^0.20.0",
     "require-from-string": "^2.0.1",
     "rimraf": "^2.6.2",
@@ -86,16 +87,16 @@
     "stylelint-no-unsupported-browser-features": "^1.0.1",
     "supertest": "^3.0.0",
     "testpilot-ga": "^0.3.0",
-    "val-loader": "^1.0.2",
+    "val-loader": "^1.1.0",
     "webpack": "^3.8.1",
     "webpack-dev-server": "2.9.1",
     "webpack-manifest-plugin": "^1.3.2",
     "webpack-unassert-loader": "^1.2.0"
   },
   "dependencies": {
-    "aws-sdk": "^2.149.0",
+    "aws-sdk": "^2.162.0",
     "body-parser": "^1.18.2",
-    "choo": "^6.5.1",
+    "choo": "^6.6.0",
     "cldr-core": "^32.0.0",
     "connect-busboy": "0.0.2",
     "convict": "^4.0.1",
@@ -104,7 +105,7 @@
     "fluent-langneg": "^0.1.0",
     "helmet": "^3.9.0",
     "mkdirp": "^0.5.1",
-    "mozlog": "^2.1.1",
+    "mozlog": "^2.2.0",
     "raven": "^2.2.1",
     "redis": "^2.8.0"
   },

public/locales/bs/send.ftl

@@ -25,6 +25,12 @@ uploadingFileNotification = Obavijesti me kada otpremanje bude gotovo.
 uploadSuccessConfirmHeader = Spremno za slanje
 uploadSvgAlt = Otpremi
 uploadSuccessTimingHeader = Veza prema vašoj datoteci će isteći nakon prvog preuzimanja ili za 24 sata.
+expireInfo = Link za vašu datoteku će isteći nakon { $downloadCount } ili { $timespan }.
+downloadCount = { $num ->
+        [one] 1 preuzimanja
+        [few] { $num } preuzimanja
+       *[other] { $num } preuzimanja
+    }
 copyUrlFormLabelWithName = Iskopirajte i podijelite vezu da biste poslali datoteku: { $filename }
 copyUrlFormButton = Kopiraj u međuspremnik
 copiedUrl = Kopirano!

public/locales/cs/send.ftl

@@ -25,6 +25,11 @@ uploadingFileNotification = Upozornit, až bude nahrávání dokončeno.
 uploadSuccessConfirmHeader = Připraveno k odeslání
 uploadSvgAlt = Nahrát
 uploadSuccessTimingHeader = Platnost odkazu na váš soubor vyprší po jeho prvním stažení, nebo po 24 hodinách.
+timespanHours = { $num ->
+        [one] hodina
+        [few] hodiny
+       *[other] hodin
+    }
 copyUrlFormLabelWithName = Zkopírujte a sdílejte odkaz na váš soubor: { $filename }
 copyUrlFormButton = Zkopírovat do schránky
 copiedUrl = Zkopírováno!

public/locales/cy/send.ftl

@@ -25,6 +25,19 @@ uploadingFileNotification = Dweud pan fydd y llwytho wedi gorffen.
 uploadSuccessConfirmHeader = Yn Barod i Anfon
 uploadSvgAlt = Llwytho i Fyny
 uploadSuccessTimingHeader = Bydd y ddolen i'ch ffeil y dod i ben ar ôl 1 llwytho neu o fewn 24 awr.
+expireInfo = Bydd y ddolen i'ch ffeil yn dod i ben ym mhen { $downloadCount } neu { $timespan }.
+downloadCount = { $num ->
+        [one] Llwyth i lawr
+        [two] Lwyth i lawr
+        [few] Llwyth i lawr
+       *[other] Llwyth i lawr
+    }
+timespanHours = { $num ->
+        [one] awr
+        [two] awr
+        [few] awr
+       *[other] awr
+    }
 copyUrlFormLabelWithName = Copïo a rhannu'r ddolen i anfon eich ffeil: { $filename }
 copyUrlFormButton = Copïo i'r clipfwrdd
 copiedUrl = Wedi eu copïo!
@@ -89,3 +102,4 @@ addPasswordButton = Ychwanegu Cyfrinair
 passwordTryAgain = Cyfrinair anghywir. Ceisiwch eto.
 // This label is followed by the password needed to download a file
 passwordResult = Cyfrinair: { $password }
+reportIPInfringement = Adrodd ar Gamddefnydd o'r IP

public/locales/de/send.ftl

@@ -25,6 +25,15 @@ uploadingFileNotification = Mich benachrichtigen, wenn der Upload abgeschlossen
 uploadSuccessConfirmHeader = Bereit zum Senden
 uploadSvgAlt = Hochladen
 uploadSuccessTimingHeader = Der Link zu Ihrer Datei läuft nach einem Download oder in 24 Stunden ab.
+expireInfo = Der Link zu Ihrer Datei läuft nach { $downloadCount } oder { $timespan } ab.
+downloadCount = { $num ->
+        [one] einem Download
+       *[other] { $num } Downloads
+    }
+timespanHours = { $num ->
+        [one] einer Stunde
+       *[other] { $num } Stunden
+    }
 copyUrlFormLabelWithName = Kopieren und teilen Sie den Link, um Ihre Datei zu senden: { $filename }
 copyUrlFormButton = In Zwischenablage kopieren
 copiedUrl = Kopiert!
@@ -89,3 +98,4 @@ addPasswordButton = Passwort hinzufügen
 passwordTryAgain = Falsches Passwort. Versuchen Sie es erneut.
 // This label is followed by the password needed to download a file
 passwordResult = Passwort: { $password }
+reportIPInfringement = IP-Verletzung melden

public/locales/dsb/send.ftl

@@ -25,6 +25,19 @@ uploadingFileNotification = K wěsći daś, gaž nagraśe jo dokóńcone.
 uploadSuccessConfirmHeader = Gótowy za słanje
 uploadSvgAlt = Nagraś
 uploadSuccessTimingHeader = Wótkaz k wašej dataji pó 1 ześěgnjenju abo 24 góźinach spadnjo.
+expireInfo = Wótkaz k wašej dataji pó { $downloadCount } abo { $timespan } spadnjo.
+downloadCount = { $num ->
+        [one] 1 ześěgnjenje
+        [two] { $num } ześěgnjeni
+        [few] { $num } ześěgnjenja
+       *[other] { $num } ześěgnjenjow
+    }
+timespanHours = { $num ->
+        [one] 1 góźina
+        [two] { $num } góźinje
+        [few] { $num } góźiny
+       *[other] { $num } góźin
+    }
 copyUrlFormLabelWithName = Kopěrujśo a źělśo wótkaz, aby swóju dataju pósłał: { $filename }
 copyUrlFormButton = Do mjazywótkłada kopěrowaś
 copiedUrl = Kopěrowany!
@@ -89,3 +102,4 @@ addPasswordButton = Gronidło pśidaś
 passwordTryAgain = Wopacne gronidło. Wopytajśo hyšći raz.
 // This label is followed by the password needed to download a file
 passwordResult = Gronidło: { $password }
+reportIPInfringement = Pśekśiwjenje IP k wěsći daś

public/locales/en-US/send.ftl

@@ -25,6 +25,15 @@ uploadingFileNotification = Notify me when the upload is complete.
 uploadSuccessConfirmHeader = Ready to Send
 uploadSvgAlt = Upload
 uploadSuccessTimingHeader = The link to your file will expire after 1 download or in 24 hours.
+expireInfo = The link to your file will expire after { $downloadCount } or { $timespan }.
+downloadCount = { $num ->
+        [one] 1 download
+       *[other] { $num } downloads
+    }
+timespanHours = { $num ->
+        [one] 1 hour
+       *[other] { $num } hours
+    }
 copyUrlFormLabelWithName = Copy and share the link to send your file: { $filename }
 copyUrlFormButton = Copy to clipboard
 copiedUrl = Copied!
@@ -88,4 +97,5 @@ requirePasswordCheckbox = Require a password to download this file
 addPasswordButton = Add password
 passwordTryAgain = Incorrect password. Try again.
 // This label is followed by the password needed to download a file
-passwordResult = Password: { $password }
+passwordResult = Password: { $password }
+reportIPInfringement = Report IP Infringement

public/locales/es-AR/send.ftl

@@ -25,6 +25,15 @@ uploadingFileNotification = Notificarme cuando la subida se complete.
 uploadSuccessConfirmHeader = Listo para enviar
 uploadSvgAlt = Subir
 uploadSuccessTimingHeader = El enlace al archivo expirará después de 1 descarga o en 24 horas.
+expireInfo = El enlace a tu archivo expirará después de { $downloadCount } o { $timespan }.
+downloadCount = { $num ->
+        [one] 1 descarga
+       *[other] { $num } descargas
+    }
+timespanHours = { $num ->
+        [one] 1 hora
+       *[other] { $num } horas
+    }
 copyUrlFormLabelWithName = Copiá y compartí el enlace para enviar tu archivo: { $filename }
 copyUrlFormButton = Copiar al portapapeles
 copiedUrl = ¡Copiado!
@@ -89,3 +98,4 @@ addPasswordButton = Agregar contraseña
 passwordTryAgain = Contraseña incorrecta. Intentá nuevamente.
 // This label is followed by the password needed to download a file
 passwordResult = Contraseña: { $password }
+reportIPInfringement = Informar violación de propiedad intelectual

public/locales/es-CL/send.ftl

@@ -25,6 +25,15 @@ uploadingFileNotification = Notificarme cuando la subida sea completada.
 uploadSuccessConfirmHeader = Listo para enviar
 uploadSvgAlt = Subir
 uploadSuccessTimingHeader = El enlace a tu archivo expirará tras 1 descarga o en 24 horas.
+expireInfo = El enlace a tu archivo expirará después de { $downloadCount } o { $timespan }.
+downloadCount = { $num ->
+        [one] 1 descarga
+       *[other] { $num } descargas
+    }
+timespanHours = { $num ->
+        [one] 1 hora
+       *[other] { $num } horas
+    }
 copyUrlFormLabelWithName = Copia y comparte el enlace para enviar tu archivo: { $filename }
 copyUrlFormButton = Copiar al portapapeles
 copiedUrl = ¡Copiado!
@@ -89,3 +98,4 @@ addPasswordButton = Añadir contraseña
 passwordTryAgain = Contraseña incorrecta. Vuelve a intentarlo.
 // This label is followed by the password needed to download a file
 passwordResult = Contraseña: { $password }
+reportIPInfringement = Reportar infracción de PI

public/locales/es-ES/send.ftl

@@ -25,6 +25,15 @@ uploadingFileNotification = Notificarme cuando se complete la subida.
 uploadSuccessConfirmHeader = Listo para enviar
 uploadSvgAlt = Subir
 uploadSuccessTimingHeader = El enlace al archivo caducará tras descargarlo una vez o en 24 horas.
+expireInfo = El enlace al archivo expirará tras { $downloadCount } o { $timespan }.
+downloadCount = { $num ->
+        [one] 1 descarga
+       *[other] { $num } descargas
+    }
+timespanHours = { $num ->
+        [one] 1 hora
+       *[other] { $num } horas
+    }
 copyUrlFormLabelWithName = Copiar y compartir el enlace para enviar tu archivo: { $filename }
 copyUrlFormButton = Copiar en el portapapeles
 copiedUrl = ¡Copiado!

public/locales/es-MX/send.ftl

@@ -25,6 +25,14 @@ uploadingFileNotification = Avísame cuando la subida del archivo esté completa
 uploadSuccessConfirmHeader = Listo para enviar
 uploadSvgAlt = Subir
 uploadSuccessTimingHeader = El enlace a tu archivo expirará después de una descarga o en 24 horas.
+expireInfo = El enlace a tu archivo expirará después de { $downloadCount } o { $timespan }.
+downloadCount = { $num ->
+       *[one] 1 descarga
+    }
+timespanHours = { $num ->
+        [one] 1 hora
+       *[other] { $num } horas
+    }
 copyUrlFormLabelWithName = Copiar y compartir el enlace para enviar tu archivo: ($filename)
 copyUrlFormButton = Copiar a portapapeles
 copiedUrl = ¡Copiado!

public/locales/fa/send.ftl

@@ -25,6 +25,13 @@ uploadingFileNotification = هر وقت بارگذاری تمام شد به من
 uploadSuccessConfirmHeader = آماده برای ارسال
 uploadSvgAlt = بارگذاری
 uploadSuccessTimingHeader = پیوند به پرونده شما بعد از ۱ بار دانلود یا ۲۴ ساعت حذف خواهد شد.
+expireInfo = این پیوند به فایل شما پس از { $downloadCount } یا { $timespan } منقضی خواهد شد.
+downloadCount = { $num ->
+       *[other] ۱ بارگذاری
+    }
+timespanHours = { $num ->
+       *[other] ۱ ساعت
+    }
 copyUrlFormLabelWithName = برای ارسال پرونده پیوند آن را رونوشت و به اشتراک بگذارید: { $filename }
 copyUrlFormButton = رونوشت به کلیپ‌بورد
 copiedUrl = رونوشت شد!
@@ -87,3 +94,6 @@ footerLinkCookies = کوکی‌ها
 requirePasswordCheckbox = دریافت این پرونده نیاز به گذرواژه دارد
 addPasswordButton = افزودن گذرواژه
 passwordTryAgain = کلمه عبور اشتباه است. مجدد تلاش کنید.
+// This label is followed by the password needed to download a file
+passwordResult = گذرواژه: { $password }
+reportIPInfringement = گزارش تخلف IP

public/locales/fr/send.ftl

@@ -25,6 +25,15 @@ uploadingFileNotification = M’envoyer une notification lorsque l’envoi est t
 uploadSuccessConfirmHeader = Paré à l’envoi
 uploadSvgAlt = Envoyer
 uploadSuccessTimingHeader = Le lien vers votre fichier expirera après le premier téléchargement ou au bout de 24 heures.
+expireInfo = Le lien vers votre fichier expirera après { $downloadCount } ou { $timespan }.
+downloadCount = { $num ->
+        [one] 1 téléchargement
+       *[other] { $num } téléchargements
+    }
+timespanHours = { $num ->
+        [one] 1 heure
+       *[other] { $num } heures
+    }
 copyUrlFormLabelWithName = Copiez et partagez le lien pour envoyer votre fichier : { $filename }
 copyUrlFormButton = Copier dans le presse-papiers
 copiedUrl = Lien copié !
@@ -34,7 +43,7 @@ sendAnotherFileLink = Envoyer un autre fichier
 downloadAltText = Télécharger
 downloadFileName = Télécharger { $filename }
 downloadFileSize = ({ $size })
-unlockInputLabel = Saisissez un mot de passe
+unlockInputLabel = Saisissez le mot de passe
 unlockInputPlaceholder = Mot de passe
 unlockButtonLabel = Déverrouiller
 downloadFileTitle = Télécharger le fichier chiffré
@@ -89,3 +98,4 @@ addPasswordButton = Ajouter un mot de passe
 passwordTryAgain = Mot de passe incorrect. Veuillez réessayer.
 // This label is followed by the password needed to download a file
 passwordResult = Mot de passe : { $password }
+reportIPInfringement = Signaler une violation de la p.i.

public/locales/fy-NL/send.ftl

@@ -25,6 +25,15 @@ uploadingFileNotification = Jou in melding as de oplaad foltôge is.
 uploadSuccessConfirmHeader = Ree om te ferstjoeren
 uploadSvgAlt = Oplaad
 uploadSuccessTimingHeader = De keppeling nei jo bestân sil nei 1 download ferrinne of nei 24 oeren.
+expireInfo = De keppeling nei jo bestân sil nei { $downloadCount } of { $timespan } ferrinne.
+downloadCount = { $num ->
+        [one] 1 download
+       *[other] { $num } downloads
+    }
+timespanHours = { $num ->
+        [one] 1 oer
+       *[other] { $num } oeren
+    }
 copyUrlFormLabelWithName = Kopiearje en diel de keppeling om jo bestân te ferstjoeren: { $filename }
 copyUrlFormButton = Nei klamboerd kopiearje
 copiedUrl = Kopiearre!

public/locales/hsb/send.ftl

@@ -25,6 +25,19 @@ uploadingFileNotification = Zdźělić, hdyž nahraće je dokónčene.
 uploadSuccessConfirmHeader = Hotowy za słanje
 uploadSvgAlt = Nahrać
 uploadSuccessTimingHeader = Wotkaz k wašej dataji po 1 sćehnjenju abo 24 hodźinach spadnje.
+expireInfo = Wotkaz k wašej dataji po { $downloadCount } abo { $timespan } spadnje.
+downloadCount = { $num ->
+        [one] 1 sćehnjenje
+        [two] { $num } sćehnjeni
+        [few] { $num } sćehnjenja
+       *[other] { $num } sćehnjenjow
+    }
+timespanHours = { $num ->
+        [one] 1 hodźina
+        [two] { $num } hodźinje
+        [few] { $num } hodźiny
+       *[other] { $num } hodźin
+    }
 copyUrlFormLabelWithName = Kopěrujće a dźělće wotkaz, zo byšće swoju dataju pósłał: { $filename }
 copyUrlFormButton = Do mjezyskłada kopěrować
 copiedUrl = Kopěrowany!
@@ -89,3 +102,4 @@ addPasswordButton = Hesło přidać
 passwordTryAgain = Wopačne hesło. Prošu spytajće hišće raz.
 // This label is followed by the password needed to download a file
 passwordResult = Hesło: { $password }
+reportIPInfringement = Zranjenje IP zdźělić

public/locales/hu/send.ftl

@@ -25,6 +25,15 @@ uploadingFileNotification = Értesítsen, ha a feltöltés elkészült.
 uploadSuccessConfirmHeader = Küldésre kész
 uploadSvgAlt = Feltöltés
 uploadSuccessTimingHeader = A fájl hivatkozása lejár 1 letöltés vagy 24 óra múlva.
+expireInfo = A fájlhoz tartozó hivatkozás { $downloadCount } vagy { $timespan } múlva lejár.
+downloadCount = { $num ->
+        [one] 1 letöltés
+       *[other] { $num } letöltés
+    }
+timespanHours = { $num ->
+        [one] 1 óra
+       *[other] { $num }  óra
+    }
 copyUrlFormLabelWithName = Másolja és ossza meg a hivatkozást a fájl küldéséhez: { $filename }
 copyUrlFormButton = Vágólapra másolás
 copiedUrl = Másolva!
@@ -89,3 +98,4 @@ addPasswordButton = Jelszó hozzáadása
 passwordTryAgain = Helytelen jelszó. Próbálja meg újra.
 // This label is followed by the password needed to download a file
 passwordResult = Jelszó: { $password }
+reportIPInfringement = Szellemi tulajdon megsértésének bejelentése

public/locales/it/send.ftl

@@ -25,6 +25,15 @@ uploadingFileNotification = Invia una notifica quando il caricamento è completa
 uploadSuccessConfirmHeader = Pronto per l’invio
 uploadSvgAlt = Carica
 uploadSuccessTimingHeader = Il link al file scadrà dopo 1 download o in 24 ore.
+expireInfo = Il link a questo file scadrà dopo { $downloadCount } o { $timespan }.
+downloadCount = { $num ->
+        [one] 1 download
+       *[other] { $num } download
+    }
+timespanHours = { $num ->
+        [one] 1 ora
+       *[other] { $num } ore
+    }
 copyUrlFormLabelWithName = Copia e condividi il link per inviare il tuo file: { $filename }
 copyUrlFormButton = Copia negli appunti
 copiedUrl = Copiato
@@ -89,3 +98,4 @@ addPasswordButton = Aggiungi password
 passwordTryAgain = Password errata, riprovare.
 // This label is followed by the password needed to download a file
 passwordResult = Password: { $password }
+reportIPInfringement = Segnala violazione della proprietà intellettuale

public/locales/ja/send.ftl

@@ -25,6 +25,13 @@ uploadingFileNotification = アップロード完了時に通知を受け取る
 uploadSuccessConfirmHeader = 送信準備完了
 uploadSvgAlt = アップロード
 uploadSuccessTimingHeader = ファイルへのリンクは、1 回ダウンロードされた後、もしくは 24 時間以内に期限切れとなります。
+expireInfo = このファイルへのリンクは { $downloadCount } あるいは { $timespan } 後に期限切れとなります。
+downloadCount = { $num ->
+       *[other] { $num } 回のダウンロード
+    }
+timespanHours = { $num ->
+       *[other] { $num } 時間
+    }
 copyUrlFormLabelWithName = ファイルを送信するにはこのリンクをコピー、共有してください: { $filename }
 copyUrlFormButton = クリップボードへコピー
 copiedUrl = コピー完了！
@@ -89,3 +96,4 @@ addPasswordButton = パスワードを追加
 passwordTryAgain = パスワードが正しくありません。再度入力してください。
 // This label is followed by the password needed to download a file
 passwordResult = パスワード: { $password }
+reportIPInfringement = 知的財産侵害報告

public/locales/ka/send.ftl

@@ -25,6 +25,13 @@ uploadingFileNotification = შეტყობინება, ატვირ
 uploadSuccessConfirmHeader = მზადაა გასაგზავნად
 uploadSvgAlt = ატვირთვა
 uploadSuccessTimingHeader = ფაილს ვადა გაუვა 1 ჩამოტვირთვის, ან 24 საათის მერე.
+expireInfo = ფაილის ბმულს, ვადა გაუვა { $downloadCount }, ან { $timespan } მერე.
+downloadCount = { $num ->
+       *[other] { $num } ჩამოტვირთვა
+    }
+timespanHours = { $num ->
+       *[other] { $num } საათი
+    }
 copyUrlFormLabelWithName = დააკოპირეთ და გააზიარეთ ბმული, ფაილის გასაგზავნად: { $filename }
 copyUrlFormButton = დაკოპირება
 copiedUrl = დაკოპირდა!
@@ -32,7 +39,7 @@ deleteFileButton = ფაილის წაშლა
 sendAnotherFileLink = სხვა ფაილის გაგზავნა
 // Alternative text used on the download link/button (indicates an action).
 downloadAltText = ჩამოტვირთვა
-downloadFileName = { $filename } ჩამოტვირთვა 
+downloadFileName = { $filename } ჩამოტვირთვა
 downloadFileSize = ({ $size })
 unlockInputLabel = შეიყვანეთ პაროლი
 unlockInputPlaceholder = პაროლი
@@ -89,3 +96,4 @@ addPasswordButton = პაროლის დამატება
 passwordTryAgain = პაროლი არასწორია. სცადეთ ხელახლა.
 // This label is followed by the password needed to download a file
 passwordResult = პაროლი: { $password }
+reportIPInfringement = მოხსენება დარღვევაზე

public/locales/ms/send.ftl

@@ -25,6 +25,13 @@ uploadingFileNotification = Maklumkan saya apabila muat naik selesai.
 uploadSuccessConfirmHeader = Sedia untuk Hantar
 uploadSvgAlt = Muat naik
 uploadSuccessTimingHeader = Pautan ke fail anda akan luput selepas 1 muat turun atau dalam 24 jam.
+expireInfo = Pautan ke fail anda akan luput selepas { $downloadCount } atau { $timespan }.
+downloadCount = { $num ->
+       *[other] { $num } muat turun
+    }
+timespanHours = { $num ->
+       *[other] { $num } jam
+    }
 copyUrlFormLabelWithName = Salin dan kongsi pautan untuk menghantar fail anda: { $filename }
 copyUrlFormButton = Salin ke Klipbod
 copiedUrl = Disalin!
@@ -89,3 +96,4 @@ addPasswordButton = Tambah Kata laluan
 passwordTryAgain = Kata laluan tidak betul. Cuba lagi.
 // This label is followed by the password needed to download a file
 passwordResult = Kata laluan: { $password }
+reportIPInfringement = Lapor Pencerobohan IP

public/locales/nb-NO/send.ftl

@@ -25,6 +25,15 @@ uploadingFileNotification = Varsle meg når opplastingen er ferdig.
 uploadSuccessConfirmHeader = Klar til å sende
 uploadSvgAlt = Last opp
 uploadSuccessTimingHeader = Lenken til filen din utløper etter 1 nedlasting eller om 24 timer.
+expireInfo = Lenken til filen din vil gå ut etter { $downloadCount } eller { $timespan }.
+downloadCount = { $num ->
+        [one] 1 nedlasting
+       *[other] { $num } nedlastinger
+    }
+timespanHours = { $num ->
+        [one] 1 time
+       *[other] { $num } timer
+    }
 copyUrlFormLabelWithName = Kopier og del linken for å sende filen: { $filename }
 copyUrlFormButton = Kopier til utklippstavle
 copiedUrl = Kopiert!
@@ -89,3 +98,4 @@ addPasswordButton = Legg til passord
 passwordTryAgain = Feil passord. Prøv igjen.
 // This label is followed by the password needed to download a file
 passwordResult = Passord: { $password }
+reportIPInfringement = Rapporter brudd på åndsverk

public/locales/nl/send.ftl

@@ -25,6 +25,15 @@ uploadingFileNotification = Mij waarschuwen zodra het uploaden is voltooid
 uploadSuccessConfirmHeader = Gereed voor verzending
 uploadSvgAlt = Uploaden
 uploadSuccessTimingHeader = De koppeling naar uw bestand zal na 1 download of 24 uur verlopen.
+expireInfo = De koppeling naar uw bestand zal na { $downloadCount } of { $timespan } verlopen.
+downloadCount = { $num ->
+        [one] 1 download
+       *[other] { $num } downloads
+    }
+timespanHours = { $num ->
+        [one] 1 uur
+       *[other] { $num } uur
+    }
 copyUrlFormLabelWithName = Kopieer en deel de koppeling om uw bestand te verzenden: { $filename }
 copyUrlFormButton = Kopiëren naar klembord
 copiedUrl = Gekopieerd!
@@ -89,3 +98,4 @@ addPasswordButton = Wachtwoord toevoegen
 passwordTryAgain = Onjuist wachtwoord. Probeer het opnieuw.
 // This label is followed by the password needed to download a file
 passwordResult = Wachtwoord: { $password }
+reportIPInfringement = IE-inbreuk melden

public/locales/nn-NO/send.ftl

@@ -25,6 +25,15 @@ uploadingFileNotification = Varsle meg når opplastinga er ferdig.
 uploadSuccessConfirmHeader = Klår til å senda
 uploadSvgAlt = Last opp
 uploadSuccessTimingHeader = Lenka til fila di går ut etter 1 nedlasting eller om 24 timar.
+expireInfo = Lenka til fila di vil gå ut etter { $downloadCount } eller { $timespan }.
+downloadCount = { $num ->
+        [one] 1 nedlasting
+       *[other] { $num } nedlastingar
+    }
+timespanHours = { $num ->
+        [one] 1 time
+       *[other] { $num } timar
+    }
 copyUrlFormLabelWithName = Kopier og del lenka for å sende fila: { $filename }
 copyUrlFormButton = Kopier til utklippstavla
 copiedUrl = Kopiert!
@@ -89,3 +98,4 @@ addPasswordButton = Legg til passord
 passwordTryAgain = Feil passord. Prøv på nytt.
 // This label is followed by the password needed to download a file
 passwordResult = Passord: { $password }
+reportIPInfringement = Rapporter brot på åndsverk

public/locales/pt-BR/send.ftl

@@ -25,6 +25,15 @@ uploadingFileNotification = Me avise quando completar o envio.
 uploadSuccessConfirmHeader = Pronto para enviar
 uploadSvgAlt = Enviado
 uploadSuccessTimingHeader = O link para o seu arquivo expirará após 1 download ou em 24 horas.
+expireInfo = O link para o seu arquivo expirará após { $downloadCount } ou { $timepan }.
+downloadCount = { $num ->
+        [one] 1 download
+       *[other] { $num } downloads
+    }
+timespanHours = { $num ->
+        [one] 1 hora
+       *[other] { $num } horas
+    }
 copyUrlFormLabelWithName = Copie e compartilhe o link para enviar o seu arquivo: { $filename }
 copyUrlFormButton = Copiar para área de transferência
 copiedUrl = Copiado!
@@ -89,3 +98,4 @@ addPasswordButton = Adicionar senha
 passwordTryAgain = Senha incorreta. Tente novamente.
 // This label is followed by the password needed to download a file
 passwordResult = Senha: { $password }
+reportIPInfringement = Reportar violação de IP

public/locales/pt-PT/send.ftl

@@ -24,31 +24,37 @@ uploadingPageLargeFileMessage = Este ficheiro é grande e pode demorar um pouco
 uploadingFileNotification = Notificar-me quando o carregamento estiver completo.
 uploadSuccessConfirmHeader = Pronto para enviar
 uploadSvgAlt = Carregar
-uploadSuccessTimingHeader = A ligação para o seu ficheiro irá expirar depois de 1 descarga ou em 24 horas.
+uploadSuccessTimingHeader = A ligação para o seu ficheiro irá expirar depois de 1 transferência ou em 24 horas.
+expireInfo = A ligação para o seu ficheiro irá expirar depois de { $downloadCount } or { $timespan }.
+downloadCount = { $num ->
+        [one] 1 transferência
+       *[other] { $num } transferências
+    }
+timespanHours = 1 hora
 copyUrlFormLabelWithName = Copie e partilhe a ligação para enviar o seu ficheiro: { $filename }
 copyUrlFormButton = Copiar para a área de transferência
 copiedUrl = Copiado!
 deleteFileButton = Apagar ficheiro
 sendAnotherFileLink = Enviar outro ficheiro
 // Alternative text used on the download link/button (indicates an action).
-downloadAltText = Descarregar
+downloadAltText = Transferir
-downloadFileName = Descarregar { $filename }
+downloadFileName = Transferir { $filename }
 downloadFileSize = ({ $size })
 unlockInputLabel = Digitar palavra-passe
 unlockInputPlaceholder = Palavra-passe
 unlockButtonLabel = Desbloquear
-downloadFileTitle = Descarregar ficheiro encriptado
+downloadFileTitle = Transferir ficheiro encriptado
 // Firefox Send is a brand name and should not be localized.
 downloadMessage = O seu amigo está a enviar-lhe um ficheiro com o Firefox Send, um serviço que lhe permite partilhar ficheiro com uma ligação segura, privada e encriptada que expira automaticamente para garantir que as suas coisas não fiquem online para sempre.
 // Text and title used on the download link/button (indicates an action).
-downloadButtonLabel = Descarregar
+downloadButtonLabel = Transferir
-downloadNotification = A sua descarga foi completada.
+downloadNotification = A sua transferência foi concluída.
-downloadFinish = Descarga completada
+downloadFinish = Transferência concluída
 // This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize } de { $totalSize })
 // Firefox Send is a brand name and should not be localized.
-sendYourFilesLink = Tentar o Firefox Send
+sendYourFilesLink = Experimentar o Firefox Send
-downloadingPageProgress = A descarregar { $filename } ({ $size })
+downloadingPageProgress = A transferir { $filename } ({ $size })
 downloadingPageMessage = Por favor deixe este separador aberto enquanto obtemos o seu ficheiro e o desencriptamos.
 errorAltText = Erro ao carregar
 errorPageHeader = Algo correu mal.
@@ -63,7 +69,7 @@ notSupportedDetail = Infelizmente este navegador não suporta a tecnologia web q
 notSupportedLink = Porque é que o meu navegador não é suportado?
 notSupportedOutdatedDetail = Infelizmente esta versão do Firefox não suporta a tecnologia web que faz o Firefox Send funcionar. Precisa de atualizar o seu navegador.
 updateFirefox = Atualizar o Firefox
-downloadFirefoxButtonSub = Descarga gratuita
+downloadFirefoxButtonSub = Transferência gratuita
 uploadedFile = Ficheiro
 copyFileList = Copiar URL
 // expiryFileList is used as a column header
@@ -72,7 +78,7 @@ deleteFileList = Apagar
 nevermindButton = Esquecer
 legalHeader = Termos e privacidade
 legalNoticeTestPilot = O Firefox Send é atualmente uma experiência do Test Pilot, e sujeita aos <a>Termos de serviço</a> e <a>Aviso de privacidade</a> do Test Pilot. Pode saber mais acerca desta experiência e a sua recolha de dados <a>aqui</a>.
-legalNoticeMozilla = A utilização do website do Firefox Send está também sujeita ao <a>Aviso de privacidade dos websites</a> e <a>Termos de serviço dos websites</a> da Mozilla.
+legalNoticeMozilla = A utilização do website do Firefox Send está também sujeita ao <a>Aviso de privacidade dos websites</a> e <a>Termos de utilização dos websites</a> da Mozilla.
 deletePopupText = Apagar este ficheiro?
 deletePopupYes = Sim
 deletePopupCancel = Cancelar
@@ -84,8 +90,9 @@ footerLinkAbout = Acerca do Test Pilot
 footerLinkPrivacy = Privacidade
 footerLinkTerms = Termos
 footerLinkCookies = Cookies
-requirePasswordCheckbox = Requerer uma palavra-passe para descarregar este ficheiro
+requirePasswordCheckbox = Requerer uma palavra-passe para transferir este ficheiro
 addPasswordButton = Adicionar palavra-passe
 passwordTryAgain = Palavra-passe incorreta. Tente novamente.
 // This label is followed by the password needed to download a file
 passwordResult = Palavra-passe: { $password }
+reportIPInfringement = Reportar violação de PI

public/locales/ru/send.ftl

@@ -25,6 +25,17 @@ uploadingFileNotification = Оповестить меня, когда загру
 uploadSuccessConfirmHeader = Готов к отправке
 uploadSvgAlt = Загрузить
 uploadSuccessTimingHeader = Ссылка на ваш файл станет недоступна после 1 загрузки файла или через 24 часа.
+expireInfo = Ссылка на ваш файл станет недоступна после { $downloadCount } файла или через { $timespan }.
+downloadCount = { $num ->
+        [one] { $number } загрузки
+        [few] { $number } загрузок
+       *[other] { $number } загрузок
+    }
+timespanHours = { $num ->
+        [one] { $number } час
+        [few] { $number } часа
+       *[other] { $number } часов
+    }
 copyUrlFormLabelWithName = Скопировать и поделиться ссылкой на отправку вашего файла: { $filename }
 copyUrlFormButton = Скопировать в буфер обмена
 copiedUrl = Скопировано!
@@ -89,3 +100,4 @@ addPasswordButton = Добавить пароль
 passwordTryAgain = Неверный пароль. Попробуйте снова.
 // This label is followed by the password needed to download a file
 passwordResult = Пароль: { $password }
+reportIPInfringement = Сообщить о нарушении прав на интеллектуальную собственность

public/locales/sl/send.ftl

@@ -25,6 +25,19 @@ uploadingFileNotification = Obvesti me, ko bo nalaganje končano.
 uploadSuccessConfirmHeader = Pripravljeno za pošiljanje
 uploadSvgAlt = Naloži
 uploadSuccessTimingHeader = Povezava do vaše datoteke bo potekla po enem prenosu ali v 24 urah.
+expireInfo = Povezava do vaše datoteke bo potekla čez { $downloadCount } ali { $timespan }.
+downloadCount = { $num ->
+        [one] 1 prenos
+        [two] { $num } prenosa
+        [few] { $num } prenosi
+       *[other] { $num } prenosov
+    }
+timespanHours = { $num ->
+        [one] 1 ura
+        [two] { $num } uri
+        [few] { $num } ure
+       *[other] { $num } ur
+    }
 copyUrlFormLabelWithName = Kopirajte in delite to povezavo, da pošljete datoteko: { $filename }
 copyUrlFormButton = Kopiraj v odložišče
 copiedUrl = Kopirano!
@@ -89,3 +102,4 @@ addPasswordButton = Dodaj geslo
 passwordTryAgain = Napačno geslo. Poskusite znova.
 // This label is followed by the password needed to download a file
 passwordResult = Geslo: { $password }
+reportIPInfringement = Prijavite kršitev naslova IP

public/locales/sr/send.ftl

@@ -25,6 +25,17 @@ uploadingFileNotification = Обавести ме када се отпремањ
 uploadSuccessConfirmHeader = Спреман за слање
 uploadSvgAlt = Отпреми
 uploadSuccessTimingHeader = Веза ка вашој датотеци ће истећи након једног преузимања или након 24 сата.
+expireInfo = Веза ка вашој датотеци ће истећи након { $downloadCount } или { $timespan }.
+downloadCount = { $num ->
+        [one] преузимања
+        [few] преузимања
+       *[other] преузимања
+    }
+timespanHours = { $num ->
+        [one] сата
+        [few] сата
+       *[other] сати
+    }
 copyUrlFormLabelWithName = Ископирајте и поделите везу да бисте послали вашу датотеку: { $filename }
 copyUrlFormButton = Копирај у оставу
 copiedUrl = Ископирано!
@@ -89,3 +100,4 @@ addPasswordButton = Додај лозинку
 passwordTryAgain = Нетачна лозинка. Пробајте поново.
 // This label is followed by the password needed to download a file
 passwordResult = Лозинка: { $password }
+reportIPInfringement = Пријавите IP прекршај

public/locales/sv-SE/send.ftl

@@ -25,6 +25,11 @@ uploadingFileNotification = Meddela mig när uppladdningen är klar.
 uploadSuccessConfirmHeader = Klar för att skicka
 uploadSvgAlt = Ladda upp
 uploadSuccessTimingHeader = Länken till din fil upphör att gälla efter 1 nedladdning eller om 24 timmar.
+expireInfo = Länken till din fil upphör att gälla efter { $downloadCount } eller { $timespan }.
+timespanHours = { $num ->
+        [one] 1 timme
+       *[other] { $num } timmar
+    }
 copyUrlFormLabelWithName = Kopiera och dela länken för att skicka din fil: { $filename }
 copyUrlFormButton = Kopiera till urklipp
 copiedUrl = Kopierad!

public/locales/tl/send.ftl

@@ -25,6 +25,14 @@ uploadingFileNotification = Abisuhan ako kapag nakumpleto na ang pag-upload.
 uploadSuccessConfirmHeader = Handa nang Ipadala
 uploadSvgAlt = I-upload
 uploadSuccessTimingHeader = Mag-e-expire ang link sa iyong file pagkatapos ng 1 pag-download o sa loob ng 24 na oras.
+expireInfo = Mag-e-expire ang link sa iyong file pagkatapos ng { $downloadCount } o { $timespan }.
+downloadCount = { $num ->
+        [one] 1 pag-download
+       *[other] { $num } na mga pag-download
+    }
+timespanHours = { $num ->
+       *[one] 1 oras
+    }
 copyUrlFormLabelWithName = Kopyahin at ibahagi ang link upang ipadala ang iyong file: { $filename }
 copyUrlFormButton = Kopyahin sa clipboard
 copiedUrl = Naikopya!
@@ -67,7 +75,7 @@ downloadFirefoxButtonSub = Libreng Download
 uploadedFile = File
 copyFileList = Kopyahin ang URL
 // expiryFileList is used as a column header
-expiryFileList = Magtatapos Sa 
+expiryFileList = Magtatapos Sa
 deleteFileList = I-delete
 nevermindButton = Hindi bale
 legalHeader = Mga Tuntunin at Pagkapribado

public/locales/tr/send.ftl

@@ -25,6 +25,11 @@ uploadingFileNotification = Yükleme bitince bana haber ver.
 uploadSuccessConfirmHeader = Göndermeye hazır
 uploadSvgAlt = Yükle
 uploadSuccessTimingHeader = Dosyanız 1 kez indirildikten veya 24 saat geçtikten sonra linkiniz geçersiz olacaktır.
+expireInfo = Dosyanızın bağlantısı { $downloadCount } sonra veya { $timespan } zaman aşımına uğrayacaktır.
+downloadCount = { $num } indirme
+timespanHours = { $num ->
+       *[one] { $num } saat
+    }
 copyUrlFormLabelWithName = { $filename } dosyanızı başkasına göndermek için aşağıdaki linki kopyalayın.
 copyUrlFormButton = Panoya kopyala
 copiedUrl = Kopyalandı!
@@ -89,3 +94,4 @@ addPasswordButton = Parola ekle
 passwordTryAgain = Yanlış parola. Yeniden deneyin.
 // This label is followed by the password needed to download a file
 passwordResult = Parola: { $password }
+reportIPInfringement = Telif hakkı ihlali bildir

public/locales/uk/send.ftl

@@ -34,6 +34,10 @@ sendAnotherFileLink = Надіслати інший файл
 downloadAltText = Завантаживи
 downloadFileName = Завантажити { $filename }
 downloadFileSize = ({ $size })
+unlockInputLabel = Введіть пароль
+unlockInputPlaceholder = Пароль
+unlockButtonLabel = Розблокувати
+downloadFileTitle = Завантажити зашифрований файл
 // Firefox Send is a brand name and should not be localized.
 downloadMessage = Ваш друг надіслав файл за допомогою Firefox Send, який дозволяє ділитися файлами, використовуючи безпечні, приватні та зашифровані посилання, термін дії яких автоматично закінчується, щоб ваші файли не лишилися в Інтернеті назавжди.
 // Text and title used on the download link/button (indicates an action).
@@ -80,3 +84,8 @@ footerLinkAbout = Про Test Pilot
 footerLinkPrivacy = Приватність
 footerLinkTerms = Умови
 footerLinkCookies = Куки
+requirePasswordCheckbox = Вимагати пароль для завантаження цього файлу
+addPasswordButton = Додати пароль
+passwordTryAgain = Невірний пароль. Спробуйте знову.
+// This label is followed by the password needed to download a file
+passwordResult = Пароль: { $password }

public/locales/zh-CN/send.ftl

@@ -25,6 +25,13 @@ uploadingFileNotification = 上传完成后通知我。
 uploadSuccessConfirmHeader = 准备好发送
 uploadSvgAlt = 上传
 uploadSuccessTimingHeader = 您的文件的链接将在首次下载或 24 小时后过期。
+expireInfo = 指向该文件的链接将在 { $downloadCount } 或 { $timespan } 后过期。
+downloadCount = { $num ->
+       *[other] { $num } 次下载
+    }
+timespanHours = { $num ->
+       *[other] { $num } 小时
+    }
 copyUrlFormLabelWithName = 复制并分享链接以发送您的文件：{ $filename }
 copyUrlFormButton = 复制到剪贴板
 copiedUrl = 已复制！
@@ -89,3 +96,4 @@ addPasswordButton = 添加密码
 passwordTryAgain = 密码不正确。请重试。
 // This label is followed by the password needed to download a file
 passwordResult = 密码：{ $password }
+reportIPInfringement = 举报知识产权侵权

public/locales/zh-TW/send.ftl

@@ -25,6 +25,13 @@ uploadingFileNotification = 上傳完成時通知我。
 uploadSuccessConfirmHeader = 準備好傳送
 uploadSvgAlt = 上傳
 uploadSuccessTimingHeader = 您的檔案鏈結將會在首次下載，或 24 小時後失效。
+expireInfo = 檔案鏈結將在 { $downloadCount }或 { $timespan }後失效。
+downloadCount = { $num ->
+       *[other] { $num } 次下載
+    }
+timespanHours = { $num ->
+       *[other] { $num } 小時
+    }
 copyUrlFormLabelWithName = 複製並分享鏈結來傳送您的檔案: { $filename }
 copyUrlFormButton = 複製到剪貼簿
 copiedUrl = 已複製！
@@ -89,3 +96,4 @@ addPasswordButton = 新增密碼
 passwordTryAgain = 密碼不正確，請再試一次。
 // This label is followed by the password needed to download a file
 passwordResult = 密碼: { $password }
+reportIPInfringement = 回報智慧財產權濫用情況

server/routes/delete.js

@@ -12,15 +12,15 @@ module.exports = async function(req, res) {
     return;
   }
 
-  const delete_token = req.body.delete_token;
+  const ownerToken = req.body.owner_token || req.body.delete_token;
 
-  if (!delete_token) {
+  if (!ownerToken) {
     res.sendStatus(404);
     return;
   }
 
   try {
-    const err = await storage.delete(id, delete_token);
+    const err = await storage.delete(id, ownerToken);
     if (!err) {
       res.sendStatus(200);
     }

server/routes/download.js

@@ -19,12 +19,12 @@ module.exports = async function(req, res) {
     const hmac = crypto.createHmac('sha256', Buffer.from(meta.auth, 'base64'));
     hmac.update(Buffer.from(meta.nonce, 'base64'));
     const verifyHash = hmac.digest();
-    const nonce = crypto.randomBytes(16).toString('base64');
-    storage.setField(id, 'nonce', nonce);
     if (!verifyHash.equals(Buffer.from(auth, 'base64'))) {
-      res.set('WWW-Authenticate', `send-v1 ${nonce}`);
+      res.set('WWW-Authenticate', `send-v1 ${meta.nonce}`);
       return res.sendStatus(401);
     }
+    const nonce = crypto.randomBytes(16).toString('base64');
+    storage.setField(id, 'nonce', nonce);
     const contentLength = await storage.length(id);
     res.writeHead(200, {
       'Content-Disposition': 'attachment',
@@ -36,10 +36,16 @@ module.exports = async function(req, res) {
     const file_stream = storage.get(id);
 
     file_stream.on('end', async () => {
+      const dl = (+meta.dl || 0) + 1;
+      const dlimit = +meta.dlimit || 1;
       try {
-        await storage.forceDelete(id);
+        if (dl >= dlimit) {
+          await storage.forceDelete(id);
+        } else {
+          await storage.setField(id, 'dl', dl);
+        }
       } catch (e) {
-        log.info('DeleteError:', id);
+        log.info('StorageError:', id);
       }
     });
 

server/routes/index.js

@@ -42,26 +42,32 @@ module.exports = function(app) {
       force: !IS_DEV
     })
   );
-  app.use(
+  if (!IS_DEV) {
-    helmet.contentSecurityPolicy({
+    app.use(
-      directives: {
+      helmet.contentSecurityPolicy({
-        defaultSrc: ["'self'"],
+        directives: {
-        connectSrc: [
+          defaultSrc: ["'self'"],
-          "'self'",
+          connectSrc: [
-          'https://sentry.prod.mozaws.net',
+            "'self'",
-          'https://www.google-analytics.com'
+            'https://sentry.prod.mozaws.net',
-        ],
+            'https://www.google-analytics.com'
-        imgSrc: ["'self'", 'https://www.google-analytics.com'],
+          ],
-        scriptSrc: ["'self'"],
+          imgSrc: ["'self'", 'https://www.google-analytics.com'],
-        styleSrc: ["'self'", "'unsafe-inline'", 'https://code.cdn.mozilla.net'],
+          scriptSrc: ["'self'"],
-        fontSrc: ["'self'", 'https://code.cdn.mozilla.net'],
+          styleSrc: [
-        formAction: ["'none'"],
+            "'self'",
-        frameAncestors: ["'none'"],
+            "'unsafe-inline'",
-        objectSrc: ["'none'"],
+            'https://code.cdn.mozilla.net'
-        reportUri: '/__cspreport__'
+          ],
-      }
+          fontSrc: ["'self'", 'https://code.cdn.mozilla.net'],
-    })
+          formAction: ["'none'"],
-  );
+          frameAncestors: ["'none'"],
+          objectSrc: ["'none'"],
+          reportUri: '/__cspreport__'
+        }
+      })
+    );
+  }
   app.use(
     busboy({
       limits: {
@@ -88,6 +94,7 @@ module.exports = function(app) {
   app.post('/api/upload', require('./upload'));
   app.post('/api/delete/:id', require('./delete'));
   app.post('/api/password/:id', require('./password'));
+  app.post('/api/params/:id', require('./params'));
 
   app.get('/__version__', function(req, res) {
     res.sendFile(require.resolve('../../dist/version.json'));

server/routes/metadata.js

@@ -17,12 +17,14 @@ module.exports = async function(req, res) {
     const hmac = crypto.createHmac('sha256', Buffer.from(meta.auth, 'base64'));
     hmac.update(Buffer.from(meta.nonce, 'base64'));
     const verifyHash = hmac.digest();
+    if (!verifyHash.equals(Buffer.from(auth, 'base64'))) {
+      res.set('WWW-Authenticate', `send-v1 ${meta.nonce}`);
+      return res.sendStatus(401);
+    }
     const nonce = crypto.randomBytes(16).toString('base64');
     storage.setField(id, 'nonce', nonce);
     res.set('WWW-Authenticate', `send-v1 ${nonce}`);
-    if (!verifyHash.equals(Buffer.from(auth, 'base64'))) {
+
-      return res.sendStatus(401);
-    }
     const size = await storage.length(id);
     const ttl = await storage.ttl(id);
     res.send({

server/routes/params.js

@@ -0,0 +1,32 @@
+const storage = require('../storage');
+
+function validateID(route_id) {
+  return route_id.match(/^[0-9a-fA-F]{10}$/) !== null;
+}
+
+module.exports = async function(req, res) {
+  const id = req.params.id;
+  if (!validateID(id)) {
+    return res.sendStatus(404);
+  }
+  const ownerToken = req.body.owner_token;
+  if (!ownerToken) {
+    return res.sendStatus(400);
+  }
+
+  const dlimit = req.body.dlimit;
+  if (!dlimit || dlimit > 20) {
+    return res.sendStatus(400);
+  }
+
+  try {
+    const meta = await storage.metadata(id);
+    if (meta.owner !== ownerToken) {
+      return res.sendStatus(400);
+    }
+    storage.setField(id, 'dlimit', dlimit);
+    res.sendStatus(200);
+  } catch (e) {
+    res.sendStatus(404);
+  }
+};

server/routes/password.js

@@ -20,12 +20,13 @@ module.exports = async function(req, res) {
     const hmac = crypto.createHmac('sha256', Buffer.from(meta.auth, 'base64'));
     hmac.update(Buffer.from(meta.nonce, 'base64'));
     const verifyHash = hmac.digest();
-    const nonce = crypto.randomBytes(16).toString('base64');
-    storage.setField(id, 'nonce', nonce);
     if (!verifyHash.equals(Buffer.from(auth, 'base64'))) {
-      res.set('WWW-Authenticate', `send-v1 ${nonce}`);
+      res.set('WWW-Authenticate', `send-v1 ${meta.nonce}`);
       return res.sendStatus(401);
     }
+    const nonce = crypto.randomBytes(16).toString('base64');
+    storage.setField(id, 'nonce', nonce);
+    res.set('WWW-Authenticate', `send-v1 ${nonce}`);
   } catch (e) {
     res.sendStatus(404);
   }

server/routes/upload.js

@@ -12,9 +12,12 @@ module.exports = function(req, res) {
   if (!metadata || !auth) {
     return res.sendStatus(400);
   }
-
+  const owner = crypto.randomBytes(10).toString('hex');
   const meta = {
-    delete: crypto.randomBytes(10).toString('hex'),
+    dlimit: 1,
+    dl: 0,
+    owner,
+    delete: owner, // delete is deprecated
     metadata,
     pwd: 0,
     auth: auth.split(' ')[1],
@@ -30,7 +33,7 @@ module.exports = function(req, res) {
       res.set('WWW-Authenticate', `send-v1 ${meta.nonce}`);
       res.json({
         url,
-        delete: meta.delete,
+        owner: meta.owner,
         id: newId
       });
     } catch (e) {

server/storage.js

@@ -134,7 +134,7 @@ function localSet(newId, file, meta) {
       redis_client.hmset(newId, meta);
       redis_client.expire(newId, config.expire_seconds);
       log.info('localSet:', 'Upload Finished of ' + newId);
-      resolve(meta.delete);
+      resolve(meta.owner);
     });
 
     fstream.on('error', err => {
@@ -145,10 +145,10 @@ function localSet(newId, file, meta) {
   });
 }
 
-function localDelete(id, delete_token) {
+function localDelete(id, ownerToken) {
   return new Promise((resolve, reject) => {
     redis_client.hget(id, 'delete', (err, reply) => {
-      if (!reply || delete_token !== reply) {
+      if (!reply || ownerToken !== reply) {
         reject();
       } else {
         redis_client.del(id);
@@ -230,10 +230,10 @@ function awsSet(newId, file, meta) {
   );
 }
 
-function awsDelete(id, delete_token) {
+function awsDelete(id, ownerToken) {
   return new Promise((resolve, reject) => {
     redis_client.hget(id, 'delete', (err, reply) => {
-      if (!reply || delete_token !== reply) {
+      if (!reply || ownerToken !== reply) {
         reject();
       } else {
         const params = {

webpack.config.js

@@ -4,6 +4,12 @@ const CopyPlugin = require('copy-webpack-plugin');
 const ManifestPlugin = require('webpack-manifest-plugin');
 const IS_DEV = process.env.NODE_ENV === 'development';
 
+const regularJSOptions = {
+  babelrc: false,
+  presets: [['env', { modules: false }], 'stage-2'],
+  plugins: ['yo-yoify']
+};
+
 module.exports = {
   entry: {
     vendor: ['babel-polyfill', 'fluent'],
@@ -31,6 +37,16 @@ module.exports = {
               }
             ]
           },
+          {
+            include: require.resolve('./app/templates/header'),
+            use: [
+              {
+                loader: 'babel-loader',
+                options: regularJSOptions
+              },
+              './build/version_loader'
+            ]
+          },
           {
             include: [path.dirname(require.resolve('fluent'))],
             use: [
@@ -51,13 +67,11 @@ module.exports = {
             include: [
               path.resolve(__dirname, 'app'),
               path.resolve(__dirname, 'common'),
-              path.resolve(__dirname, 'node_modules/testpilot-ga/src')
+              path.resolve(__dirname, 'node_modules/testpilot-ga/src'),
+              path.resolve(__dirname, 'node_modules/fluent-intl-polyfill'),
+              path.resolve(__dirname, 'node_modules/intl-pluralrules')
             ],
-            options: {
+            options: regularJSOptions
-              babelrc: false,
-              presets: [['env', { modules: false }], 'stage-2'],
-              plugins: ['yo-yoify']
-            }
           },
           {
             include: [path.resolve(__dirname, 'node_modules')],