2 (#38)

* use redis

* update frontend and switch sanitize library

* changelog

* theming

* docker image

* documentation

* changelog

* clear up limit sizes

* version bump

* version bump

.dockerignore

@@ -1,2 +1,15 @@
-/**/target
+*
-/**/node_modules
+
+!/backend/src
+!/backend/Cargo.lock
+!/backend/Cargo.toml
+
+!/frontend/locales
+!/frontend/src
+!/frontend/static
+!/frontend/.npmrc
+!/frontend/package.json
+!/frontend/pnpm-lock.yaml
+!/frontend/svelte.config.js
+!/frontend/tsconfig.json
+!/frontend/vite.config.js

CHANGELOG.md

@@ -5,6 +5,50 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.0] - 2022-07-16
+
+### Added
+
+- Theming for logo and description text
+
+### Changed
+
+- Moved to redis
+- New html sanitizing library
+
+## [2.0.0-rc.0] - 2022-07-15
+
+### Added
+
+- Theming for logo and description text
+
+### Changed
+
+- Moved to redis
+- New html sanitizing library
+
+## [1.5.3] - 2022-06-07
+
+### Changed
+
+- Use the value from the `MEMCACHE` env variable in startup script.
+
+## [1.5.2] - 2022-06-07
+
+### Added
+
+- Wait for script for memecached.
+
+### Security
+
+- Updated dependencies.
+
+## [1.5.1] - 2022-05-15
+
+### Fixed
+
+- Remove double note content.
+
 ## [1.5.0] - 2022-05-14
 
 ### Added

Dockerfile

@@ -1,31 +1,25 @@
-# Frontend
+# FRONTEND
-FROM node:16-alpine as CLIENT
+FROM node:16-alpine as client 
-
 WORKDIR /tmp
+RUN npm install -g pnpm@7
 COPY ./frontend ./
-
-RUN npm install -g pnpm
 RUN pnpm install
 RUN pnpm run build
 
-# Backend
-FROM rust:1.59-alpine as RUST
 
+# BACKEND
+FROM rust:1.61-alpine as backend
 WORKDIR /tmp
 RUN apk add libc-dev openssl-dev alpine-sdk
 COPY ./backend ./
-
 RUN cargo build --release
 
-# Server
+
+# RUNNER
 FROM alpine
-
 WORKDIR /app
-COPY --from=RUST /tmp/target/release/cryptgeon .
+COPY --from=backend /tmp/target/release/cryptgeon .
-COPY --from=CLIENT /tmp/build ./frontend/build
+COPY --from=client /tmp/build ./frontend/build
-
+ENV REDIS=redis://redis/
-ENV MEMCACHE=memcached:11211
-
 EXPOSE 5000
-
 ENTRYPOINT [ "/app/cryptgeon" ]

README.md

@@ -9,10 +9,12 @@
   <img alt="Latest version" src="https://img.shields.io/github/v/release/cupcakearmy/cryptgeon?style=for-the-badge" />
 </a>
 
-<br/>
+<br/><br/>
 <a href="https://www.producthunt.com/posts/cryptgeon?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cryptgeon" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=295189&theme=light" alt="Cryptgeon - Securely share self-destructing notes | Product Hunt" height="50" /></a>
 <a href=""><img src="./.github/lokalise.png" height="50">
-<br/>
+<br/><br/>
+
+EN | [简体中文](README_zh-CN.md)
 
 ## About?
 
@@ -49,12 +51,14 @@ of the notes even if it tried to.
 ## Environment Variables
 
 | Variable         | Default          | Description                                                                                                               |
