Compare commits

..

36 Commits

Author SHA1 Message Date
fc3938701e add reset translation 2024-03-04 18:46:00 +01:00
23b4f81dac Merge pull request #118 from codiflow/codiflow-patch-1
Update de.json
2024-03-04 18:42:39 +01:00
7c68620d8b Merge branch 'main' into codiflow-patch-1 2024-03-04 18:32:46 +01:00
eb76fe085a rm pkg and update node version 2024-03-04 18:32:03 +01:00
Christian
38540b33f2 Update de.json
Fixed some translations in the German language strings
2024-03-04 17:39:35 +01:00
39a9ac0dad version bump 2024-03-04 15:25:02 +01:00
ff1b5d500b Merge pull request #117 from cupcakearmy/also-expose-api-methods-for-programmatic-usage
Also expose api methods for programmatic usage
2024-03-04 15:24:02 +01:00
1698abe2eb pipeline 2024-03-04 15:15:47 +01:00
3036927a45 update dependencies 2024-03-03 01:50:52 +01:00
f9c26ba81c change entry point for cli test 2024-03-03 01:35:17 +01:00
752e68e213 revert to node 18 2024-03-03 01:34:08 +01:00
6eb3a59e33 use package.json pnpm version 2024-03-03 01:34:03 +01:00
1a2728d21f also expose internal shared functionality for external usage 2024-03-03 01:22:39 +01:00
a37a0932e0 translations 2024-02-26 17:19:29 +01:00
71a33a7939 Merge pull request #111 from cupcakearmy/dependabot/cargo/packages/backend/zerocopy-0.7.31
Bump zerocopy from 0.7.21 to 0.7.31 in /packages/backend
2024-02-09 14:47:47 +01:00
dependabot[bot]
83033a4b85 Bump zerocopy from 0.7.21 to 0.7.31 in /packages/backend
Bumps [zerocopy](https://github.com/google/zerocopy) from 0.7.21 to 0.7.31.
- [Release notes](https://github.com/google/zerocopy/releases)
- [Changelog](https://github.com/google/zerocopy/blob/main/CHANGELOG.md)
- [Commits](https://github.com/google/zerocopy/compare/v0.7.21...v0.7.31)

---
updated-dependencies:
- dependency-name: zerocopy
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-15 03:50:33 +00:00
40570bbbaf Merge pull request #108 from codiflow/patch-1
Updated German language strings
2023-12-13 21:22:44 +01:00
Christian
f591e589d0 Updated German language strings 2023-12-04 16:01:09 +01:00
d1eebb04f3 Merge pull request #107 from pgschk/locale-fixes
Fixes to locales en and de
2023-11-08 13:49:13 +01:00
pgschk
5a76ea7778 Update locale de
Fix some translation errors
2023-11-01 23:29:02 +01:00
pgschk
45a1af7569 Fix locale en
Fix spelling: to -> too, it's -> its
2023-11-01 23:18:58 +01:00
9578b2bed2 Merge pull request #106 from cupcakearmy/2.4.0
2.4.0
2023-11-01 15:57:12 +01:00
f94e4e3858 sparse bundler is enabled by default now 2023-11-01 15:26:55 +01:00
ffa2c49ea3 don't insert html anymore, use separate link section 2023-11-01 15:26:45 +01:00
0d850aadfc update deps 2023-11-01 15:26:33 +01:00
a9c646c981 update packages 2023-11-01 15:26:20 +01:00
a2803a13da update deps 2023-08-14 10:22:09 +02:00
deef56776d maintenance 2023-08-14 10:12:26 +02:00
b089323990 Merge pull request #97 from MVS/grammar-patch
Update en.json
2023-08-04 09:51:17 +02:00
MVS
6002ede685 Update en.json
Small tweaks to grammar
2023-08-03 12:07:50 -05:00
8a444ceb88 Merge pull request #95 from cbin/patch-1
Update ru.json
2023-07-19 16:59:50 +02:00
Oleg Salnikov
1e01ccb65a Update ru.json
minor changes
2023-07-18 20:59:24 +03:00
2dfa9dd248 Merge pull request #94 from Rooyca/main
Spanish translation of about page
2023-07-13 14:37:59 +02:00
Ronald
618e914b55 Add README_ES.md 2023-07-09 14:09:10 -05:00
Ronald
86f596fa4b Add README_ES.md 2023-07-09 14:07:40 -05:00
Ronald
dcb4613f66 Create README_ES.md 2023-07-09 14:05:59 -05:00
36 changed files with 2310 additions and 1912 deletions

View File

@@ -10,18 +10,18 @@ jobs:
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
# Node # Node
- uses: pnpm/action-setup@v2 - uses: pnpm/action-setup@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v4
with: with:
cache: 'pnpm' cache: 'pnpm'
node-version-file: '.nvmrc' node-version-file: '.nvmrc'
# Docker # Docker
- uses: docker/setup-qemu-action@v2 - uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v2 - uses: docker/setup-buildx-action@v3
with: with:
install: true install: true

2
.nvmrc
View File

@@ -1 +1 @@
v18.16 v20.11.1

View File

@@ -5,6 +5,13 @@ 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/), 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). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [2.4.0] - 2023-11-01
### Changed
- Removed HTML sanitation, display the original message as string
- Links are now displayed under the note in a separate section
## [2.3.1] - 2023-06-23 ## [2.3.1] - 2023-06-23
### Added ### Added

View File

@@ -1,19 +1,19 @@
# FRONTEND # FRONTEND
FROM node:18-alpine as client FROM node:20-alpine as client
ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
RUN corepack enable
WORKDIR /tmp WORKDIR /tmp
RUN npm install -g pnpm@8
COPY . . COPY . .
RUN pnpm install --frozen-lockfile RUN pnpm install --frozen-lockfile
RUN pnpm run build RUN pnpm run build
# BACKEND # BACKEND
FROM rust:1.69-alpine as backend FROM rust:1.76-alpine as backend
WORKDIR /tmp WORKDIR /tmp
RUN apk add libc-dev openssl-dev alpine-sdk RUN apk add libc-dev openssl-dev alpine-sdk
COPY ./packages/backend/Cargo.* ./
ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
RUN cargo fetch
COPY ./packages/backend ./ COPY ./packages/backend ./
RUN cargo build --release RUN cargo build --release

View File

@@ -14,7 +14,7 @@
<a href=""><img src="./.github/lokalise.png" height="50"> <a href=""><img src="./.github/lokalise.png" height="50">
<br/><br/> <br/><br/>
EN | [简体中文](README_zh-CN.md) EN | [简体中文](README_zh-CN.md) | [ES](README_ES.md)
## About? ## About?

200
README_ES.md Normal file
View File

@@ -0,0 +1,200 @@
<p align="center">
<img src="./design/Github.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/><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/>
[EN](README.md) | [简体中文](README_zh-CN.md) | ES
## Acerca de
_cryptgeon_ es un servicio seguro y de código abierto para compartir notas o archivos inspirado en [_PrivNote_](https://privnote.com).
Incluye un servidor, una página web y una interfaz de línea de comandos (CLI, por sus siglas en inglés).
> 🌍 Si quieres traducir este proyecto no dudes en ponerte en contacto conmigo.
>
> Gracias a [Lokalise](https://lokalise.com/) por darnos acceso gratis a su plataforma.
## Demo
### Web
Prueba la demo y experimenta por ti mismo [cryptgeon.org](https://cryptgeon.org)
### CLI
```
npx cryptgeon send text "Esto es una nota secreta"
```
Puedes revisar la documentación sobre el CLI en este [readme](./packages/cli/README.md).
## Características
- enviar texto o archivos
- el servidor no puede desencriptar el contenido debido a que la encriptación se hace del lado del cliente
- restriccion de vistas o de tiempo
- en memoria, sin persistencia
- compatibilidad obligatoria con el modo oscuro
## ¿Cómo funciona?
Se genera una <code>id (256bit)</code> y una <code>llave 256(bit)</code> para cada nota. La
<code>id</code>
se usa para guardar y recuperar la nota. Después la nota es encriptada con la <code>llave</code> y con aes en modo gcm del lado del cliente y por último se envía al servidor. La información es almacenada en memoria y nunca persiste en el disco. El servidor nunca ve la llave de encriptación por lo que no puede desencriptar el contenido de las notas aunque lo intentara.
## Capturas de pantalla
![screenshot](./design/Screens.png)
## Variables de entorno
| Variable | Default | Descripción |
| ------------------ | ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `REDIS` | `redis://redis/` | Redis URL a la que conectarse. [Según el formato](https://docs.rs/redis/latest/redis/#connection-parameters) |
| `SIZE_LIMIT` | `1 KiB` | Tamaño máximo. Valores aceptados según la [unidad byte](https://docs.rs/byte-unit/). <br> `512 MiB` es el máximo permitido. <br> El frontend mostrará ese número, incluyendo el ~35% de sobrecarga de codificación. |
| `MAX_VIEWS` | `100` | Número máximo de vistas. |
| `MAX_EXPIRATION` | `360` | Tiempo máximo de expiración en minutos. |
| `ALLOW_ADVANCED` | `true` | Permitir configuración personalizada. Si se establece en `false` todas las notas serán de una sola vista. |
| `ID_LENGTH` | `32` | Establece el tamaño en bytes de la `id` de la nota. Por defecto es de `32` bytes. Esto es util para reducir el tamaño del link. _Esta configuración no afecta el nivel de encriptación_. |
| `VERBOSITY` | `warn` | Nivel de verbosidad del backend. [Posibles valores](https://docs.rs/env_logger/latest/env_logger/#enabling-logging): `error`, `warn`, `info`, `debug`, `trace` |
| `THEME_IMAGE` | `""` | Imagen personalizada para reemplazar el logo. Debe ser accesible públicamente. |
| `THEME_TEXT` | `""` | Texto personalizado para reemplazar la descripción bajo el logo. |
| `THEME_PAGE_TITLE` | `""` | Texto personalizado para el título |
| `THEME_FAVICON` | `""` | Url personalizada para el favicon. Debe ser accesible públicamente. |
## Despliegue
> Se requiere `https` de lo contrario el navegador no soportará las funciones de encriptacón.
> Hay un endpoint para verificar el estado, lo encontramos en `/api/health/`. Regresa un código 200 o 503.
### Docker
Docker es la manera más fácil. Aquí encontramos [la imágen oficial](https://hub.docker.com/r/cupcakearmy/cryptgeon).
```yaml
# docker-compose.yml
version: '3.8'
services:
redis:
image: redis:7-alpine
# Set a size limit. See link below on how to customise.
# https://redis.io/docs/manual/eviction/
# command: redis-server --maxmemory 1gb --maxmemory-policy allkeys-lru
app:
image: cupcakearmy/cryptgeon:latest
depends_on:
- redis
environment:
# Size limit for a single note.
SIZE_LIMIT: 4 MiB
ports:
- 80:8000
# Optional health checks
# healthcheck:
# test: ["CMD", "curl", "--fail", "http://127.0.0.1:8000/api/live/"]
# interval: 1m
# timeout: 3s
# retries: 2
# start_period: 5s
```
### NGINX Proxy
Ver la carpeta de [ejemplo/nginx](https://github.com/cupcakearmy/cryptgeon/tree/main/examples/nginx). Hay un ejemplo con un proxy simple y otro con https. Es necesario que especifiques el nombre del servidor y los certificados.
### Traefik 2
Ver la carpeta de [ejemplo/traefik](https://github.com/cupcakearmy/cryptgeon/tree/main/examples/traefik).
### Scratch
Ver la carpeta de [ejemplo/scratch](https://github.com/cupcakearmy/cryptgeon/tree/main/examples/scratch). Ahí encontrarás una guía de cómo configurar el servidor e instalar cryptgeon desde cero.
### Synology
Hay una [guía](https://mariushosting.com/how-to-install-cryptgeon-on-your-synology-nas/) (en inglés) que puedes seguir.
### Guías en Youtube
- En inglés, por [Webnestify](https://www.youtube.com/watch?v=XAyD42I7wyI)
- En inglés, por [DB Tech](https://www.youtube.com/watch?v=S0jx7wpOfNM) [Previous Video](https://www.youtube.com/watch?v=JhpIatD06vE)
- En alemán, por [ApfelCast](https://www.youtube.com/watch?v=84ZMbE9AkHg)
## Desarrollo
**Requisitos**
- `pnpm`: `>=6`
- `node`: `>=18`
- `rust`: edition `2021`
**Instalación**
```bash
pnpm install
# También necesitas cargo-watch, si no lo tienes instalado.
# https://lib.rs/crates/cargo-watch
cargo install cargo-watch
```
**Ejecutar**
Asegurate de que docker se esté ejecutando.
```bash
pnpm run dev
```
Ejecutando `pnpm run dev` en la carpeta raíz iniciará lo siguiente:
- redis docker container
- rust backend
- client
- cli
Puedes ver la app en [localhost:1234](http://localhost:1234).
> Existe una colección de Postman con algunas peticiones de ejemplo [disponible en el repo](./Cryptgeon.postman_collection.json)
### Tests
Los tests son end-to-end tests escritos con Playwright.
```sh
pnpm run test:prepare
# Usa el script test o test:local. La versión local solo corre en el navegador para acelerar el desarrollo.
pnpm run test:local
```
## Seguridad
Por favor dirigite a la sección de seguridad [aquí](./SECURITY.md).
---
_Atribuciones_
- Datos del Test:
- Texto para los tests [Nietzsche Ipsum](https://nietzsche-ipsum.com/)
- [AES Paper](https://www.cs.miami.edu/home/burt/learning/Csc688.012/rijndael/rijndael_doc_V2.pdf)
- [Unsplash Imágenes](https://unsplash.com/)
- Animación de carga por [Nikhil Krishnan](https://codepen.io/nikhil8krishnan/pen/rVoXJa)
- Iconos hechos por <a href="https://www.freepik.com" title="Freepik">freepik</a> de <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a>

View File

@@ -14,7 +14,7 @@
<a href=""><img src="./.github/lokalise.png" height="50"> <a href=""><img src="./.github/lokalise.png" height="50">
<br/> <br/>
[EN](README.md) | 简体中文 [EN](README.md) | 简体中文 | [ES](README_ES.md)
## 关于本项目 ## 关于本项目

View File

@@ -14,11 +14,12 @@ services:
env_file: .dev.env env_file: .dev.env
depends_on: depends_on:
- redis - redis
restart: unless-stopped
ports: ports:
- 1234:8000 - 1234:8000
healthcheck: healthcheck:
test: ["CMD", "curl", "--fail", "http://127.0.0.1:8000/api/live/"] test: ['CMD', 'curl', '--fail', 'http://127.0.0.1:8000/api/live/']
interval: 1m interval: 1m
timeout: 3s timeout: 3s
retries: 2 retries: 2

View File

@@ -1,5 +1,4 @@
{ {
"packageManager": "pnpm@8.6.3",
"scripts": { "scripts": {
"dev:docker": "docker-compose -f docker-compose.dev.yaml up redis", "dev:docker": "docker-compose -f docker-compose.dev.yaml up redis",
"dev:packages": "pnpm --parallel run dev", "dev:packages": "pnpm --parallel run dev",
@@ -13,9 +12,10 @@
"build": "pnpm run --recursive --filter=!@cryptgeon/backend build" "build": "pnpm run --recursive --filter=!@cryptgeon/backend build"
}, },
"devDependencies": { "devDependencies": {
"@playwright/test": "^1.33.0", "@playwright/test": "^1.42.1",
"@types/node": "^20.1.3", "@types/node": "^20.11.24",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"shelljs": "^0.8.5" "shelljs": "^0.8.5"
} },
"packageManager": "pnpm@8.15.4"
} }

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +1,9 @@
[package] [package]
name = "cryptgeon" name = "cryptgeon"
version = "2.3.1" version = "2.5.1"
authors = ["cupcakearmy <hi@nicco.io>"] authors = ["cupcakearmy <hi@nicco.io>"]
edition = "2021" edition = "2021"
rust-version = "1.76"
[[bin]] [[bin]]
name = "cryptgeon" name = "cryptgeon"

View File

@@ -1,43 +1,44 @@
{ {
"version": "2.3.1",
"name": "cryptgeon", "name": "cryptgeon",
"version": "2.5.1",
"homepage": "https://github.com/cupcakearmy/cryptgeon",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/cupcakearmy/cryptgeon.git", "url": "https://github.com/cupcakearmy/cryptgeon.git",
"directory": "packages/cli" "directory": "packages/cli"
}, },
"homepage": "https://github.com/cupcakearmy/cryptgeon",
"type": "module", "type": "module",
"engines": { "exports": {
"node": ">=18" ".": "./dist/index.mjs"
}, },
"scripts": { "types": "./dist/index.d.ts",
"dev": "./scripts/build.js --watch",
"build": "./scripts/build.js",
"package": "./scripts/package.js",
"bin": "run-s build package",
"prepublishOnly": "run-s build"
},
"main": "./dist/index.cjs",
"bin": { "bin": {
"cryptgeon": "./dist/index.cjs" "cryptgeon": "./dist/cli.cjs"
}, },
"files": [ "files": [
"dist" "dist"
], ],
"scripts": {
"bin": "run-s build package",
"build": "rm -rf dist && tsc && ./scripts/build.js",
"dev": "./scripts/build.js --watch",
"prepublishOnly": "run-s build"
},
"devDependencies": { "devDependencies": {
"@commander-js/extra-typings": "^10.0.3", "@commander-js/extra-typings": "^12.0.1",
"@cryptgeon/shared": "workspace:*", "@cryptgeon/shared": "workspace:*",
"@types/inquirer": "^9.0.3", "@types/inquirer": "^9.0.7",
"@types/mime": "^3.0.1", "@types/mime": "^3.0.4",
"@types/node": "^20.1.3", "@types/node": "^20.11.24",
"commander": "^10.0.1", "commander": "^12.0.0",
"esbuild": "^0.17.19", "esbuild": "^0.20.1",
"inquirer": "^9.2.2", "inquirer": "^9.2.15",
"mime": "^3.0.0", "mime": "^4.0.1",
"occulto": "^2.0.1", "occulto": "^2.0.3",
"pkg": "^5.8.1", "pretty-bytes": "^6.1.1",
"pretty-bytes": "^6.1.0", "typescript": "^5.3.3"
"typescript": "^5.0.4" },
"engines": {
"node": ">=18"
} }
} }

View File

@@ -3,15 +3,32 @@
import { build, context } from 'esbuild' import { build, context } from 'esbuild'
import pkg from '../package.json' assert { type: 'json' } import pkg from '../package.json' assert { type: 'json' }
const options = { const common = {
entryPoints: ['./src/index.ts'],
bundle: true, bundle: true,
minify: true, minify: true,
platform: 'node', platform: 'node',
outfile: './dist/index.cjs',
define: { VERSION: `"${pkg.version}"` }, define: { VERSION: `"${pkg.version}"` },
} }
const cliOptions = {
...common,
entryPoints: ['./src/cli.ts'],
format: 'cjs',
outfile: './dist/cli.cjs',
}
const indexOptions = {
...common,
entryPoints: ['./src/index.ts'],
outfile: './dist/index.mjs',
format: 'esm',
}
const watch = process.argv.slice(2)[0] === '--watch' const watch = process.argv.slice(2)[0] === '--watch'
if (watch) (await context(options)).watch() if (watch) {
else await build(options) const ctx = await context(cliOptions)
ctx.watch()
} else {
await build(cliOptions)
await build(indexOptions)
}

View File

@@ -1,17 +0,0 @@
#!/usr/bin/env node
import { exec } from 'pkg'
const targets = [
'node18-macos-arm64',
'node18-macos-x64',
'node18-linux-arm64',
'node18-linux-x64',
'node18-win-arm64',
'node18-win-x64',
]
for (const target of targets) {
console.log(`🚀 Building ${target}`)
await exec(['./dist/index.cjs', '--target', target, '--output', `./bin/${target.replace('node18', 'cryptgeon')}`])
}

106
packages/cli/src/cli.ts Normal file
View File

@@ -0,0 +1,106 @@
#!/usr/bin/env node
import { Argument, Option, program } from '@commander-js/extra-typings'
import { setBase, status } from '@cryptgeon/shared'
import prettyBytes from 'pretty-bytes'
import { download } from './download.js'
import { parseFile, parseNumber } from './parsers.js'
import { getStdin } from './stdin.js'
import { upload } from './upload.js'
import { checkConstrains, exit } from './utils.js'
const defaultServer = process.env['CRYPTGEON_SERVER'] || 'https://cryptgeon.org'
const server = new Option('-s --server <url>', 'the cryptgeon server to use').default(defaultServer)
const files = new Argument('<file...>', 'Files to be sent').argParser(parseFile)
const text = new Argument('<text>', 'Text content of the note')
const password = new Option('-p --password <string>', 'manually set a password')
const all = new Option('-a --all', 'Save all files without prompt').default(false)
const url = new Argument('<url>', 'The url to open')
const views = new Option('-v --views <number>', 'Amount of views before getting destroyed').argParser(parseNumber)
const minutes = new Option('-m --minutes <number>', 'Minutes before the note expires').argParser(parseNumber)
// Node 18 guard
parseInt(process.version.slice(1).split(',')[0]) < 18 && exit('Node 18 or higher is required')
// @ts-ignore
const version: string = VERSION
program.name('cryptgeon').version(version).configureHelp({ showGlobalOptions: true })
program
.command('info')
.description('show information about the server')
.addOption(server)
.action(async (options) => {
setBase(options.server)
const response = await status()
const formatted = {
...response,
max_size: prettyBytes(response.max_size),
}
for (const key of Object.keys(formatted)) {
if (key.startsWith('theme_')) delete formatted[key as keyof typeof formatted]
}
console.table(formatted)
})
const send = program.command('send').description('send a note')
send
.command('file')
.addArgument(files)
.addOption(server)
.addOption(views)
.addOption(minutes)
.addOption(password)
.action(async (files, options) => {
setBase(options.server!)
await checkConstrains(options)
options.password ||= await getStdin()
try {
const url = await upload(files, { views: options.views, expiration: options.minutes, password: options.password })
console.log(`Note created:\n\n${url}`)
} catch {
exit('Could not create note')
}
})
send
.command('text')
.addArgument(text)
.addOption(server)
.addOption(views)
.addOption(minutes)
.addOption(password)
.action(async (text, options) => {
setBase(options.server!)
await checkConstrains(options)
options.password ||= await getStdin()
try {
const url = await upload(text, { views: options.views, expiration: options.minutes, password: options.password })
console.log(`Note created:\n\n${url}`)
} catch {
exit('Could not create note')
}
})
program
.command('open')
.description('open a link with text or files inside')
.addArgument(url)
.addOption(password)
.addOption(all)
.action(async (note, options) => {
try {
const url = new URL(note)
options.password ||= await getStdin()
try {
await download(url, options.all, options.password)
} catch (e) {
exit(e instanceof Error ? e.message : 'Unknown error occurred')
}
} catch {
exit('Invalid URL')
}
})
program.parse()

View File

@@ -5,12 +5,12 @@ import { basename, resolve } from 'node:path'
import { AES, Hex } from 'occulto' import { AES, Hex } from 'occulto'
import pretty from 'pretty-bytes' import pretty from 'pretty-bytes'
import { exit } from './utils'
export async function download(url: URL, all: boolean, suggestedPassword?: string) { export async function download(url: URL, all: boolean, suggestedPassword?: string) {
setBase(url.origin) setBase(url.origin)
const id = url.pathname.split('/')[2] const id = url.pathname.split('/')[2]
const preview = await info(id).catch(() => exit('Note does not exist or is expired')) const preview = await info(id).catch(() => {
throw new Error('Note does not exist or is expired')
})
// Password // Password
let password: string let password: string
@@ -35,13 +35,14 @@ export async function download(url: URL, all: boolean, suggestedPassword?: strin
const key = derivation ? (await AES.derive(password, derivation))[0] : Hex.decode(password) const key = derivation ? (await AES.derive(password, derivation))[0] : Hex.decode(password)
const note = await get(id) const note = await get(id)
const couldNotDecrypt = () => exit('Could not decrypt note. Probably an invalid password') const couldNotDecrypt = new Error('Could not decrypt note. Probably an invalid password')
switch (note.meta.type) { switch (note.meta.type) {
case 'file': case 'file':
const files = await Adapters.Files.decrypt(note.contents, key).catch(couldNotDecrypt) const files = await Adapters.Files.decrypt(note.contents, key).catch(() => {
throw couldNotDecrypt
})
if (!files) { if (!files) {
exit('No files found in note') throw new Error('No files found in note')
return
} }
let selected: typeof files let selected: typeof files
@@ -63,7 +64,7 @@ export async function download(url: URL, all: boolean, suggestedPassword?: strin
selected = files.filter((file) => names.includes(file.name)) selected = files.filter((file) => names.includes(file.name))
} }
if (!selected.length) exit('No files selected') if (!selected.length) throw new Error('No files selected')
await Promise.all( await Promise.all(
selected.map(async (file) => { selected.map(async (file) => {
let filename = resolve(file.name) let filename = resolve(file.name)
@@ -79,7 +80,9 @@ export async function download(url: URL, all: boolean, suggestedPassword?: strin
break break
case 'text': case 'text':
const plaintext = await Adapters.Text.decrypt(note.contents, key).catch(couldNotDecrypt) const plaintext = await Adapters.Text.decrypt(note.contents, key).catch(() => {
throw couldNotDecrypt
})
console.log(plaintext) console.log(plaintext)
break break
} }

View File

@@ -1,104 +1,4 @@
#!/usr/bin/env node export * from '@cryptgeon/shared'
export * from './download.js'
import { Argument, Option, program } from '@commander-js/extra-typings' export * from './upload.js'
import { setBase, status } from '@cryptgeon/shared' export * from './utils.js'
import prettyBytes from 'pretty-bytes'
import { download } from './download.js'
import { parseFile, parseNumber } from './parsers.js'
import { getStdin } from './stdin.js'
import { upload } from './upload.js'
import { exit } from './utils.js'
const defaultServer = process.env['CRYPTGEON_SERVER'] || 'https://cryptgeon.org'
const server = new Option('-s --server <url>', 'the cryptgeon server to use').default(defaultServer)
const files = new Argument('<file...>', 'Files to be sent').argParser(parseFile)
const text = new Argument('<text>', 'Text content of the note')
const password = new Option('-p --password <string>', 'manually set a password')
const all = new Option('-a --all', 'Save all files without prompt').default(false)
const url = new Argument('<url>', 'The url to open')
const views = new Option('-v --views <number>', 'Amount of views before getting destroyed').argParser(parseNumber)
const minutes = new Option('-m --minutes <number>', 'Minutes before the note expires').argParser(parseNumber)
// Node 18 guard
parseInt(process.version.slice(1).split(',')[0]) < 18 && exit('Node 18 or higher is required')
// @ts-ignore
const version: string = VERSION
async function checkConstrains(constrains: { views?: number; minutes?: number }) {
const { views, minutes } = constrains
if (views && minutes) exit('cannot set view and minutes constrains simultaneously')
if (!views && !minutes) constrains.views = 1
const response = await status()
if (views && views > response.max_views)
exit(`Only a maximum of ${response.max_views} views allowed. ${views} given.`)
if (minutes && minutes > response.max_expiration)
exit(`Only a maximum of ${response.max_expiration} minutes allowed. ${minutes} given.`)
}
program.name('cryptgeon').version(version).configureHelp({ showGlobalOptions: true })
program
.command('info')
.description('show information about the server')
.addOption(server)
.action(async (options) => {
setBase(options.server)
const response = await status()
const formatted = {
...response,
max_size: prettyBytes(response.max_size),
}
for (const key of Object.keys(formatted)) {
if (key.startsWith('theme_')) delete formatted[key as keyof typeof formatted]
}
console.table(formatted)
})
const send = program.command('send').description('send a note')
send
.command('file')
.addArgument(files)
.addOption(server)
.addOption(views)
.addOption(minutes)
.addOption(password)
.action(async (files, options) => {
setBase(options.server!)
await checkConstrains(options)
options.password ||= await getStdin()
await upload(files, { views: options.views, expiration: options.minutes, password: options.password })
})
send
.command('text')
.addArgument(text)
.addOption(server)
.addOption(views)
.addOption(minutes)
.addOption(password)
.action(async (text, options) => {
setBase(options.server!)
await checkConstrains(options)
options.password ||= await getStdin()
await upload(text, { views: options.views, expiration: options.minutes, password: options.password })
})
program
.command('open')
.description('open a link with text or files inside')
.addArgument(url)
.addOption(password)
.addOption(all)
.action(async (note, options) => {
try {
const url = new URL(note)
options.password ||= await getStdin()
await download(url, options.all, options.password)
} catch {
exit('Invalid URL')
}
})
program.parse()

View File

@@ -3,49 +3,43 @@ import { basename } from 'node:path'
import { Adapters, BASE, create, FileDTO, Note, NoteMeta } from '@cryptgeon/shared' import { Adapters, BASE, create, FileDTO, Note, NoteMeta } from '@cryptgeon/shared'
import mime from 'mime' import mime from 'mime'
import { AES, Hex, TypedArray } from 'occulto' import { AES, Hex } from 'occulto'
import { exit } from './utils.js' export type UploadOptions = Pick<Note, 'views' | 'expiration'> & { password?: string }
type UploadOptions = Pick<Note, 'views' | 'expiration'> & { password?: string } export async function upload(input: string | string[], options: UploadOptions): Promise<string> {
const { password, ...noteOptions } = options
const derived = options.password ? await AES.derive(options.password) : undefined
const key = derived ? derived[0] : await AES.generateKey()
export async function upload(input: string | string[], options: UploadOptions) { let contents: string
try { let type: NoteMeta['type']
const { password, ...noteOptions } = options if (typeof input === 'string') {
const derived = options.password ? await AES.derive(options.password) : undefined contents = await Adapters.Text.encrypt(input, key)
const key = derived ? derived[0] : await AES.generateKey() type = 'text'
} else {
let contents: string const files: FileDTO[] = await Promise.all(
let type: NoteMeta['type'] input.map(async (path) => {
if (typeof input === 'string') { const data = new Uint8Array(await readFile(path))
contents = await Adapters.Text.encrypt(input, key) const stats = await stat(path)
type = 'text' const extension = path.substring(path.indexOf('.') + 1)
} else { const type = mime.getType(extension) ?? 'application/octet-stream'
const files: FileDTO[] = await Promise.all( return {
input.map(async (path) => { name: basename(path),
const data = new Uint8Array(await readFile(path)) size: stats.size,
const stats = await stat(path) contents: data,
const extension = path.substring(path.indexOf('.') + 1) type,
const type = mime.getType(extension) ?? 'application/octet-stream' } satisfies FileDTO
return { })
name: basename(path), )
size: stats.size, contents = await Adapters.Files.encrypt(files, key)
contents: data, type = 'file'
type,
} satisfies FileDTO
})
)
contents = await Adapters.Files.encrypt(files, key)
type = 'file'
}
// Create the actual note and upload it.
const note: Note = { ...noteOptions, contents, meta: { type, derivation: derived?.[1] } }
const result = await create(note)
let url = `${BASE}/note/${result.id}`
if (!derived) url += `#${Hex.encode(key)}`
console.log(`Note created:\n\n${url}`)
} catch {
exit('Could not create note')
} }
// Create the actual note and upload it.
const note: Note = { ...noteOptions, contents, meta: { type, derivation: derived?.[1] } }
const result = await create(note)
let url = `${BASE}/note/${result.id}`
if (!derived) url += `#${Hex.encode(key)}`
return url
} }

View File

@@ -1,6 +1,19 @@
import { status } from '@cryptgeon/shared'
import { exit as exitNode } from 'node:process' import { exit as exitNode } from 'node:process'
export function exit(message: string) { export function exit(message: string) {
console.error(message) console.error(message)
exitNode(1) exitNode(1)
} }
export async function checkConstrains(constrains: { views?: number; minutes?: number }) {
const { views, minutes } = constrains
if (views && minutes) exit('cannot set view and minutes constrains simultaneously')
if (!views && !minutes) constrains.views = 1
const response = await status()
if (views && views > response.max_views)
exit(`Only a maximum of ${response.max_views} views allowed. ${views} given.`)
if (minutes && minutes > response.max_expiration)
exit(`Only a maximum of ${response.max_expiration} minutes allowed. ${minutes} given.`)
}

View File

@@ -3,8 +3,11 @@
"target": "es2022", "target": "es2022",
"module": "es2022", "module": "es2022",
"moduleResolution": "node", "moduleResolution": "node",
"noEmit": true, "declaration": true,
"emitDeclarationOnly": true,
"strict": true, "strict": true,
"outDir": "./dist",
"rootDir": "./src",
"allowSyntheticDefaultImports": true "allowSyntheticDefaultImports": true
} }
} }

View File

@@ -1,56 +1,58 @@
{ {
"common": { "common": {
"note": "Hinweis", "note": "Notiz",
"file": "Datei", "file": "Datei",
"advanced": "erweitert", "advanced": "Erweiterte Optionen",
"create": "erstellen", "create": "Erstellen",
"loading": "läd", "loading": "Lädt...",
"mode": "Modus", "mode": "Modus",
"views": "{n, plural, =0 {Ansichten} =1 {1 Ansicht} other {# Ansichten}}", "views": "{n, plural, =0 {Ansichten} =1 {1 Ansicht} other {# Ansichten}}",
"minutes": "{n, plural, =0 {Minuten} =1 {1 Minute} other {# Minuten}}", "minutes": "{n, plural, =0 {Minuten} =1 {1 Minute} other {# Minuten}}",
"max": "max", "max": "max",
"share_link": "Link teilen", "share_link": "Link teilen",
"copy_clipboard": "in die Zwischenablage kopieren", "copy_clipboard": "In die Zwischenablage kopieren",
"copied_to_clipboard": "in die Zwischenablage kopiert", "copied_to_clipboard": "In die Zwischenablage kopiert.",
"encrypting": "verschlüsseln", "encrypting": "Wird verschlüsselt...",
"decrypting": "entschlüsselt", "decrypting": "Wird entschlüsselt...",
"uploading": "hochladen", "uploading": "Hochladen",
"downloading": "wird heruntergeladen", "downloading": "Wird heruntergeladen",
"qr_code": "qr-code", "qr_code": "QR-Code",
"password": "Passwort" "password": "Passwort"
}, },
"home": { "home": {
"intro": "Senden Sie ganz einfach <i>vollständig verschlüsselte</i>, sichere Notizen oder Dateien mit einem Klick. Erstellen Sie einfach eine Notiz und teilen Sie den Link.", "intro": "Erstellen Sie mit einem Klick <i>vollständig verschlüsselte</i>, sichere Notizen oder Dateien und teilen Sie diese über einen Link.",
"explanation": "die Notiz verfällt und wird nach {type} zerstört.", "explanation": "Die Notiz verfällt nach {type}.",
"new_note": "neue Note", "new_note": "Neue Notiz",
"new_note_notice": "<b>Verfügbarkeit:</b><br />es ist nicht garantiert, dass die Notiz gespeichert wird, da alles im Speicher gehalten wird. Wenn dieser voll ist, werden die ältesten Notizen entfernt.<br />(Sie werden wahrscheinlich keine Probleme haben, seien Sie nur gewarnt).", "new_note_notice": "<b>Wichtiger Hinweis zur Verfügbarkeit:</b><br />Es kann nicht garantiert werden, dass diese Notiz gespeichert wird, da diese <b>ausschließlich im Speicher</b> gehalten werden. Ist dieser voll, werden die ältesten Notizen entfernt.<br />(Wahrscheinlich gibt es keine derartigen Probleme, seien Sie nur vorgewarnt).",
"errors": { "errors": {
"note_to_big": "Notiz konnte nicht erstellt werden. Notiz ist zu groß", "note_to_big": "Notiz konnte nicht erstellt werden, da sie zu groß ist.",
"note_error": "konnte keine Notiz erstellen. Bitte versuchen Sie es erneut.", "note_error": "Notiz konnte nicht erstellt werden. Bitte versuchen Sie es erneut.",
"max": "max: {n}", "max": "max: {n}",
"empty_content": "Notiz ist leer." "empty_content": "Notiz ist leer."
}, },
"messages": { "messages": {
"note_created": "notiz erstellt." "note_created": "Notiz wurde erstellt."
}, },
"advanced": { "advanced": {
"explanation": "Standardmäßig wird für jede Notiz ein sicher generiertes Passwort verwendet. Sie können jedoch auch ein eigenes Kennwort wählen, das nicht in dem Link enthalten ist.", "explanation": "Standardmäßig wird für jede Notiz ein generiertes, sicheres Passwort verwendet. Alternativ können Sie ein eigenes Kennwort festlegen, welches nicht im Link enthalten ist.",
"custom_password": "benutzerdefiniertes Passwort" "custom_password": "Benutzerdefiniertes Passwort"
} }
}, },
"show": { "show": {
"errors": { "errors": {
"not_found": "wurde nicht gefunden oder wurde bereits gelöscht.", "not_found": "Notiz konnte nicht gefunden werden oder wurde bereits gelöscht.",
"decryption_failed": "falsches Passwort. konnte nicht entziffert werden. wahrscheinlich ein defekter Link. Notiz wurde zerstört.", "decryption_failed": "Notiz konnte nicht entschlüsselt werden. Vermutlich ist das Passwort falsch oder der Link defekt. Die Notiz wurde daher gelöscht.",
"unsupported_type": "nicht unterstützter Notiztyp." "unsupported_type": "Nicht unterstützter Notiztyp."
}, },
"explanation": "Klicken Sie unten, um die Notiz anzuzeigen und zu löschen, wenn der Zähler sein Limit erreicht hat", "explanation": "Klicken Sie auf den Button, um die Notiz anzuzeigen und anschließend zu löschen, falls ein festgelegtes Limit erreicht wurde.",
"show_note": "Notiz anzeigen", "show_note": "Notiz anzeigen",
"warning_will_not_see_again": "haben Sie <b>keine</b> Gelegenheit, die Notiz noch einmal zu sehen.", "warning_will_not_see_again": "ACHTUNG! Sie werden anschließend <b>keine</b> Gelegenheit mehr haben, die Notiz erneut anzusehen.",
"download_all": "alle herunterladen" "download_all": "Alle Dateien herunterladen",
"links_found": "Gefundene Links in der Notiz:"
}, },
"file_upload": { "file_upload": {
"selected_files": "Ausgewählte Dateien", "selected_files": "Ausgewählte Dateien",
"no_files_selected": "Keine Dateien ausgewählt" "no_files_selected": "Keine Dateien ausgewählt",
"clear": "Zurücksetzen"
} }
} }

View File

@@ -47,10 +47,12 @@
"explanation": "click below to show and delete the note if the counter has reached it's limit", "explanation": "click below to show and delete the note if the counter has reached it's limit",
"show_note": "show note", "show_note": "show note",
"warning_will_not_see_again": "you will <b>not</b> get the chance to see the note again.", "warning_will_not_see_again": "you will <b>not</b> get the chance to see the note again.",
"download_all": "download all" "download_all": "download all",
"links_found": "links found inside the note:"
}, },
"file_upload": { "file_upload": {
"selected_files": "Selected Files", "selected_files": "Selected Files",
"no_files_selected": "No Files Selected" "no_files_selected": "No Files Selected",
"clear": "Reset"
} }
} }

View File

@@ -23,7 +23,7 @@
"intro": "Envía fácilmente notas o archivos <i>totalmente encriptados</i> y seguros con un solo clic. Solo tienes que crear una nota y compartir el enlace.", "intro": "Envía fácilmente notas o archivos <i>totalmente encriptados</i> y seguros con un solo clic. Solo tienes que crear una nota y compartir el enlace.",
"explanation": "la nota expirará y se destruirá después de {type}.", "explanation": "la nota expirará y se destruirá después de {type}.",
"new_note": "nueva nota", "new_note": "nueva nota",
"new_note_notice": "<b>disponibilidad:</b><br />no se garantiza que la nota se almacene, ya que todo se guarda en la memoria RAM, si se llena se eliminarán las notas más antiguas.<br />(probablemente estará bien, sólo está advertido.)", "new_note_notice": "<b>disponibilidad:</b><br />no se garantiza que la nota se almacene, ya que todo se guarda en la memoria RAM, si se llena se eliminarán las notas más antiguas.<br />(probablemente estará bien, solo está advertido.)",
"errors": { "errors": {
"note_to_big": "no se pudo crear la nota. la nota es demasiado grande", "note_to_big": "no se pudo crear la nota. la nota es demasiado grande",
"note_error": "No se ha podido crear la nota. Por favor, inténtelo de nuevo.", "note_error": "No se ha podido crear la nota. Por favor, inténtelo de nuevo.",
@@ -34,7 +34,7 @@
"note_created": "nota creada." "note_created": "nota creada."
}, },
"advanced": { "advanced": {
"explanation": "Por defecto, se utiliza una contraseña generada de forma segura para cada nota. No obstante, también puede elegir su propia contraseña, que no se incluye en el enlace.", "explanation": "Por defecto, se utiliza una contraseña generada de forma segura para cada nota. No obstante, también puede elegir su propia contraseña, la cual no se incluye en el enlace.",
"custom_password": "contraseña personalizada" "custom_password": "contraseña personalizada"
} }
}, },
@@ -47,10 +47,12 @@
"explanation": "pulse abajo para mostrar y borrar la nota si el contador ha llegado a su límite", "explanation": "pulse abajo para mostrar y borrar la nota si el contador ha llegado a su límite",
"show_note": "mostrar nota", "show_note": "mostrar nota",
"warning_will_not_see_again": "<b>no</b> tendrás la oportunidad de volver a ver la nota.", "warning_will_not_see_again": "<b>no</b> tendrás la oportunidad de volver a ver la nota.",
"download_all": "descargar todo" "download_all": "descargar todo",
"links_found": "enlaces que se encuentran dentro de la nota:"
}, },
"file_upload": { "file_upload": {
"selected_files": "Archivos seleccionados", "selected_files": "Archivos seleccionados",
"no_files_selected": "No hay archivos seleccionados" "no_files_selected": "No hay archivos seleccionados",
"clear": "Restablecer"
} }
} }

View File

@@ -47,10 +47,12 @@
"explanation": "Cliquez ci-dessous pour afficher et supprimer la note si le compteur a atteint sa limite.", "explanation": "Cliquez ci-dessous pour afficher et supprimer la note si le compteur a atteint sa limite.",
"show_note": "note de présentation", "show_note": "note de présentation",
"warning_will_not_see_again": "vous <b>n'aurez pas</b> la chance de revoir la note.", "warning_will_not_see_again": "vous <b>n'aurez pas</b> la chance de revoir la note.",
"download_all": "télécharger tout" "download_all": "télécharger tout",
"links_found": "liens trouvés à lintérieur de la note :"
}, },
"file_upload": { "file_upload": {
"selected_files": "Fichiers sélectionnés", "selected_files": "Fichiers sélectionnés",
"no_files_selected": "Aucun fichier sélectionné" "no_files_selected": "Aucun fichier sélectionné",
"clear": "Réinitialiser"
} }
} }

View File

@@ -47,10 +47,12 @@
"explanation": "clicca sotto per mostrare e cancellare la nota se il contatore ha raggiunto il suo limite", "explanation": "clicca sotto per mostrare e cancellare la nota se il contatore ha raggiunto il suo limite",
"show_note": "mostra la nota", "show_note": "mostra la nota",
"warning_will_not_see_again": "<b>non</b> avrete la possibilità di rivedere la nota.", "warning_will_not_see_again": "<b>non</b> avrete la possibilità di rivedere la nota.",
"download_all": "scarica tutti" "download_all": "scarica tutti",
"links_found": "link presenti all'interno della nota:"
}, },
"file_upload": { "file_upload": {
"selected_files": "File selezionati", "selected_files": "File selezionati",
"no_files_selected": "Nessun file selezionato" "no_files_selected": "Nessun file selezionato",
"clear": "Reset"
} }
} }

View File

@@ -47,10 +47,12 @@
"explanation": "カウンターが上限に達した場合、ノートの表示と削除を行うには、以下をクリックします。", "explanation": "カウンターが上限に達した場合、ノートの表示と削除を行うには、以下をクリックします。",
"show_note": "メモを表示", "show_note": "メモを表示",
"warning_will_not_see_again": "あなた <b>できません</b> このノートをもう一度見る", "warning_will_not_see_again": "あなた <b>できません</b> このノートをもう一度見る",
"download_all": "すべてダウンロード" "download_all": "すべてダウンロード",
"links_found": "メモ内にあるリンク:"
}, },
"file_upload": { "file_upload": {
"selected_files": "選択したファイル", "selected_files": "選択したファイル",
"no_files_selected": "ファイルが選択されていません" "no_files_selected": "ファイルが選択されていません",
"clear": "リセット"
} }
} }

View File

@@ -47,10 +47,12 @@
"explanation": "щелкните ниже, чтобы показать и удалить примечание, если счетчик достиг предела", "explanation": "щелкните ниже, чтобы показать и удалить примечание, если счетчик достиг предела",
"show_note": "показать заметку", "show_note": "показать заметку",
"warning_will_not_see_again": "вы <b>не сможете</b> больше просмотреть заметку.", "warning_will_not_see_again": "вы <b>не сможете</b> больше просмотреть заметку.",
"download_all": "скачать всё" "download_all": "скачать всё",
"links_found": "ссылки внутри заметки:"
}, },
"file_upload": { "file_upload": {
"selected_files": "Выбранные файлы", "selected_files": "Выбранные файлы",
"no_files_selected": "Файлы не выбраны" "no_files_selected": "Файлы не выбраны",
"clear": "Сброс"
} }
} }

