Revert "Remove some polyfills"

.gitlab-ci.yml

@@ -1,72 +1,105 @@
+image: "node:15-slim"
 
 stages:
   - test
+  - artifact
   - release
 
+before_script:
+  # Install dependencies
+  - apt-get update
+  - apt-get install -y git python3 build-essential libxtst6
+
+  # Prepare Chrome for puppeteer
+  - apt-get install -y wget gnupg
+  - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
+  - sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+  - apt-get update
+  - apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 --no-install-recommends
+
 # Build Send, run npm tests
 test:
   stage: test
-  image: "node:16-slim"
-  only:
-    - api
-    - branches
-    - chat
-    - merge_requests
-    - pushes
-    - schedules
-    - tags
-    - triggers
-    - web
-  before_script:
-    # Install dependencies
-    - apt-get update
-    - apt-get install -y git python3 build-essential libxtst6
-
-    # Prepare Chrome for puppeteer
-    - apt-get install -y wget gnupg
-    - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
-    - sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-    - apt-get update
-    - apt-get install -y gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils
-    - apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 --no-install-recommends
   script:
     - npm ci
     - npm run lint
     - npm test
 
-release-docker:
+# Build Docker image, export Docker image artifact
+artifact-docker:
+  stage: artifact
+  image: docker:latest
+  needs: []
+  services:
+    - docker:dind
+  variables:
+    IMG_FILE: "send:git-$CI_COMMIT_SHORT_SHA.tar"
+    IMG_NAME: "send:git-$CI_COMMIT_SHORT_SHA"
+  before_script: []
+  script:
+    - docker build -t $IMG_NAME .
+    - docker image save -o $IMG_FILE $IMG_NAME
+  artifacts:
+    name: artifact-docker
+    paths:
+      - $IMG_FILE
+    expire_in: 1 week
+
+# Release public Docker image for the master branch
+release-docker-master:
   stage: release
   image: docker:latest
+  dependencies:
+    - artifact-docker
   services:
     - docker:dind
   only:
-    - api
-    - branches
-    - chat
-    - merge_requests
-    - pushes
-    - schedules
-    - tags
-    - triggers
-    - web
+    - master
+  variables:
+    IMG_IMPORT_FILE: "send:git-$CI_COMMIT_SHORT_SHA.tar"
+    IMG_IMPORT_NAME: "send:git-$CI_COMMIT_SHORT_SHA"
+    IMG_NAME: "registry.gitlab.com/timvisee/send:master-$CI_COMMIT_SHORT_SHA"
+  before_script: []
   script:
-    - docker login "$CI_REGISTRY" -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
-    - docker buildx create --name sendBuilder
-    - docker buildx use sendBuilder
-    - |
-      if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then
-        IMAGE_NAMES="$CI_REGISTRY_IMAGE/mr:$CI_MERGE_REQUEST_IID"
-      elif [ "$CI_COMMIT_TAG" != "" ]; then
-        IMAGE_NAMES="$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG $CI_REGISTRY_IMAGE:latest"
-      else
-        IMAGE_NAMES="$CI_REGISTRY_IMAGE/$CI_COMMIT_BRANCH:$CI_COMMIT_SHORT_SHA"
-      fi
-    - |
-      for image in $IMAGE_NAMES; do
-        docker buildx build --platform linux/amd64,linux/arm64 -t $image . --push
-      done
-    - |
-      echo "Container image pushed. You can pull it with";
-      for image in $IMAGE_NAMES; do
-        echo "docker pull $image"
-      done
+    # Login in to registry
+    - 'docker login registry.gitlab.com -u $DOCKER_USER -p $DOCKER_PASS'
+
+    # Load existing, retag for new image images
+    - docker image load -i $IMG_IMPORT_FILE
+    - docker tag $IMG_IMPORT_NAME $IMG_NAME
+
+    # Publish tagged image
+    - docker push $IMG_NAME
+
+    - 'echo "Docker image artifact published, available as:" && echo "  docker pull $IMG_NAME"'
+
+# Release public Docker image for a version tag
+release-docker:
+  stage: release
+  image: docker:latest
+  dependencies:
+    - artifact-docker
+  services:
+    - docker:dind
+  only:
+    - /^v(\d+\.)*\d+$/
+  variables:
+    IMG_IMPORT_FILE: "send:git-$CI_COMMIT_SHORT_SHA.tar"
+    IMG_IMPORT_NAME: "send:git-$CI_COMMIT_SHORT_SHA"
+    IMG_NAME: "registry.gitlab.com/timvisee/send:$CI_COMMIT_REF_NAME"
+    IMG_NAME_LATEST: "registry.gitlab.com/timvisee/send:latest"
+  before_script: []
+  script:
+    # Login in to registry
+    - 'docker login registry.gitlab.com -u $DOCKER_USER -p $DOCKER_PASS'
+
+    # Load existing, retag for new image images
+    - docker image load -i $IMG_IMPORT_FILE
+    - docker tag $IMG_IMPORT_NAME $IMG_NAME
+    - docker tag $IMG_IMPORT_NAME $IMG_NAME_LATEST
+
+    # Publish tagged image
+    - docker push $IMG_NAME
+    - docker push $IMG_NAME_LATEST
+
+    - 'echo "Docker image artifact published, available as:" && echo "  docker pull $IMG_NAME_LATEST" && echo "  docker pull $IMG_NAME"'