-| ---------------- | ----------------- | --------------------------------------------------------------------------------------- |
+| ---------------- | ---------------- | ------------------------------------------------------------------------------------------------------------------------- |
-| `MEMCACHE`       | `memcached:11211` | Memcached URL to connect to.                                                            |
+| `REDIS`          | `redis://redis/` | Redis URL to connect to.                                                                                                  |
-| `SIZE_LIMIT`     | `1 KiB`           | Max size for body. Accepted values according to [byte-unit](https://docs.rs/byte-unit/) |
+| `SIZE_LIMIT`     | `1 KiB`          | Max size for body. Accepted values according to [byte-unit](https://docs.rs/byte-unit/). `512 MiB` is the maximum allowed |
 | `MAX_VIEWS`      | `100`            | Maximal number of views.                                                                                                  |
 | `MAX_EXPIRATION` | `360`            | Maximal expiration in minutes.                                                                                            |
 | `ALLOW_ADVANCED` | `true`           | Allow custom configuration. If set to `false` all notes will be one view only.                                            |
+| `THEME_IMAGE`    | `""`             | Custom image for replacing the logo. Must be publicly reachable                                                           |
+| `THEME_TEXT`     | `""`             | Custom text for replacing the description below the logo                                                                  |
 
 ## Deployment
 
@@ -67,19 +71,18 @@ Docker is the easiest way. There is the [official image here](https://hub.docker
 ```yaml
 # docker-compose.yml
 
-version: '3.7'
+version: '3.8'
 
 services:
-  memcached:
+  redis:
-    image: memcached:1-alpine
+    image: redis:7-alpine
-    entrypoint: memcached -m 128M -I 4M # Limit to 128 MB Ram, 4M per entry, customize at free will.
 
   app:
     image: cupcakearmy/cryptgeon:latest
     depends_on:
-      - memcached
+      - redis
     environment:
-      SIZE_LIMIT: 4M
+      SIZE_LIMIT: 4 MiB
     ports:
       - 80:5000
 ```
@@ -105,16 +108,15 @@ networks:
     external: true
 
 services:
-  memcached:
+  redis:
-    image: memcached:1-alpine
+    image: redis:7-alpine
     restart: unless-stopped
-    entrypoint: memcached -m 128M -I 4M # Limit to 128 MB Ram, 4M per entry, customize at free will.
 
   app:
     image: cupcakearmy/cryptgeon:latest
     restart: unless-stopped
     depends_on:
-      - memcached
+      - redis
     networks:
       - default
       - proxy
@@ -130,7 +132,7 @@ services:
 **Requirements**
 
 - `pnpm`: `>=6`
-- `node`: `>=14`
+- `node`: `>=16`
 - `rust`: edition `2021`
 
 **Install**
@@ -157,9 +159,9 @@ pnpm run dev
 
 Running `pnpm run dev` in the root folder will start the following things:
 
-- a memcache docker container
+- redis docker container
-- rust backend with hot reload
+- rust backend
-- client with hot reload
+- client
 
 You can see the app under [localhost:1234](http://localhost:1234).
 

README_zh-CN.md

@@ -0,0 +1,166 @@
+<p align="center">
+  <img src="./design/Github_zh-CN.png" alt="logo">
+</p>
+
+<a href="https://discord.gg/nuby6RnxZt">
+  <img alt="discord" src="https://img.shields.io/discord/252403122348097536?style=for-the-badge" />
+  <img alt="docker pulls" src="https://img.shields.io/docker/pulls/cupcakearmy/cryptgeon?style=for-the-badge" />
+  <img alt="Docker image size badge" src="https://img.shields.io/docker/image-size/cupcakearmy/cryptgeon?style=for-the-badge" />
+  <img alt="Latest version" src="https://img.shields.io/github/v/release/cupcakearmy/cryptgeon?style=for-the-badge" />
+</a>
+
+<br/>
+<a href="https://www.producthunt.com/posts/cryptgeon?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cryptgeon" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=295189&theme=light" alt="Cryptgeon - Securely share self-destructing notes | Product Hunt" height="50" /></a>
+<a href=""><img src="./.github/lokalise.png" height="50">
+<br/>
+
+[EN](README.md) | 简体中文
+
+## 关于本项目
+
+_加密鸽_ 是一个受 [_PrivNote_](https://privnote.com)项目启发的安全、开源共享密信和文件共享服务器
+
+> 🌍 如果你想翻译此项目请随时与我联系.
+>
+> 感谢 [Lokalise](https://lokalise.com/) 提供免费的平台服务支持
+
+## 演示示例
+
+查看加密鸽的在线演示 demo： https://cryptgeon.nicco.io.
+
+## 功能
+
+- 服务端无法解密和查看客户端加密的内容
+- 查看次数或时间限制，阅后即焚
+- 您发送的数据将存放于内存中，不会写入到磁盘中
+- 黑暗模式支持
+
+## 加密鸽是如何工作的？
+
+加密鸽会为每条笔记都生成一个独立的 <code>id (256bit)</code> 和 <code>key 256(bit)</code>。
+
+其中<code>id</code>用于保存和提取密信， 在这之后这封密信将会被客户端使用 AES 算法的 GCM 模式和`key`进行加密然后发送至服务器，数据将会保存在服务器的内存中且永远不会被持久化到硬盘上，服务端永远不会得到密钥并且无法解读密信的内容。
+
+## 屏幕截图
+
+![screenshot](./design/Screens.png)
+
+## 环境变量
+
+| 变量名称          | 默认值           | 描述                                                                              |
+| ----------------- | ---------------- | --------------------------------------------------------------------------------- |
+| `REDIS`           | `redis://redis/` | Redis URL to connect to.                                                          |
+| `SIZE_LIMIT`      | `1 KiB`          | 最大请求体(body)限制。有关支持的数值请查看 [字节单位](https://docs.rs/byte-unit/) |
+| `MAX_VIEWS`       | `100`            | 密信最多查看次数限制                                                              |
+| ` MAX_EXPIRATION` | `360`            | 密信最长过期时间限制(分钟)                                                        |
+| `ALLOW_ADVANCED`  | `true`           | 是否允许自定义设置，该项如果设为`false`，则不会显示自定义设置模块                 |
+
+## 部署
+
+ℹ️ 加密鸽必须使用`https`，否则浏览器可能将不会支援加密鸽的加密算法。
+
+### Docker
+
+Docker 是最简单的部署方式。这里是[官方镜像的地址](https://hub.docker.com/r/cupcakearmy/cryptgeon)。
+
+附：译者的[部署笔记](https://www.hash070.top/archives/cryptgeon-docker-deploy.html)
+
+```yaml
+# docker-compose.yml
+version: '3.8'
+
+services:
+  redis:
+    image: redis:7-alpine
+
+  app:
+    image: cupcakearmy/cryptgeon:latest
+    depends_on:
+      - redis
+    environment:
+      SIZE_LIMIT: 4 MiB
+    ports:
+      - 80:5000
+```
+
+### NGINX 反向代理
+
+查看 [examples/nginx](https://github.com/cupcakearmy/cryptgeon/tree/main/examples/nginx) 目录。那里有几个示例反代配置文件模板，其中一个是带 https 配置的反代配置模板，你需要指定服务器的名称和证书才能生效。
+
+### Traefik 2
+
+假设:
+
+- 外部 Docker 代理网络 `proxy`
+- 证书解析器 `le`
+- 一个 https 入站点 `secure`
+- 域名 `example.org`
+
+```yaml
+version: '3.8'
+
+networks:
+  proxy:
+    external: true
+
+services:
+  redis:
+    image: redis:7-alpine
+    restart: unless-stopped
+
+  app:
+    image: cupcakearmy/cryptgeon:latest
+    restart: unless-stopped
+    depends_on:
+      - redis
+    networks:
+      - default
+      - proxy
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.cryptgeon.rule=Host(`example.org`)
+      - traefik.http.routers.cryptgeon.entrypoints=secure
+      - traefik.http.routers.cryptgeon.tls.certresolver=le
+```
+
+## 开发
+
+**环境要求**
+
+- `pnpm`: `>=6`
+- `node`: `>=14`
+- `rust`: edition `2021`
+
+**安装**
+
+```bash
+pnpm install
+pnpm --prefix frontend install
+
+# Also you need cargo watch if you don't already have it installed.
+# https://lib.rs/crates/cargo-watch
+cargo install cargo-watch
+```
+
+**运行**
+
+确保你的 Docker 正在运行
+
+> If you are on `macOS` you might need to disable AirPlay Receiver as it uses port 5000 (So stupid...)
+> https://developer.apple.com/forums/thread/682332
+
+```bash
+pnpm run dev
+```
+
+在根目录执行 `pnpm run dev` 会开启下列服务:
+
+- 一个 redis docker 容器
+- 无热重载的 rust 后端
+- 可热重载的客户端
+
+你可以通过 1234 端口进入该应用，即 [localhost:1234](http://localhost:1234).
+
+###### Attributions
+
+本项目所使用的图标由<a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com 的<a href="https://www.freepik.com" title="Freepik">freepik</a>制作</a>

backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cryptgeon"
-version = "1.5.0"
+version = "2.0.0"
 authors = ["cupcakearmy <hi@nicco.io>"]
 edition = "2021"
 
@@ -18,7 +18,8 @@ serde_json = "1"
 lazy_static = "1"
 ring = "0.16"
 bs62 = "0.1"
-memcache = "0.16"
 byte-unit = "4"
 dotenv = "0.15"
 mime = "0.3"
+env_logger = "0.9"
+redis = "0.21.5"

backend/src/config.rs

@@ -1,13 +1,18 @@
 use byte_unit::Byte;
 
+// General
 lazy_static! {
     pub static ref VERSION: String = option_env!("CARGO_PKG_VERSION")
         .unwrap_or("Unknown")
         .to_string();
-  pub static ref LIMIT: u32 =
+}
+
+// CONFIG
+lazy_static! {
+  pub static ref LIMIT: usize =
     Byte::from_str(std::env::var("SIZE_LIMIT").unwrap_or("1 KiB".to_string()))
       .unwrap()
-      .get_bytes() as u32;
+      .get_bytes() as usize;
   pub static ref MAX_VIEWS: u32 = std::env::var("MAX_VIEWS")
     .unwrap_or("100".to_string())
     .parse()
@@ -21,3 +26,15 @@ lazy_static! {
     .parse()
     .unwrap();
 }
+
+// THEME
+lazy_static! {
+    pub static ref THEME_IMAGE: String = std::env::var("THEME_IMAGE")
+        .unwrap_or("".to_string())
+        .parse()
+        .unwrap();
+    pub static ref THEME_TEXT: String = std::env::var("THEME_TEXT")
+        .unwrap_or("".to_string())
+        .parse()
+        .unwrap();
+}

backend/src/main.rs

@@ -1,4 +1,7 @@
-use actix_web::{middleware, web, App, HttpServer};
+use actix_web::{
+    middleware::{self, Logger},
+    web, App, HttpServer,
+};
 use dotenv::dotenv;
 
 #[macro_use]
@@ -15,8 +18,10 @@ mod store;
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
     dotenv().ok();
+    env_logger::init_from_env(env_logger::Env::new().default_filter_or("warning"));
     return HttpServer::new(|| {
         App::new()
+            .wrap(Logger::new("%a \"%r\" %s %b %T"))
             .wrap(middleware::Compress::default())
             .wrap(middleware::DefaultHeaders::default())
             .configure(size::init)

backend/src/note/routes.rs

@@ -22,9 +22,11 @@ struct NotePath {
 async fn one(path: web::Path<NotePath>) -> impl Responder {
     let p = path.into_inner();
     let note = store::get(&p.id);
+
     match note {
-        None => return HttpResponse::NotFound().finish(),
+        Ok(Some(_)) => HttpResponse::Ok().json(NoteInfo {}),
-        Some(_) => return HttpResponse::Ok().json(NoteInfo {}),
+        Ok(None) => HttpResponse::NotFound().finish(),
+        Err(e) => HttpResponse::InternalServerError().body(e.to_string()),
     }
 }
 
@@ -64,8 +66,10 @@ async fn create(note: web::Json<Note>) -> impl Responder {
         }
         _ => {}
     }
-    store::set(&id.clone(), &n.clone());
+    match store::set(&id.clone(), &n.clone()) {
-    return HttpResponse::Ok().json(CreateResponse { id: id });
+        Ok(_) => return HttpResponse::Ok().json(CreateResponse { id: id }),
+        Err(e) => return HttpResponse::InternalServerError().body(e.to_string()),
+    }
 }
 
 #[delete("/{id}")]
@@ -73,8 +77,9 @@ async fn delete(path: web::Path<NotePath>) -> impl Responder {
     let p = path.into_inner();
     let note = store::get(&p.id);
     match note {
-        None => return HttpResponse::NotFound().finish(),
+        Err(e) => HttpResponse::InternalServerError().body(e.to_string()),
-        Some(note) => {
+        Ok(None) => return HttpResponse::NotFound().finish(),
+        Ok(Some(note)) => {
             let mut changed = note.clone();
             if changed.views == None && changed.expiration == None {
                 return HttpResponse::BadRequest().finish();
@@ -84,9 +89,19 @@ async fn delete(path: web::Path<NotePath>) -> impl Responder {
                     changed.views = Some(v - 1);
                     let id = p.id.clone();
                     if v <= 1 {
-                        store::del(&id);
+                        match store::del(&id) {
+                            Err(e) => {
+                                return HttpResponse::InternalServerError().body(e.to_string())
+                            }
+                            _ => {}
+                        }
                     } else {
-                        store::set(&id, &changed.clone());
+                        match store::set(&id, &changed.clone()) {
+                            Err(e) => {
+                                return HttpResponse::InternalServerError().body(e.to_string())
+                            }
+                            _ => {}
+                        }
                     }
                 }
                 _ => {}
@@ -96,8 +111,12 @@ async fn delete(path: web::Path<NotePath>) -> impl Responder {
             match changed.expiration {
                 Some(e) => {
                     if e < n {
-                        store::del(&p.id.clone());
+                        match store::del(&p.id.clone()) {
-                        return HttpResponse::BadRequest().finish();
+                            Ok(_) => return HttpResponse::BadRequest().finish(),
+                            Err(e) => {
+                                return HttpResponse::InternalServerError().body(e.to_string())
+                            }
+                        }
                     }
                 }
                 _ => {}

backend/src/size.rs

@@ -1,18 +1,11 @@
+use crate::config;
 use actix_web::web;
-use byte_unit::Byte;
 use mime;
 
-lazy_static! {
-    pub static ref LIMIT: usize =
-        Byte::from_str(std::env::var("SIZE_LIMIT").unwrap_or("1 KiB".to_string()))
-            .unwrap()
-            .get_bytes() as usize;
-}
-
 pub fn init(cfg: &mut web::ServiceConfig) {
-    let json = web::JsonConfig::default().limit(*LIMIT);
+    let json = web::JsonConfig::default().limit(*config::LIMIT);
     let plain = web::PayloadConfig::default()
-        .limit(*LIMIT)
+        .limit(*config::LIMIT)
         .mimetype(mime::STAR_STAR);
     cfg.app_data(json).app_data(plain);
 }

backend/src/status/model.rs

@@ -2,9 +2,14 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]
 pub struct Status {
+    // General
     pub version: String,
+    // Config
     pub max_size: u32,
     pub max_views: u32,
     pub max_expiration: u32,
     pub allow_advanced: bool,
+    // Theme
+    pub theme_image: String,
+    pub theme_text: String,
 }

backend/src/status/routes.rs

@@ -7,10 +7,12 @@ use crate::status::Status;
 async fn get_status() -> impl Responder {
     return HttpResponse::Ok().json(Status {
         version: config::VERSION.to_string(),
-        max_size: *config::LIMIT,
+        max_size: *config::LIMIT as u32,
         max_views: *config::MAX_VIEWS,
         max_expiration: *config::MAX_EXPIRATION,
         allow_advanced: *config::ALLOW_ADVANCED,
+        theme_image: config::THEME_IMAGE.to_string(),
+        theme_text: config::THEME_TEXT.to_string(),
     });
 }
 

backend/src/store.rs

@@ -1,36 +1,55 @@
-use memcache;
+use redis;
+use redis::Commands;
 
 use crate::note::now;
 use crate::note::Note;
 
 lazy_static! {
-    static ref CLIENT: memcache::Client = memcache::connect(format!(
+    static ref REDIS_CLIENT: String = std::env::var("REDIS")
-        "memcache://{}?timeout=10&tcp_nodelay=true",
+        .unwrap_or("redis://127.0.0.1/".to_string())
-        std::env::var("MEMCACHE").unwrap_or("127.0.0.1:11211".to_string())
+        .parse()
-    ))
         .unwrap();
 }
 
-pub fn set(id: &String, note: &Note) {
+fn get_connection() -> Result<redis::Connection, &'static str> {
-    let serialized = serde_json::to_string(&note.clone()).unwrap();
+    let client =
-    let expiration: u32 = match note.expiration {
+        redis::Client::open(REDIS_CLIENT.to_string()).map_err(|_| "Unable to connect to redis")?;
-        Some(e) => e - now(),
+    client
-        None => 0,
+        .get_connection()
-    };
+        .map_err(|_| "Unable to connect to redis")
-    CLIENT.set(id, serialized, expiration).unwrap();
 }
 
-pub fn get(id: &String) -> Option<Note> {
+pub fn set(id: &String, note: &Note) -> Result<(), &'static str> {
-    let value: Option<String> = CLIENT.get(&id).unwrap();
+    let serialized = serde_json::to_string(&note.clone()).unwrap();
+    let mut conn = get_connection()?;
+
+    conn.set(id, serialized)
+        .map_err(|_| "Unable to set note in redis")?;
+    match note.expiration {
+        Some(e) => {
+            let seconds = e - now();
+            conn.expire(id, seconds as usize)
+                .map_err(|_| "Unable to set expiration on notion")?
+        }
+        None => {}
+    };
+    Ok(())
+}
+
+pub fn get(id: &String) -> Result<Option<Note>, &'static str> {
+    let mut conn = get_connection()?;
+    let value: Option<String> = conn.get(id).map_err(|_| "Could not load note in redis")?;
     match value {
-        None => return None,
+        None => return Ok(None),
         Some(s) => {
             let deserialize: Note = serde_json::from_str(&s).unwrap();
-            return Some(deserialize);
+            return Ok(Some(deserialize));
         }
     }
 }
 
-pub fn del(id: &String) {
+pub fn del(id: &String) -> Result<(), &'static str> {
-    CLIENT.delete(id).unwrap();
+    let mut conn = get_connection()?;
+    conn.del(id).map_err(|_| "Unable to delete note in redis")?;
+    Ok(())
 }

docker-compose.yml

@@ -1,21 +1,19 @@
 # DEV Compose file.
 # For a production file see: README.md
 
-version: '3.7'
+version: '3.8'
 
 services:
-  memcached:
+  redis:
-    image: memcached:1-alpine
+    image: redis:7-alpine
-    restart: unless-stopped
-    entrypoint: memcached -m 256M -I 128M
     ports:
-      - 11211:11211
+      - 6379:6379
 
   app:
     build: .
     depends_on:
-      - memcached
+      - redis
     environment:
-      SIZE_LIMIT: 128M
+      SIZE_LIMIT: 128 MiB
     ports:
       - 80:5000

examples/nginx/docker-compose.yaml

@@ -1,14 +1,13 @@
 version: '3.8'
 
 services:
-  memcached:
+  redis:
-    image: memcached:1-alpine
+    image: redis:7-alpine
-    entrypoint: memcached -m 256 -I 128 # Limit to 128 MB Ram, customize at free will. -m must be at least double than -I.
 
   app:
     image: cupcakearmy/cryptgeon:latest
     depends_on:
-      - memcached
+      - redis
     
   proxy:
     image: nginx:alpine

examples/scratch/README.md

@@ -7,7 +7,7 @@ This is a tiny guide to install cryptgeon on (probably) any unix system (and may
 3. Run the cryptgeon.
 4. [Optional] install watchtower to keep up to date.
 
-## Install Docker & DOcker Compose
+## Install Docker & Docker Compose
 
 - [Docker](https://docs.docker.com/engine/install/)
 - [Compose](https://docs.docker.com/compose/install/)
@@ -107,16 +107,15 @@ networks:
     external: true
 
 services:
-  memcached:
+  redis:
-    image: memcached:1-alpine
+    image: redis:7-alpine
     restart: unless-stopped
-    entrypoint: memcached -m 256M -I 4M # Limit to 128 MB Ram, customize at free will.
 
   app:
     image: cupcakearmy/cryptgeon:latest
     restart: unless-stopped
     depends_on:
-      - memcached
+      - redis
     environment:
       SIZE_LIMIT: 4 MiB
     networks:

frontend/licenses.csv

@@ -1,6 +1,7 @@
-├─ MIT: 46
+├─ MIT: 12
-├─ MIT*: 2
+├─ BSD-3-Clause: 1
-├─ BSD-3-Clause: 2
+├─ (MPL-2.0 OR Apache-2.0): 1
+├─ BSD-2-Clause: 1
 ├─ ISC: 1
 ├─ 0BSD: 1
 └─ Apache-2.0: 1

frontend/locales/cn.json

@@ -0,0 +1,42 @@
+{
+	"common": {
+		"note": "密信",
+		"file": "上传文件",
+		"advanced": "高级设置",
+		"create": "创建",
+		"loading": "加载中...",
+		"mode": "模式",
+		"views": "{n, plural, =0 {可查看次数} =1 {1 次查看} other {# 次查看}}",
+		"minutes": "{n, plural, =0 {有效期(分钟)} =1 {1 分钟} other {# 分钟}}",
+		"max": "最大值",
+		"share_link": "分享链接",
+		"copy_clipboard": "复制到剪切版"
+	},
+	"home": {
+		"intro": "一键轻松发送 <i>完全加密的</i> 密信或者文件。只需创建一个密信然后分享链接。",
+		"explanation": "该密信会在{type}后失效。",
+		"new_note": "新建密信",
+		"new_note_notice": "<b>可用性警示：</b><br />由于加密鸽的所有数据是全部保存在内存中的，所以如果加密鸽的可用内存被用光了那么它将会删除最早的密信以释放内存，因此不保证该密信的可用性。<br />(一般情况下是您应该是不会遇到这个问题，只是警示一下。)",
+		"errors": {
+			"note_to_big": "无法创建密信，这个密信太大了！",
+			"note_error": "无法创建密信，请再试一遍。",
+			"max": "最大文件大小: {n}",
+			"empty_content": "密信为空！"
+		},
+		"copied_to_clipboard": "已复制到剪切板 🔗"
+	},
+	"show": {
+		"errors": {
+			"not_found": "该密信无法被找到或者它已经被删除了！",
+			"decryption_failed": "密钥错误！您可能不小心粘贴了一个不完整的链接或者正在尝试破解该密信！但无论如何，该密信已被销毁！"
+		},
+		"explanation": "点击下方的按钮可以查看密信，如果它到达了限制将会被删除",
+		"show_note": "查看密信",
+		"warning_will_not_see_again": "您将<b>无法</b>再次查看该密信",
+		"download_all": "下载全部"
+	},
+	"file_upload": {
+		"selected_files": "已选中的文件",
+		"no_files_selected": "没有文件被选中"
+	}
+}

frontend/package.json

@@ -1,8 +1,8 @@
 {
 	"private": true,
 	"scripts": {
-		"dev": "svelte-kit dev",
+		"dev": "vite dev",
-		"build": "svelte-kit build",
+		"build": "vite build",
 		"preview": "svelte-kit preview",
 		"check": "svelte-check --tsconfig tsconfig.json",
 		"licenses": "license-checker --summary > licenses.csv",
@@ -10,26 +10,26 @@
 	},
 	"type": "module",
 	"devDependencies": {
-		"@lokalise/node-api": "^7.1.1",
+		"@lokalise/node-api": "^7.3.1",
-		"@sveltejs/adapter-static": "^1.0.0-next.28",
+		"@sveltejs/adapter-static": "^1.0.0-next.34",
-		"@sveltejs/kit": "1.0.0-next.288",
+		"@sveltejs/kit": "^1.0.0-next.361",
+		"@types/dompurify": "^2.3.3",
 		"@types/file-saver": "^2.0.5",
-		"@types/sanitize-html": "^2.6.2",
 		"adm-zip": "^0.5.9",
-		"dotenv": "^16.0.0",
+		"dotenv": "^16.0.1",
-		"svelte": "^3.46.4",
+		"svelte": "^3.49.0",
-		"svelte-check": "^2.4.5",
+		"svelte-check": "^2.8.0",
-		"svelte-intl-precompile": "^0.8.1",
+		"svelte-intl-precompile": "^0.10.1",
-		"svelte-preprocess": "^4.10.4",
+		"svelte-preprocess": "^4.10.7",
-		"tslib": "^2.3.1",
+		"tslib": "^2.4.0",
-		"typescript": "^4.6.2",
+		"typescript": "^4.7.4",
-		"vite": "^2.8.6"
+		"vite": "^3.0.0"
 	},
 	"dependencies": {
-		"@fontsource/fira-mono": "^4.5.3",
+		"@fontsource/fira-mono": "^4.5.8",
 		"copy-to-clipboard": "^3.3.1",
+		"dompurify": "^2.3.9",
 		"file-saver": "^2.0.5",
-		"pretty-bytes": "^5.6.0",
+		"pretty-bytes": "^5.6.0"
-		"sanitize-html": "^2.7.0"
 	}
 }

frontend/src/app.html

@@ -5,9 +5,9 @@
 		<link rel="icon" href="/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 
-		%svelte.head%
+		%sveltekit.head%
 	</head>
 	<body>
-		<div id="svelte">%svelte.body%</div>
+		<div id="svelte">%sveltekit.body%</div>
 	</body>
 </html>

frontend/src/lib/stores/status.ts

@@ -7,6 +7,8 @@ export type Status = {
 	max_views: number
 	max_expiration: number
 	allow_advanced: boolean
+	theme_image: string
+	theme_text: string
 }
 
 export const status = writable<null | Status>(null)

frontend/src/lib/ui/ShowNote.svelte

@@ -2,9 +2,9 @@
 	import type { FileDTO, NotePublic } from '$lib/api'
 	import { Files } from '$lib/files'
 	import copy from 'copy-to-clipboard'
+	import DOMPurify from 'dompurify'
 	import { saveAs } from 'file-saver'
 	import prettyBytes from 'pretty-bytes'
-	import sanitize from 'sanitize-html'
 	import { t } from 'svelte-intl-precompile'
 	import Button from './Button.svelte'
 
@@ -31,19 +31,16 @@
 	}
 
 	function contentWithLinks(content: string): string {
-		const replaced = note.contents.replace(
+		const replaced = content.replace(
 			RE_URL,
 			(url) => `<a href="${url}" rel="noreferrer">${url}</a>`
 		)
-		return sanitize(replaced, { allowedTags: ['a'], allowedAttributes: { a: ['href', 'rel'] } })
+		return DOMPurify.sanitize(replaced, { USE_PROFILES: { html: true } })
 	}
 </script>
 
 <p class="error-text">{@html $t('show.warning_will_not_see_again')}</p>
 {#if note.meta.type === 'text'}
-	<div class="note">
-		{note.contents}
-	</div>
 	<div class="note">
 		{@html contentWithLinks(note.contents)}
 	</div>

frontend/src/lib/views/Create.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { create, Note, PayloadToLargeError } from '$lib/api'
+	import type { Note } from '$lib/api'
+	import { create,PayloadToLargeError } from '$lib/api'
 	import { encrypt,getKeyFromString,getRandomBytes,Hex } from '$lib/crypto'
 	import { status } from '$lib/stores/status'
 	import Button from '$lib/ui/Button.svelte'
@@ -101,7 +102,7 @@
 	<Button on:click={reset}>{$t('home.new_note')}</Button>
 {:else}
 	<p>
-		{@html $t('home.intro')}
+		{@html $status?.theme_text || $t('home.intro')}
 	</p>
 	<form on:submit|preventDefault={submit}>
 		<fieldset disabled={loading}>

frontend/src/lib/views/Header.svelte

@@ -1,5 +1,12 @@
+<script lang="ts">
+	import { status } from '$lib/stores/status'
+</script>
+
 <header>
 	<a href="/">
+		{#if $status?.theme_image}
+			<img alt="logo" src={$status.theme_image} />
+		{:else}
 			<svg
 				width="100%"
 				height="100%"
@@ -10,7 +17,8 @@
 				xml:space="preserve"
 				style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"
 				><g id="Logo"
-				><clipPath id="_clip1"><rect x="6.336" y="3.225" width="193.55" height="193.55" /></clipPath
+					><clipPath id="_clip1"
+						><rect x="6.336" y="3.225" width="193.55" height="193.55" /></clipPath
 					><g clip-path="url(#_clip1)"
 						><g
 							><g
@@ -73,6 +81,7 @@
 					></g
 				></svg
 			>
+		{/if}
 	</a>
 </header>
 
@@ -87,20 +96,26 @@
 		margin-bottom: 2rem;
 	}
 
+	img {
+		object-fit: contain;
+	}
+
 	@media screen and (max-width: 30rem) {
 		header {
 			margin-top: 1rem;
 			margin-bottom: 1rem;
 		}
 
-		header svg {
+		header svg,
+		header img {
 			max-height: 4rem;
 		}
 	}
 
-	header svg {
+	header svg,
+	header img {
 		width: 100%;
-		max-width: 16rem;
+		max-height: 8rem;
 		transform: translateX(-1rem);
 		fill: currentColor;
 	}

frontend/svelte.config.js

@@ -1,6 +1,5 @@
-import preprocess from 'svelte-preprocess'
 import adapter from '@sveltejs/adapter-static'
-import precompileIntl from 'svelte-intl-precompile/sveltekit-plugin'
+import preprocess from 'svelte-preprocess'
 
 export default {
 	preprocess: preprocess(),
@@ -9,10 +8,5 @@ export default {
 		adapter: adapter({
 			fallback: 'index.html',
 		}),
-		vite: {
-			plugins: [
-				precompileIntl('locales'), // if your translations are defined in /locales/[lang].json
-			],
-		},
 	},
 }

frontend/tsconfig.json

@@ -1,31 +1,7 @@
 {
+	"extends": "./.svelte-kit/tsconfig.json",
 	"compilerOptions": {
-		"moduleResolution": "node",
+		"strict": true,
-		"module": "es2020",
+		"allowSyntheticDefaultImports": true
-		"lib": ["es2020"],
+	}
-		"target": "es2019",
-		/**
-			svelte-preprocess cannot figure out whether you have a value or a type, so tell TypeScript
-			to enforce using \`import type\` instead of \`import\` for Types.
-			*/
-		"importsNotUsedAsValues": "error",
-		"isolatedModules": true,
-		"resolveJsonModule": true,
-		/**
-			To have warnings/errors of the Svelte compiler at the correct position,
-			enable source maps by default.
-			*/
-		"sourceMap": true,
-		"esModuleInterop": true,
-		"skipLibCheck": true,
-		"forceConsistentCasingInFileNames": true,
-		"baseUrl": ".",
-		"allowJs": true,
-		"checkJs": true,
-		"paths": {
-			"$lib/*": ["src/lib/*"]
-		},
-		"strict": true
-	},
-	"include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.ts", "src/**/*.svelte"]
 }

frontend/vite.config.js

@@ -0,0 +1,12 @@
+import { sveltekit } from '@sveltejs/kit/vite'
+import precompileIntl from 'svelte-intl-precompile/sveltekit-plugin'
+
+/** @type {import('vite').UserConfig} */
+const config = {
+	server: {
+		port: 3000,
+	},
+	plugins: [sveltekit(), precompileIntl('locales')],
+}
+
+export default config

package.json

@@ -1,6 +1,6 @@
 {
   "scripts": {
-    "dev:docker": "docker-compose up memcached",
+    "dev:docker": "docker-compose up redis",
     "dev:backend": "cd backend && cargo watch -x 'run --bin cryptgeon'",
     "dev:front": "pnpm --prefix frontend run dev",
     "dev:proxy": "node proxy.mjs",

pnpm-lock.yaml

@@ -1,4 +1,4 @@
-lockfileVersion: 5.3
+lockfileVersion: 5.4
 
 specifiers:
   http-proxy: ^1.18.1
@@ -32,7 +32,7 @@ packages:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
       function-bind: 1.1.1
-      get-intrinsic: 1.1.1
+      get-intrinsic: 1.1.2
     dev: true
 
   /chalk/2.4.2:
@@ -51,7 +51,7 @@ packages:
     dev: true
 
   /color-name/1.1.3:
-    resolution: {integrity: sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=}
+    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
     dev: true
 
   /concat-map/0.0.1:
@@ -69,10 +69,11 @@ packages:
       which: 1.3.1
     dev: true
 
-  /define-properties/1.1.3:
+  /define-properties/1.1.4:
-    resolution: {integrity: sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==}
+    resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
     engines: {node: '>= 0.4'}
     dependencies:
+      has-property-descriptors: 1.0.0
       object-keys: 1.1.1
     dev: true
 
@@ -82,30 +83,33 @@ packages:
       is-arrayish: 0.2.1
     dev: true
 
-  /es-abstract/1.19.1:
+  /es-abstract/1.20.1:
-    resolution: {integrity: sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==}
+    resolution: {integrity: sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
       es-to-primitive: 1.2.1
       function-bind: 1.1.1
-      get-intrinsic: 1.1.1
+      function.prototype.name: 1.1.5
+      get-intrinsic: 1.1.2
       get-symbol-description: 1.0.0
       has: 1.0.3
-      has-symbols: 1.0.2
+      has-property-descriptors: 1.0.0
+      has-symbols: 1.0.3
       internal-slot: 1.0.3
       is-callable: 1.2.4
       is-negative-zero: 2.0.2
       is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.1
+      is-shared-array-buffer: 1.0.2
       is-string: 1.0.7
       is-weakref: 1.0.2
-      object-inspect: 1.12.0
+      object-inspect: 1.12.2
       object-keys: 1.1.1
       object.assign: 4.1.2
-      string.prototype.trimend: 1.0.4
+      regexp.prototype.flags: 1.4.3
-      string.prototype.trimstart: 1.0.4
+      string.prototype.trimend: 1.0.5
-      unbox-primitive: 1.0.1
+      string.prototype.trimstart: 1.0.5
+      unbox-primitive: 1.0.2
     dev: true
 
   /es-to-primitive/1.2.1:
@@ -118,7 +122,7 @@ packages:
     dev: true
 
   /escape-string-regexp/1.0.5:
-    resolution: {integrity: sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=}
+    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
     engines: {node: '>=0.8.0'}
     dev: true
 
@@ -126,8 +130,8 @@ packages:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
 
-  /follow-redirects/1.14.7:
+  /follow-redirects/1.15.1:
-    resolution: {integrity: sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==}
+    resolution: {integrity: sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==}
     engines: {node: '>=4.0'}
     peerDependencies:
       debug: '*'
@@ -140,12 +144,26 @@ packages:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
     dev: true
 
-  /get-intrinsic/1.1.1:
+  /function.prototype.name/1.1.5:
-    resolution: {integrity: sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==}
+    resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.1
+      functions-have-names: 1.2.3
+    dev: true
+
+  /functions-have-names/1.2.3:
+    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
+    dev: true
+
+  /get-intrinsic/1.1.2:
+    resolution: {integrity: sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==}
     dependencies:
       function-bind: 1.1.1
       has: 1.0.3
-      has-symbols: 1.0.2
+      has-symbols: 1.0.3
     dev: true
 
   /get-symbol-description/1.0.0:
@@ -153,24 +171,30 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.1.1
+      get-intrinsic: 1.1.2
     dev: true
 
-  /graceful-fs/4.2.9:
+  /graceful-fs/4.2.10:
-    resolution: {integrity: sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==}
+    resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
     dev: true
 
-  /has-bigints/1.0.1:
+  /has-bigints/1.0.2:
-    resolution: {integrity: sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==}
+    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
     dev: true
 
   /has-flag/3.0.0:
-    resolution: {integrity: sha1-tdRU3CGZriJWmfNGfloH87lVuv0=}
+    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
     dev: true
 
-  /has-symbols/1.0.2:
+  /has-property-descriptors/1.0.0:
-    resolution: {integrity: sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==}
+    resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
+    dependencies:
+      get-intrinsic: 1.1.2
+    dev: true
+
+  /has-symbols/1.0.3:
+    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
     dev: true
 
@@ -178,7 +202,7 @@ packages:
     resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      has-symbols: 1.0.2
+      has-symbols: 1.0.3
     dev: true
 
   /has/1.0.3:
@@ -197,7 +221,7 @@ packages:
     engines: {node: '>=8.0.0'}
     dependencies:
       eventemitter3: 4.0.7
-      follow-redirects: 1.14.7
+      follow-redirects: 1.15.1
       requires-port: 1.0.0
     transitivePeerDependencies:
       - debug
@@ -207,19 +231,19 @@ packages:
     resolution: {integrity: sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      get-intrinsic: 1.1.1
+      get-intrinsic: 1.1.2
       has: 1.0.3
       side-channel: 1.0.4
     dev: true
 
   /is-arrayish/0.2.1:
-    resolution: {integrity: sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=}
+    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
     dev: true
 
   /is-bigint/1.0.4:
     resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
     dependencies:
-      has-bigints: 1.0.1
+      has-bigints: 1.0.2
     dev: true
 
   /is-boolean-object/1.1.2:
@@ -235,8 +259,8 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
-  /is-core-module/2.8.1:
+  /is-core-module/2.9.0:
-    resolution: {integrity: sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==}
+    resolution: {integrity: sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==}
     dependencies:
       has: 1.0.3
     dev: true
@@ -253,8 +277,8 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
-  /is-number-object/1.0.6:
+  /is-number-object/1.0.7:
-    resolution: {integrity: sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==}
+    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-tostringtag: 1.0.0
@@ -268,8 +292,10 @@ packages:
       has-tostringtag: 1.0.0
     dev: true
 
-  /is-shared-array-buffer/1.0.1:
+  /is-shared-array-buffer/1.0.2:
-    resolution: {integrity: sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==}
+    resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
+    dependencies:
+      call-bind: 1.0.2
     dev: true
 
   /is-string/1.0.7:
@@ -283,7 +309,7 @@ packages:
     resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      has-symbols: 1.0.2
+      has-symbols: 1.0.3
     dev: true
 
   /is-weakref/1.0.2:
@@ -293,7 +319,7 @@ packages:
     dev: true
 
   /isexe/2.0.0:
-    resolution: {integrity: sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=}
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
     dev: true
 
   /json-parse-better-errors/1.0.2:
@@ -301,22 +327,22 @@ packages:
     dev: true
 
   /load-json-file/4.0.0:
-    resolution: {integrity: sha1-L19Fq5HjMhYjT9U62rZo607AmTs=}
+    resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: 4.2.9
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
     dev: true
 
   /memorystream/0.3.1:
-    resolution: {integrity: sha1-htcJCzDORV1j+64S3aUaR93K+bI=}
+    resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==}
     engines: {node: '>= 0.10.0'}
     dev: true
 
-  /minimatch/3.0.4:
+  /minimatch/3.1.2:
-    resolution: {integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==}
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
     dependencies:
       brace-expansion: 1.1.11
     dev: true
@@ -329,7 +355,7 @@ packages:
     resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
     dependencies:
       hosted-git-info: 2.8.9
-      resolve: 1.21.0
+      resolve: 1.22.1
       semver: 5.7.1
       validate-npm-package-license: 3.0.4
     dev: true
@@ -343,15 +369,15 @@ packages:
       chalk: 2.4.2
       cross-spawn: 6.0.5
       memorystream: 0.3.1
-      minimatch: 3.0.4
+      minimatch: 3.1.2
       pidtree: 0.3.1
       read-pkg: 3.0.0
       shell-quote: 1.7.3
       string.prototype.padend: 3.1.3
     dev: true
 
-  /object-inspect/1.12.0:
+  /object-inspect/1.12.2:
-    resolution: {integrity: sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==}
+    resolution: {integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==}
     dev: true
 
   /object-keys/1.1.1:
@@ -364,13 +390,13 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.3
+      define-properties: 1.1.4
-      has-symbols: 1.0.2
+      has-symbols: 1.0.3
       object-keys: 1.1.1
     dev: true
 
   /parse-json/4.0.0:
-    resolution: {integrity: sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=}
+    resolution: {integrity: sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==}
     engines: {node: '>=4'}
     dependencies:
       error-ex: 1.3.2
@@ -378,7 +404,7 @@ packages:
     dev: true
 
   /path-key/2.0.1:
-    resolution: {integrity: sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=}
+    resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
     engines: {node: '>=4'}
     dev: true
 
@@ -400,12 +426,12 @@ packages:
     dev: true
 
   /pify/3.0.0:
-    resolution: {integrity: sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=}
+    resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
     engines: {node: '>=4'}
     dev: true
 
   /read-pkg/3.0.0:
-    resolution: {integrity: sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=}
+    resolution: {integrity: sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==}
     engines: {node: '>=4'}
     dependencies:
       load-json-file: 4.0.0
@@ -413,15 +439,24 @@ packages:
       path-type: 3.0.0
     dev: true
 
-  /requires-port/1.0.0:
+  /regexp.prototype.flags/1.4.3:
-    resolution: {integrity: sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=}
+    resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      functions-have-names: 1.2.3
     dev: true
 
-  /resolve/1.21.0:
+  /requires-port/1.0.0:
-    resolution: {integrity: sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==}
+    resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
+    dev: true
+
+  /resolve/1.22.1:
+    resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
     hasBin: true
     dependencies:
-      is-core-module: 2.8.1
+      is-core-module: 2.9.0
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
     dev: true
@@ -432,14 +467,14 @@ packages:
     dev: true
 
   /shebang-command/1.2.0:
-    resolution: {integrity: sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=}
+    resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       shebang-regex: 1.0.0
     dev: true
 
   /shebang-regex/1.0.0:
-    resolution: {integrity: sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=}
+    resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
@@ -451,8 +486,8 @@ packages:
     resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.1.1
+      get-intrinsic: 1.1.2
-      object-inspect: 1.12.0
+      object-inspect: 1.12.2
     dev: true
 
   /spdx-correct/3.1.1:
@@ -482,26 +517,28 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.3
+      define-properties: 1.1.4
-      es-abstract: 1.19.1
+      es-abstract: 1.20.1
     dev: true
 
-  /string.prototype.trimend/1.0.4:
+  /string.prototype.trimend/1.0.5:
-    resolution: {integrity: sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==}
+    resolution: {integrity: sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.3
+      define-properties: 1.1.4
+      es-abstract: 1.20.1
     dev: true
 
-  /string.prototype.trimstart/1.0.4:
+  /string.prototype.trimstart/1.0.5:
-    resolution: {integrity: sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==}
+    resolution: {integrity: sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.3
+      define-properties: 1.1.4
+      es-abstract: 1.20.1
     dev: true
 
   /strip-bom/3.0.0:
-    resolution: {integrity: sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=}
+    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
     engines: {node: '>=4'}
     dev: true
 
@@ -517,12 +554,12 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
-  /unbox-primitive/1.0.1:
+  /unbox-primitive/1.0.2:
-    resolution: {integrity: sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==}
+    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
     dependencies:
-      function-bind: 1.1.1
+      call-bind: 1.0.2
-      has-bigints: 1.0.1
+      has-bigints: 1.0.2
-      has-symbols: 1.0.2
+      has-symbols: 1.0.3
       which-boxed-primitive: 1.0.2
     dev: true
 
@@ -538,7 +575,7 @@ packages:
     dependencies:
       is-bigint: 1.0.4
       is-boolean-object: 1.1.2
-      is-number-object: 1.0.6
+      is-number-object: 1.0.7
       is-string: 1.0.7
       is-symbol: 1.0.4
     dev: true