View File

@@ -47,10 +47,12 @@
"explanation": "点击下方按钮即可查看密信,阅后即焚。", "explanation": "点击下方按钮即可查看密信,阅后即焚。",
"show_note": "查看密信", "show_note": "查看密信",
"warning_will_not_see_again": "你将<b>无法</b>再次查看该密信,请尽快复制到粘贴板。", "warning_will_not_see_again": "你将<b>无法</b>再次查看该密信,请尽快复制到粘贴板。",
"download_all": "下载全部" "download_all": "下载全部",
"links_found": "注释中找到的链接:"
}, },
"file_upload": { "file_upload": {
"selected_files": "已选中的文件", "selected_files": "已选中的文件",
"no_files_selected": "没有文件被选中" "no_files_selected": "没有文件被选中",
"clear": "重置"
} }
} }

View File

@@ -13,29 +13,28 @@
}, },
"type": "module", "type": "module",
"devDependencies": { "devDependencies": {
"@lokalise/node-api": "^9.8.0", "@lokalise/node-api": "^12.1.0",
"@sveltejs/adapter-static": "^2.0.2", "@sveltejs/adapter-static": "^3.0.1",
"@sveltejs/kit": "^1.16.3", "@sveltejs/kit": "^2.5.2",
"@types/dompurify": "^3.0.2", "@sveltejs/vite-plugin-svelte": "^3.0.2",
"@types/file-saver": "^2.0.5", "@types/file-saver": "^2.0.7",
"@zerodevx/svelte-toast": "^0.9.3", "@zerodevx/svelte-toast": "^0.9.5",
"adm-zip": "^0.5.10", "adm-zip": "^0.5.10",
"dotenv": "^16.0.3", "dotenv": "^16.4.5",
"svelte": "^3.59.1", "svelte": "^4.2.12",
"svelte-check": "^3.3.2", "svelte-check": "^3.6.6",
"svelte-intl-precompile": "^0.12.1", "svelte-intl-precompile": "^0.12.3",
"tslib": "^2.5.0", "tslib": "^2.6.2",
"typescript": "^5.0.4", "typescript": "^5.3.3",
"vite": "^4.3.5" "vite": "^5.1.4"
}, },
"dependencies": { "dependencies": {
"@cryptgeon/shared": "workspace:*", "@cryptgeon/shared": "workspace:*",
"@fontsource/fira-mono": "^4.5.10", "@fontsource/fira-mono": "^5.0.8",
"copy-to-clipboard": "^3.3.3", "copy-to-clipboard": "^3.3.3",
"dompurify": "^3.0.3",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"occulto": "^2.0.1", "occulto": "^2.0.3",
"pretty-bytes": "^6.1.0", "pretty-bytes": "^6.1.1",
"qrious": "^4.0.2" "qrious": "^4.0.2"
} }
} }

