Merge pull request #106 from cupcakearmy/2.4.0

2.4.0
This commit is contained in:
Nicco 2023-11-01 15:57:12 +01:00 committed by GitHub
commit 9578b2bed2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 780 additions and 796 deletions

2
.nvmrc
View File

@ -1 +1 @@
v18.17.1
v20.9.0

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/),
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
### Added

View File

@ -8,12 +8,9 @@ RUN pnpm run build
# BACKEND
FROM rust:1.71-alpine as backend
FROM rust:1.73-alpine as backend
WORKDIR /tmp
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 ./
RUN cargo build --release

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,9 @@
[package]
name = "cryptgeon"
version = "2.3.3"
version = "2.4.0"
authors = ["cupcakearmy <hi@nicco.io>"]
edition = "2021"
rust-version = "1.71"
rust-version = "1.73"
[[bin]]
name = "cryptgeon"

View File

@ -1,5 +1,5 @@
{
"version": "2.3.3",
"version": "2.4.0",
"name": "cryptgeon",
"repository": {
"type": "git",
@ -26,18 +26,18 @@
"dist"
],
"devDependencies": {
"@commander-js/extra-typings": "^11.0.0",
"@commander-js/extra-typings": "^11.1.0",
"@cryptgeon/shared": "workspace:*",
"@types/inquirer": "^9.0.3",
"@types/mime": "^3.0.1",
"@types/node": "^20.5.0",
"commander": "^11.0.0",
"esbuild": "^0.19.2",
"inquirer": "^9.2.10",
"@types/inquirer": "^9.0.6",
"@types/mime": "^3.0.3",
"@types/node": "^20.8.10",
"commander": "^11.1.0",
"esbuild": "^0.19.5",
"inquirer": "^9.2.11",
"mime": "^3.0.0",
"occulto": "^2.0.1",
"pkg": "^5.8.1",
"pretty-bytes": "^6.1.1",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
}
}

View File