README.md

@@ -152,7 +152,7 @@ AWS example using Ubuntu Server `20.04`: [docs/AWS.md](docs/AWS.md)
 - Web: _this repository_
 - Command-line: [`ffsend`](https://github.com/timvisee/ffsend)
 - Android: _see [Android](#android) section_
-- Thunderbird: [FileLink provider for Send](https://addons.thunderbird.net/thunderbird/addon/filelink-provider-for-send/)
+- Thunderbird: [FileLink provider for Send](https://addons.thunderbird.net/en-US/thunderbird/addon/filelink-provider-for-send/)
 
 #### Android
 

app/archive.js

@@ -17,7 +17,6 @@ export default class Archive {
   constructor(files = [], defaultTimeLimit = 86400, defaultDownloadLimit = 1) {
     this.files = Array.from(files);
     this.defaultTimeLimit = defaultTimeLimit;
-    this.defaultDownloadLimit = defaultDownloadLimit;
     this.timeLimit = defaultTimeLimit;
     this.dlimit = defaultDownloadLimit;
     this.password = null;
@@ -77,7 +76,7 @@ export default class Archive {
 
   clear() {
     this.files = [];
-    this.dlimit = this.defaultDownloadLimit;
+    this.dlimit = 1;
     this.timeLimit = this.defaultTimeLimit;
     this.password = null;
   }

app/ui/archiveTile.js

@@ -26,7 +26,7 @@ function expiryInfo(translate, archive) {
 }
 
 function password(state) {
-  const MAX_LENGTH = 4096;
+  const MAX_LENGTH = 32;
 
   return html`
     <div class="mb-2 px-1">

app/ui/downloadPassword.js

@@ -32,7 +32,7 @@ module.exports = function(state, emit) {
           class="w-full border-l border-t border-b rounded-l-lg rounded-r-none ${invalid
             ? 'border-red dark:border-red-40'
             : 'border-grey'} leading-loose px-2 py-1 dark:bg-grey-80"
-          maxlength="4096"
+          maxlength="32"
           autocomplete="off"
           placeholder="${state.translate('unlockInputPlaceholder')}"
           oninput="${inputChanged}"

app/ui/footer.js

@@ -65,45 +65,6 @@ class Footer extends Component {
       `);
     }
 
-    // Defining a custom footer
-    var footer = [];
-    if (this.state != undefined && this.state.WEB_UI != undefined) {
-      const WEB_UI = this.state.WEB_UI;
-
-      if (WEB_UI.CUSTOM_FOOTER_URL != '' && WEB_UI.CUSTOM_FOOTER_TEXT != '') {
-        footer.push(html`
-          <li class="m-2">
-            <a href="${WEB_UI.CUSTOM_FOOTER_URL}" target="_blank">
-              ${WEB_UI.CUSTOM_FOOTER_TEXT}
-            </a>
-          </li>
-        `);
-      }
-      else if (WEB_UI.CUSTOM_FOOTER_URL != '') {
-        footer.push(html`
-          <li class="m-2">
-            <a href="${WEB_UI.CUSTOM_FOOTER_URL}" target="_blank">
-              ${WEB_UI.CUSTOM_FOOTER_URL}
-            </a>
-          </li>
-        `);
-      }
-      else if (WEB_UI.CUSTOM_FOOTER_TEXT != '') {
-        footer.push(html`
-          <li class="m-2">
-            ${WEB_UI.CUSTOM_FOOTER_TEXT}
-          </li>
-        `)
-      }
-      else  {
-        footer.push(html`
-          <li class="m-2">
-            ${translate('footerText')}
-          </li>
-        `);
-      }
-    }
-
     return html`
       <footer
         class="flex flex-col md:flex-row items-start w-full flex-none self-start p-6 md:p-8 font-medium text-xs text-grey-60 dark:text-grey-40 md:items-center justify-between"
@@ -111,7 +72,7 @@ class Footer extends Component {
         <ul
           class="flex flex-col md:flex-row items-start md:items-center md:justify-start"
         >
-          ${footer}
+          <li class="m-2">${translate('footerText')}</li>
         </ul>
         <ul
           class="flex flex-col md:flex-row items-start md:items-center md:justify-end"

docs/docker.md

@@ -9,7 +9,6 @@ docker pull registry.gitlab.com/timvisee/send:latest
 docker run -v $PWD/uploads:/uploads -p 1443:1443 \
     -e 'DETECT_BASE_URL=true' \
     -e 'REDIS_HOST=localhost' \
-    -e 'FILE_DIR=/uploads' \
     registry.gitlab.com/timvisee/send:latest
 ```
 
@@ -34,7 +33,7 @@ Config options expecting array values (e.g. `EXPIRE_TIMES_SECONDS`, `DOWNLOAD_CO
 | `PORT`           | Port the server will listen on (defaults to `1443`)
 | `NODE_ENV`       | Run in `development` mode (unsafe) or `production` mode (the default)
 | `SEND_FOOTER_DMCA_URL` | A URL to a contact page for DMCA requests (empty / not shown by default)
-| `SENTRY_CLIENT`, `SENTRY_DSN`  | Sentry Client ID and DSN for error tracking (optional, disabled by default)
+| `SENTRY_CLIENT`, `SENTRY_DSN`  | Sentry Client ID and DNS for error tracking (optional, disabled by default)
 
 *Note: more options can be found here: https://github.com/timvisee/send/blob/master/server/config.js*
 
@@ -97,11 +96,6 @@ See the table below for the variables and their default values.
 | UI_CUSTOM_ASSETS_FACEBOOK | | A custom header image for Facebook |
 | UI_CUSTOM_ASSETS_TWITTER | | A custom header image for Twitter |
 | UI_CUSTOM_ASSETS_WORDMARK | | A custom wordmark (Text next to the logo) |
-| UI_CUSTOM_CSS | | Allows you to define a custom CSS file for custom styling |
-| CUSTOM_FOOTER_TEXT | | Allows you to define a custom footer |
-| CUSTOM_FOOTER_URL | | Allows you to define a custom URL in your footer |
-
-Side note: If you define a custom URL and a custom footer, only the footer text will display, but will be hyperlinked to the URL.
 
 ## Examples
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "send",
   "description": "File Sharing Experiment",
-  "version": "3.4.23",
+  "version": "3.4.20",
   "author": "Mozilla (https://mozilla.org)",
   "contributors": [
     "Tim Visee <3a4fb3964f@sinenomine.email> (https://timvisee.com)"
@@ -98,7 +98,7 @@
     "husky": "^3.0.9",
     "intl-pluralrules": "^1.3.1",
     "lint-staged": "^9.4.2",
-    "mocha": "^10.1.0",
+    "mocha": "^6.2.2",
     "morgan": "^1.9.1",
     "nanobus": "^4.5.0",
     "nanohtml": "^1.9.0",
@@ -141,7 +141,7 @@
     "choo": "^7.0.0",
     "cldr-core": "^35.1.0",
     "configstore": "github:dannycoates/configstore#master",
-    "convict": "^6.2.4",
+    "convict": "^6.2.3",
     "convict-format-with-validator": "^6.2.0",
     "double-ended-queue": "^2.1.0-0",
     "express": "^4.17.3",

server/clientConstants.js

@@ -13,8 +13,6 @@ module.exports = {
     FOOTER_CLI_URL: config.footer_cli_url,
     FOOTER_DMCA_URL: config.footer_dmca_url,
     FOOTER_SOURCE_URL: config.footer_source_url,
-    CUSTOM_FOOTER_TEXT: config.custom_footer_text,
-    CUSTOM_FOOTER_URL: config.custom_footer_url,
     COLORS: {
       PRIMARY: config.ui_color_primary,
       ACCENT: config.ui_color_accent

server/config.js

@@ -165,19 +165,9 @@ const conf = convict({
   },
   base_url: {
     format: 'url',
-    default: 'https://send.example.com',
+    default: 'https://send.firefox.com',
     env: 'BASE_URL'
   },
-  custom_title: {
-    format: String,
-    default: 'Send',
-    env: 'CUSTOM_TITLE'
-  },
-  custom_description: {
-    format: String,
-    default: 'Encrypt and send files with a link that automatically expires to ensure your important documents don’t stay online forever.',
-    env: 'CUSTOM_DESCRIPTION'
-  },
   detect_base_url: {
     format: Boolean,
     default: false,
@@ -253,16 +243,6 @@ const conf = convict({
     default: 'https://github.com/timvisee/send',
     env: 'SEND_FOOTER_SOURCE_URL'
   },
-  custom_footer_text: {
-    format: String,
-    default: '',
-    env: 'CUSTOM_FOOTER_TEXT'
-  },
-  custom_footer_url: {
-    format: String,
-    default: '',
-    env: 'CUSTOM_FOOTER_URL'
-  },
   ui_color_primary: {
     format: String,
     default: '#0a84ff',
@@ -273,11 +253,6 @@ const conf = convict({
     default: '#003eaa',
     env: 'UI_COLOR_ACCENT'
   },
-  custom_locale: {
-    format: String,
-    default: '',
-    env: 'CUSTOM_LOCALE'
-  },
   ui_custom_assets: {
     android_chrome_192px: {
       format: String,
@@ -328,11 +303,6 @@ const conf = convict({
       format: String,
       default: '',
       env: 'UI_CUSTOM_ASSETS_WORDMARK'
-    },
-    custom_css: {
-      format: String,
-      default: '',
-      env: 'UI_CUSTOM_CSS'
     }
   }
 });

server/layout.js

@@ -3,10 +3,6 @@ const assets = require('../common/assets');
 const initScript = require('./initScript');
 
 module.exports = function(state, body = '') {
-  const custom_css = state.ui.assets.custom_css !== ''
-    ? html`<link rel="stylesheet" type="text/css" href="${state.ui.assets.custom_css}" />`
-    : ''
-
   return html`
     <!DOCTYPE html>
     <html lang="${state.locale}">
@@ -44,7 +40,6 @@ module.exports = function(state, body = '') {
           type="text/css"
           href="${assets.get('app.css')}"
         />
-        ${custom_css}
         <link
           rel="apple-touch-icon"
           sizes="180x180"

server/state.js

@@ -3,18 +3,9 @@ const layout = require('./layout');
 const assets = require('../common/assets');
 const getTranslator = require('./locale');
 const { getFxaConfig } = require('./fxa');
-const fs = require('fs');
-const path = require('path');
 
 module.exports = async function(req) {
-  const locale = (() => {
-    if (config.custom_locale != '' && fs.existsSync(path.join(__dirname,'../public/locales',config.custom_locale))) {
-        return config.custom_locale;
-    }
-    else {
-      return req.language || 'en-US';
-    }
-  })();
+  const locale = req.language || 'en-US';
   let authConfig = null;
   let robots = 'none';
   if (req.route && req.route.path === '/') {
@@ -43,8 +34,7 @@ module.exports = async function(req) {
     safari_pinned_tab: assets.get('safari-pinned-tab.svg'),
     facebook: baseUrl + '/' + assets.get('send-fb.jpg'),
     twitter: baseUrl + '/' + assets.get('send-twitter.jpg'),
-    wordmark: assets.get('wordmark.svg') + '#logo',
-    custom_css: ''
+    wordmark: assets.get('wordmark.svg') + '#logo'
   };
   Object.keys(uiAssets).forEach(index => {
     if (config.ui_custom_assets[index] !== '')
@@ -57,8 +47,9 @@ module.exports = async function(req) {
     locale,
     capabilities: { account: false },
     translate: getTranslator(locale),
-    title: config.custom_title,
-    description: config.custom_description,
+    title: 'Send',
+    description:
+      'Encrypt and send files with a link that automatically expires to ensure your important documents don’t stay online forever.',
     baseUrl,
     ui: {
       colors: {