View File

@@ -46,7 +46,7 @@
</div> </div>
{/each} {/each}
<div class="spacer" /> <div class="spacer" />
<Button on:click={clear}>Clear</Button> <Button on:click={clear}>{$t('file_upload.clear')}</Button>
</div> </div>
{:else} {:else}
<div> <div>

View File

@@ -3,7 +3,6 @@
</script> </script>
<script lang="ts"> <script lang="ts">
import DOMPurify from 'dompurify'
import { saveAs } from 'file-saver' import { saveAs } from 'file-saver'
import prettyBytes from 'pretty-bytes' import prettyBytes from 'pretty-bytes'
import { t } from 'svelte-intl-precompile' import { t } from 'svelte-intl-precompile'
@@ -34,22 +33,29 @@
saveAs(f) saveAs(f)
} }
function contentWithLinks(content: string): string { $: links = typeof note.contents === 'string' ? note.contents.match(RE_URL) : []
const replaced = content.replace(
RE_URL,
(url) => `<a href="${url}" rel="noreferrer">${url}</a>`
)
return DOMPurify.sanitize(replaced, { USE_PROFILES: { html: true } })
}
</script> </script>
<p class="error-text">{@html $t('show.warning_will_not_see_again')}</p> <p class="error-text">{@html $t('show.warning_will_not_see_again')}</p>
<div data-testid="result"> <div data-testid="result">
{#if note.meta.type === 'text'} {#if note.meta.type === 'text'}
<div class="note"> <div class="note">
{@html contentWithLinks(note.contents)} {note.contents}
</div> </div>
<Button on:click={() => copy(note.contents)}>{$t('common.copy_clipboard')}</Button> <Button on:click={() => copy(note.contents)}>{$t('common.copy_clipboard')}</Button>
{#if links && links.length}
<div class="links">
{$t('show.links_found')}
<ul>
{#each links as link}
<li>
<a href={link} target="_blank" rel="noopener noreferrer">{link}</a>
</li>
{/each}
</ul>
</div>
{/if}
{:else} {:else}
{#each files as file} {#each files as file}
<div class="note file"> <div class="note file">
@@ -92,4 +98,20 @@
.note.file small { .note.file small {
padding-left: 1rem; padding-left: 1rem;
} }
.links {
margin-top: 2rem;
}
.links ul {
margin: 0;
padding: 0;
margin-top: 0.5rem;
padding-left: 1rem;
list-style: square;
}
.links ul li {
margin-bottom: 0.5rem;
word-wrap: break-word;
}
</style> </style>

View File

@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { AES, Hex, Bytes } from 'occulto' import { AES, Hex } from 'occulto'
import { t } from 'svelte-intl-precompile' import { t } from 'svelte-intl-precompile'
import { blur } from 'svelte/transition' import { blur } from 'svelte/transition'
@@ -14,7 +14,7 @@
import Switch from '$lib/ui/Switch.svelte' import Switch from '$lib/ui/Switch.svelte'
import TextArea from '$lib/ui/TextArea.svelte' import TextArea from '$lib/ui/TextArea.svelte'
import type { FileDTO, Note } from '@cryptgeon/shared' import type { FileDTO, Note } from '@cryptgeon/shared'
import { Adapters, create, PayloadToLargeError } from '@cryptgeon/shared' import { Adapters, PayloadToLargeError, create } from '@cryptgeon/shared'
let note: Note = { let note: Note = {
contents: '', contents: '',
@@ -149,7 +149,7 @@
</p> </p>
{#if advanced} {#if advanced}
<div transition:blur={{ duration: 250 }}> <div transition:blur|global={{ duration: 250 }}>
<hr /> <hr />
<AdvancedParameters bind:note bind:timeExpiration bind:customPassword /> <AdvancedParameters bind:note bind:timeExpiration bind:customPassword />
</div> </div>

View File

@@ -1,6 +1,6 @@
import adapter from '@sveltejs/adapter-static' import adapter from '@sveltejs/adapter-static'
import precompileIntl from 'svelte-intl-precompile/sveltekit-plugin' import precompileIntl from 'svelte-intl-precompile/sveltekit-plugin'
import { vitePreprocess } from '@sveltejs/kit/vite' import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
export default { export default {
preprocess: vitePreprocess([precompileIntl('locales')]), preprocess: vitePreprocess([precompileIntl('locales')]),

View File

@@ -14,9 +14,9 @@
"build": "tsc" "build": "tsc"
}, },
"devDependencies": { "devDependencies": {
"typescript": "^5.0.4" "typescript": "^5.3.3"
}, },
"dependencies": { "dependencies": {
"occulto": "^2.0.1" "occulto": "^2.0.3"
} }
} }

2636
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -88,7 +88,7 @@ export async function checkLinkDoesNotExist(page: Page, link: string) {
} }
export async function CLI(...args: string[]) { export async function CLI(...args: string[]) {
return await exec('./packages/cli/dist/index.cjs', args, { return await exec('./packages/cli/dist/cli.cjs', args, {
env: { env: {
...process.env, ...process.env,
CRYPTGEON_SERVER: 'http://localhost:1234', CRYPTGEON_SERVER: 'http://localhost:1234',