@ -47,7 +47,8 @@
"explanation": "Klicken Sie unten, um die Notiz anzuzeigen und zu löschen, wenn der Zähler sein Limit erreicht hat",
"show_note": "Notiz anzeigen",
"warning_will_not_see_again": "haben Sie <b>keine</b> Gelegenheit, die Notiz noch einmal zu sehen.",
"download_all": "alle herunterladen"
"download_all": "alle herunterladen",
"links_found": "Links in der Notiz:"
},
"file_upload": {
"selected_files": "Ausgewählte Dateien",

View File

@ -23,9 +23,9 @@
"intro": "Easily send <i>fully encrypted</i>, secure notes or files with one click. Just create a note and share the link.",
"explanation": "the note will expire and be destroyed after {type}.",
"new_note": "new note",
"new_note_notice": "<b>availability:</b><br />the note is not guaranteed to be stored, as everything is kept in ram. if it fills up, the oldest notes will be removed.<br />(you probably will be fine, but just be warned.)",
"new_note_notice": "<b>availability:</b><br />the note is not guaranteed to be stored as everything is kept in ram, if it fills up the oldest notes will be removed.<br />(you probably will be fine, just be warned.)",
"errors": {
"note_to_big": "could not create note. note is too big.",
"note_to_big": "could not create note. note is to big",
"note_error": "could not create note. please try again.",
"max": "max: {n}",
"empty_content": "note is empty."
@ -34,7 +34,7 @@
"note_created": "note created."
},
"advanced": {
"explanation": "By default, a securely generated password is used for each note. You can, however, also choose your own password, which is not included in the link.",
"explanation": "By default, a securely generated password is used for each note. You can however also choose your own password, which is not included in the link.",
"custom_password": "custom password"
}
},
@ -44,10 +44,11 @@
"decryption_failed": "wrong password. could not decipher. probably a broken link. note was destroyed.",
"unsupported_type": "unsupported note type."
},
"explanation": "click below to show and delete the note if the counter has reached its limit.",
"explanation": "click below to show and delete the note if the counter has reached it's limit",
"show_note": "show note",
"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": {
"selected_files": "Selected Files",

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.",
"explanation": "la nota expirará y se destruirá después de {type}.",
"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": {
"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.",
@ -34,7 +34,7 @@
"note_created": "nota creada."
},
"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"
}
},
@ -47,7 +47,8 @@
"explanation": "pulse abajo para mostrar y borrar la nota si el contador ha llegado a su límite",
"show_note": "mostrar 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": {
"selected_files": "Archivos seleccionados",

View File

@ -47,7 +47,8 @@
"explanation": "Cliquez ci-dessous pour afficher et supprimer la note si le compteur a atteint sa limite.",
"show_note": "note de présentation",
"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": {
"selected_files": "Fichiers sélectionnés",

View File

@ -47,7 +47,8 @@
"explanation": "clicca sotto per mostrare e cancellare la nota se il contatore ha raggiunto il suo limite",
"show_note": "mostra 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": {
"selected_files": "File selezionati",

View File

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

View File

@ -23,10 +23,10 @@
"intro": "Легко отправляйте <i>полностью зашифрованные</i> защищенные заметки или файлы одним щелчком мыши. Просто создайте заметку и поделитесь ссылкой.",
"explanation": "заметка истечет и будет уничтожена после {type}.",
"new_note": "новая заметка",
"new_note_notice": "<b>предупреждение:</b><br />не гарантируется, что заметка будет сохранена, так как все хранится в оперативной памяти, если она заполнится, самые старые заметки будут удалены..<br />(вероятно всё будет хорошо, просто будьте осторожны.)",
"new_note_notice": "<b>availability:</b><br />the note is not guaranteed to be stored as everything is kept in ram, if it fills up the oldest notes will be removed.<br />(you probably will be fine, just be warned.)",
"errors": {
"note_to_big": "нельзя создать новую заметку. заметка слишком большая",
"note_error": "нельзя создать новую заметку. пожалуйста попробуйте позднее.",
"note_error": "нельзя создать новую заметку. пожалйста попробуйте позднее.",
"max": "макс: {n}",
"empty_content": "пустая заметка."
},
@ -44,10 +44,11 @@
"decryption_failed": "неправильный пароль. не смог расшифровать. возможно ссылка битая. записка уничтожена.",
"unsupported_type": "неподдерживаемый тип заметки."
},
"explanation": "щелкните ниже, чтобы показать и удалить заметку, если счетчик достиг предела",
"explanation": "щелкните ниже, чтобы показать и удалить примечание, если счетчик достиг предела",
"show_note": "показать заметку",
"warning_will_not_see_again": "вы <b>не сможете</b> больше просмотреть заметку.",
"download_all": "скачать всё"
"download_all": "скачать всё",
"links_found": "ссылки внутри заметки:"
},
"file_upload": {
"selected_files": "Выбранные файлы",

View File

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

View File

@ -13,29 +13,27 @@
},
"type": "module",
"devDependencies": {
"@lokalise/node-api": "^10.0.0",
"@lokalise/node-api": "^12.0.0",
"@sveltejs/adapter-static": "^2.0.3",
"@sveltejs/kit": "^1.22.6",
"@types/dompurify": "^3.0.2",
"@types/file-saver": "^2.0.5",
"@sveltejs/kit": "^1.27.2",
"@types/file-saver": "^2.0.6",
"@zerodevx/svelte-toast": "^0.9.5",
"adm-zip": "^0.5.10",
"dotenv": "^16.3.1",
"svelte": "^4.2.0",
"svelte-check": "^3.5.0",
"svelte": "^4.2.2",
"svelte-check": "^3.5.2",
"svelte-intl-precompile": "^0.12.3",
"tslib": "^2.6.1",
"typescript": "^5.1.6",
"vite": "^4.4.9"
"tslib": "^2.6.2",
"typescript": "^5.2.2",
"vite": "^4.5.0"
},
"dependencies": {
"@cryptgeon/shared": "workspace:*",
"@fontsource/fira-mono": "^5.0.8",
"copy-to-clipboard": "^3.3.3",
"dompurify": "^3.0.5",
"file-saver": "^2.0.5",
"occulto": "^2.0.1",
"pretty-bytes": "^6.1.1",
"qrious": "^4.0.2"
}
}
}

View File

@ -3,7 +3,6 @@
</script>
<script lang="ts">
import DOMPurify from 'dompurify'
import { saveAs } from 'file-saver'
import prettyBytes from 'pretty-bytes'
import { t } from 'svelte-intl-precompile'
@ -34,22 +33,29 @@
saveAs(f)
}
function contentWithLinks(content: string): string {
const replaced = content.replace(
RE_URL,
(url) => `<a href="${url}" rel="noreferrer">${url}</a>`
)
return DOMPurify.sanitize(replaced, { USE_PROFILES: { html: true } })
}
$: links = typeof note.contents === 'string' ? note.contents.match(RE_URL) : []
</script>
<p class="error-text">{@html $t('show.warning_will_not_see_again')}</p>
<div data-testid="result">
{#if note.meta.type === 'text'}
<div class="note">
{@html contentWithLinks(note.contents)}
{note.contents}
</div>
<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}
{#each files as file}
<div class="note file">
@ -92,4 +98,20 @@
.note.file small {
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>

View File

@ -14,7 +14,7 @@
"build": "tsc"
},
"devDependencies": {
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"dependencies": {
"occulto": "^2.0.1"

File diff suppressed because it is too large Load Diff