mirror of
https://github.com/cupcakearmy/cryptgeon.git
synced 2024-12-23 00:36:28 +00:00
Compare commits
No commits in common. "fdc2722fb96cc85a902677d2d074af8377076ccd" and "d7e5a34b14b9c7f8a226b5b0dc9db7cf86880fd3" have entirely different histories.
fdc2722fb9
...
d7e5a34b14
@ -1,593 +0,0 @@
|
||||
{
|
||||
"info": {
|
||||
"_postman_id": "52d9e661-2d99-47f8-b09a-40b6a1c0b364",
|
||||
"name": "Cryptgeon",
|
||||
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
|
||||
},
|
||||
"item": [
|
||||
{
|
||||
"name": "Notes",
|
||||
"item": [
|
||||
{
|
||||
"name": "Preview",
|
||||
"request": {
|
||||
"method": "GET",
|
||||
"header": [],
|
||||
"url": {
|
||||
"raw": "{{BASE}}/notes/:id",
|
||||
"host": [
|
||||
"{{BASE}}"
|
||||
],
|
||||
"path": [
|
||||
"notes",
|
||||
":id"
|
||||
],
|
||||
"variable": [
|
||||
{
|
||||
"key": "id",
|
||||
"value": "{{NOTE_ID}}",
|
||||
"description": "Id of the Note"
|
||||
}
|
||||
]
|
||||
},
|
||||
"description": "This endpoint is to query wether a note exists, without actually opening it. No view limits are used here, as contents of the note are not available, only the `meta` field is returned, which is public."
|
||||
},
|
||||
"response": [
|
||||
{
|
||||
"name": "200",
|
||||
"originalRequest": {
|
||||
"method": "GET",
|
||||
"header": [],
|
||||
"url": {
|
||||
"raw": "{{BASE}}/notes/:id",
|
||||
"host": [
|
||||
"{{BASE}}"
|
||||
],
|
||||
"path": [
|
||||
"notes",
|
||||
":id"
|
||||
],
|
||||
"variable": [
|
||||
{
|
||||
"key": "id",
|
||||
"value": "{{NOTE_ID}}",
|
||||
"description": "Id of the Note"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"status": "OK",
|
||||
"code": 200,
|
||||
"_postman_previewlanguage": "json",
|
||||
"header": [
|
||||
{
|
||||
"key": "transfer-encoding",
|
||||
"value": "chunked"
|
||||
},
|
||||
{
|
||||
"key": "connection",
|
||||
"value": "close"
|
||||
},
|
||||
{
|
||||
"key": "content-type",
|
||||
"value": "application/json"
|
||||
},
|
||||
{
|
||||
"key": "content-encoding",
|
||||
"value": "gzip"
|
||||
},
|
||||
{
|
||||
"key": "vary",
|
||||
"value": "accept-encoding"
|
||||
},
|
||||
{
|
||||
"key": "date",
|
||||
"value": "Tue, 23 May 2023 05:24:29 GMT"
|
||||
}
|
||||
],
|
||||
"cookie": [],
|
||||
"body": "{}"
|
||||
},
|
||||
{
|
||||
"name": "404",
|
||||
"originalRequest": {
|
||||
"method": "GET",
|
||||
"header": [],
|
||||
"url": {
|
||||
"raw": "{{BASE}}/notes/:id",
|
||||
"host": [
|
||||
"{{BASE}}"
|
||||
],
|
||||
"path": [
|
||||
"notes",
|
||||
":id"
|
||||
],
|
||||
"variable": [
|
||||
{
|
||||
"key": "id",
|
||||
"value": "{{NOTE_ID}}",
|
||||
"description": "Id of the Note"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"status": "Not Found",
|
||||
"code": 404,
|
||||
"_postman_previewlanguage": "plain",
|
||||
"header": [
|
||||
{
|
||||
"key": "transfer-encoding",
|
||||
"value": "chunked"
|
||||
},
|
||||
{
|
||||
"key": "connection",
|
||||
"value": "close"
|
||||
},
|
||||
{
|
||||
"key": "vary",
|
||||
"value": "accept-encoding"
|
||||
},
|
||||
{
|
||||
"key": "content-encoding",
|
||||
"value": "gzip"
|
||||
},
|
||||
{
|
||||
"key": "date",
|
||||
"value": "Tue, 23 May 2023 05:25:26 GMT"
|
||||
}
|
||||
],
|
||||
"cookie": [],
|
||||
"body": null
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Create",
|
||||
"event": [
|
||||
{
|
||||
"listen": "test",
|
||||
"script": {
|
||||
"exec": [
|
||||
"const jsonData = pm.response.json();",
|
||||
"pm.collectionVariables.set('NOTE_ID', jsonData.id)",
|
||||
""
|
||||
],
|
||||
"type": "text/javascript"
|
||||
}
|
||||
}
|
||||
],
|
||||
"request": {
|
||||
"method": "POST",
|
||||
"header": [],
|
||||
"body": {
|
||||
"mode": "raw",
|
||||
"raw": "{\n \"contents\": \"Some encrypted content\",\n \"views\": 1,\n \"meta\": \"{\\\"type\\\":\\\"text\\\"}\"\n}",
|
||||
"options": {
|
||||
"raw": {
|
||||
"language": "json"
|
||||
}
|
||||
}
|
||||
},
|
||||
"url": {
|
||||
"raw": "{{BASE}}/notes/",
|
||||
"host": [
|
||||
"{{BASE}}"
|
||||
],
|
||||
"path": [
|
||||
"notes",
|
||||
""
|
||||
]
|
||||
}
|
||||
},
|
||||
"response": [
|
||||
{
|
||||
"name": "Simple",
|
||||
"originalRequest": {
|
||||
"method": "POST",
|
||||
"header": [],
|
||||
"body": {
|
||||
"mode": "raw",
|
||||
"raw": "{\n \"contents\": \"Some encrypted content\",\n \"views\": 1,\n \"meta\": \"{\\\"type\\\":\\\"text\\\"}\"\n}",
|
||||
"options": {
|
||||
"raw": {
|
||||
"language": "json"
|
||||
}
|
||||
}
|
||||
},
|
||||
"url": {
|
||||
"raw": "{{BASE}}/notes/",
|
||||
"host": [
|
||||
"{{BASE}}"
|
||||
],
|
||||
"path": [
|
||||
"notes",
|
||||
""
|
||||
]
|
||||
}
|
||||
},
|
||||
"status": "OK",
|
||||
"code": 200,
|
||||
"_postman_previewlanguage": "json",
|
||||
"header": [
|
||||
{
|
||||
"key": "transfer-encoding",
|
||||
"value": "chunked"
|
||||
},
|
||||
{
|
||||
"key": "connection",
|
||||
"value": "close"
|
||||
},
|
||||
{
|
||||
"key": "content-encoding",
|
||||
"value": "gzip"
|
||||
},
|
||||
{
|
||||
"key": "content-type",
|
||||
"value": "application/json"
|
||||
},
|
||||
{
|
||||
"key": "vary",
|
||||
"value": "accept-encoding"
|
||||
},
|
||||
{
|
||||
"key": "date",
|
||||
"value": "Tue, 23 May 2023 05:31:54 GMT"
|
||||
}
|
||||
],
|
||||
"cookie": [],
|
||||
"body": "{\n \"id\": \"1QeEWDQbQY9dOo8cDDQjykaEjouqugTR6A78sjgn4VMv\"\n}"
|
||||
},
|
||||
{
|
||||
"name": "5 Minutes",
|
||||
"originalRequest": {
|
||||
"method": "POST",
|
||||
"header": [],
|
||||
"body": {
|
||||
"mode": "raw",
|
||||
"raw": "{\n \"contents\": \"Some encrypted content\",\n \"expiration\": 5,\n \"meta\": \"{\\\"type\\\":\\\"text\\\"}\"\n}",
|
||||
"options": {
|
||||
"raw": {
|
||||
"language": "json"
|
||||
}
|
||||
}
|
||||
},
|
||||
"url": {
|
||||
"raw": "{{BASE}}/notes/",
|
||||
"host": [
|
||||
"{{BASE}}"
|
||||
],
|
||||
"path": [
|
||||
"notes",
|
||||
""
|
||||
]
|
||||
}
|
||||
},
|
||||
"status": "OK",
|
||||
"code": 200,
|
||||
"_postman_previewlanguage": "json",
|
||||
"header": [
|
||||
{
|
||||
"key": "transfer-encoding",
|
||||
"value": "chunked"
|
||||
},
|
||||
{
|
||||
"key": "connection",
|
||||
"value": "close"
|
||||
},
|
||||
{
|
||||
"key": "content-encoding",
|
||||
"value": "gzip"
|
||||
},
|
||||
{
|
||||
"key": "content-type",
|
||||
"value": "application/json"
|
||||
},
|
||||
{
|
||||
"key": "vary",
|
||||
"value": "accept-encoding"
|
||||
},
|
||||
{
|
||||
"key": "date",
|
||||
"value": "Tue, 23 May 2023 05:31:54 GMT"
|
||||
}
|
||||
],
|
||||
"cookie": [],
|
||||
"body": "{\n \"id\": \"1QeEWDQbQY9dOo8cDDQjykaEjouqugTR6A78sjgn4VMv\"\n}"
|
||||
},
|
||||
{
|
||||
"name": "3 Views",
|
||||
"originalRequest": {
|
||||
"method": "POST",
|
||||
"header": [],
|
||||
"body": {
|
||||
"mode": "raw",
|
||||
"raw": "{\n \"contents\": \"Some encrypted content\",\n \"views\": 3,\n \"meta\": \"{\\\"type\\\":\\\"text\\\"}\"\n}",
|
||||
"options": {
|
||||
"raw": {
|
||||
"language": "json"
|
||||
}
|
||||
}
|
||||
},
|
||||
"url": {
|
||||
"raw": "{{BASE}}/notes/",
|
||||
"host": [
|
||||
"{{BASE}}"
|
||||
],
|
||||
"path": [
|
||||
"notes",
|
||||
""
|
||||
]
|
||||
}
|
||||
},
|
||||
"status": "OK",
|
||||
"code": 200,
|
||||
"_postman_previewlanguage": "json",
|
||||
"header": [
|
||||
{
|
||||
"key": "transfer-encoding",
|
||||
"value": "chunked"
|
||||
},
|
||||
{
|
||||
"key": "connection",
|
||||
"value": "close"
|
||||
},
|
||||
{
|
||||
"key": "content-encoding",
|
||||
"value": "gzip"
|
||||
},
|
||||
{
|
||||
"key": "content-type",
|
||||
"value": "application/json"
|
||||
},
|
||||
{
|
||||
"key": "vary",
|
||||
"value": "accept-encoding"
|
||||
},
|
||||
{
|
||||
"key": "date",
|
||||
"value": "Tue, 23 May 2023 05:31:54 GMT"
|
||||
}
|
||||
],
|
||||
"cookie": [],
|
||||
"body": "{\n \"id\": \"1QeEWDQbQY9dOo8cDDQjykaEjouqugTR6A78sjgn4VMv\"\n}"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Read",
|
||||
"request": {
|
||||
"method": "DELETE",
|
||||
"header": [],
|
||||
"url": {
|
||||
"raw": "{{BASE}}/notes/:id",
|
||||
"host": [
|
||||
"{{BASE}}"
|
||||
],
|
||||
"path": [
|
||||
"notes",
|
||||
":id"
|
||||
],
|
||||
"variable": [
|
||||
{
|
||||
"key": "id",
|
||||
"value": "{{NOTE_ID}}"
|
||||
}
|
||||
]
|
||||
},
|
||||
"description": "This endpoint gets the actual contents of a note. It's a `DELETE` endpoint, es it decreases the `view` counter, and deletes the note if `0` is reached."
|
||||
},
|
||||
"response": [
|
||||
{
|
||||
"name": "200",
|
||||
"originalRequest": {
|
||||
"method": "DELETE",
|
||||
"header": [],
|
||||
"url": {
|
||||
"raw": "{{BASE}}/notes/:id",
|
||||
"host": [
|
||||
"{{BASE}}"
|
||||
],
|
||||
"path": [
|
||||
"notes",
|
||||
":id"
|
||||
],
|
||||
"variable": [
|
||||
{
|
||||
"key": "id",
|
||||
"value": "{{NOTE_ID}}"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"status": "OK",
|
||||
"code": 200,
|
||||
"_postman_previewlanguage": "json",
|
||||
"header": [
|
||||
{
|
||||
"key": "transfer-encoding",
|
||||
"value": "chunked"
|
||||
},
|
||||
{
|
||||
"key": "connection",
|
||||
"value": "close"
|
||||
},
|
||||
{
|
||||
"key": "content-type",
|
||||
"value": "application/json"
|
||||
},
|
||||
{
|
||||
"key": "vary",
|
||||
"value": "accept-encoding"
|
||||
},
|
||||
{
|
||||
"key": "content-encoding",
|
||||
"value": "gzip"
|
||||
},
|
||||
{
|
||||
"key": "date",
|
||||
"value": "Tue, 23 May 2023 05:59:07 GMT"
|
||||
}
|
||||
],
|
||||
"cookie": [],
|
||||
"body": "{\n \"meta\": \"{\\\"type\\\":\\\"text\\\"}\",\n \"contents\": \"Some encrypted content\"\n}"
|
||||
},
|
||||
{
|
||||
"name": "404",
|
||||
"originalRequest": {
|
||||
"method": "DELETE",
|
||||
"header": [],
|
||||
"url": {
|
||||
"raw": "{{BASE}}/notes/:id",
|
||||
"host": [
|
||||
"{{BASE}}"
|
||||
],
|
||||
"path": [
|
||||
"notes",
|
||||
":id"
|
||||
],
|
||||
"variable": [
|
||||
{
|
||||
"key": "id",
|
||||
"value": "{{NOTE_ID}}"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"status": "Not Found",
|
||||
"code": 404,
|
||||
"_postman_previewlanguage": "plain",
|
||||
"header": [
|
||||
{
|
||||
"key": "transfer-encoding",
|
||||
"value": "chunked"
|
||||
},
|
||||
{
|
||||
"key": "connection",
|
||||
"value": "close"
|
||||
},
|
||||
{
|
||||
"key": "vary",
|
||||
"value": "accept-encoding"
|
||||
},
|
||||
{
|
||||
"key": "content-encoding",
|
||||
"value": "gzip"
|
||||
},
|
||||
{
|
||||
"key": "date",
|
||||
"value": "Tue, 23 May 2023 05:59:15 GMT"
|
||||
}
|
||||
],
|
||||
"cookie": [],
|
||||
"body": null
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Status",
|
||||
"item": [
|
||||
{
|
||||
"name": "Get",
|
||||
"request": {
|
||||
"method": "GET",
|
||||
"header": [],
|
||||
"url": {
|
||||
"raw": "{{BASE}}/status/",
|
||||
"host": [
|
||||
"{{BASE}}"
|
||||
],
|
||||
"path": [
|
||||
"status",
|
||||
""
|
||||
]
|
||||
}
|
||||
},
|
||||
"response": [
|
||||
{
|
||||
"name": "200",
|
||||
"originalRequest": {
|
||||
"method": "GET",
|
||||
"header": [],
|
||||
"url": {
|
||||
"raw": "{{BASE}}/status/",
|
||||
"host": [
|
||||
"{{BASE}}"
|
||||
],
|
||||
"path": [
|
||||
"status",
|
||||
""
|
||||
]
|
||||
}
|
||||
},
|
||||
"status": "OK",
|
||||
"code": 200,
|
||||
"_postman_previewlanguage": "json",
|
||||
"header": [
|
||||
{
|
||||
"key": "transfer-encoding",
|
||||
"value": "chunked"
|
||||
},
|
||||
{
|
||||
"key": "connection",
|
||||
"value": "close"
|
||||
},
|
||||
{
|
||||
"key": "content-encoding",
|
||||
"value": "gzip"
|
||||
},
|
||||
{
|
||||
"key": "vary",
|
||||
"value": "accept-encoding"
|
||||
},
|
||||
{
|
||||
"key": "content-type",
|
||||
"value": "application/json"
|
||||
},
|
||||
{
|
||||
"key": "date",
|
||||
"value": "Tue, 23 May 2023 05:56:45 GMT"
|
||||
}
|
||||
],
|
||||
"cookie": [],
|
||||
"body": "{\n \"version\": \"2.3.0-beta.4\",\n \"max_size\": 10485760,\n \"max_views\": 100,\n \"max_expiration\": 360,\n \"allow_advanced\": true,\n \"theme_image\": \"\",\n \"theme_text\": \"\",\n \"theme_page_title\": \"\",\n \"theme_favicon\": \"\"\n}"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"event": [
|
||||
{
|
||||
"listen": "prerequest",
|
||||
"script": {
|
||||
"type": "text/javascript",
|
||||
"exec": [
|
||||
""
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"listen": "test",
|
||||
"script": {
|
||||
"type": "text/javascript",
|
||||
"exec": [
|
||||
""
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"variable": [
|
||||
{
|
||||
"key": "BASE",
|
||||
"value": "http://localhost:1234/api",
|
||||
"type": "default"
|
||||
},
|
||||
{
|
||||
"key": "NOTE_ID",
|
||||
"value": "",
|
||||
"type": "default"
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -11,9 +11,7 @@ pub struct Note {
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone)]
|
||||
pub struct NoteInfo {
|
||||
pub meta: String,
|
||||
}
|
||||
pub struct NoteInfo {}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone)]
|
||||
pub struct NotePublic {
|
||||
|
||||
@ -24,7 +24,7 @@ async fn one(path: web::Path<NotePath>) -> impl Responder {
|
||||
let note = store::get(&p.id);
|
||||
|
||||
match note {
|
||||
Ok(Some(n)) => HttpResponse::Ok().json(NoteInfo { meta: n.meta }),
|
||||
Ok(Some(_)) => HttpResponse::Ok().json(NoteInfo {}),
|
||||
Ok(None) => HttpResponse::NotFound().finish(),
|
||||
Err(e) => HttpResponse::InternalServerError().body(e.to_string()),
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@ import { Adapters, get, info, setBase } from '@cryptgeon/shared'
|
||||
import inquirer from 'inquirer'
|
||||
import { access, constants, writeFile } from 'node:fs/promises'
|
||||
import { basename, resolve } from 'node:path'
|
||||
import { AES, Hex } from 'occulto'
|
||||
import { Hex } from 'occulto'
|
||||
import pretty from 'pretty-bytes'
|
||||
|
||||
import { exit } from './utils'
|
||||
@ -10,27 +10,12 @@ import { exit } from './utils'
|
||||
export async function download(url: URL) {
|
||||
setBase(url.origin)
|
||||
const id = url.pathname.split('/')[2]
|
||||
const preview = await info(id).catch(() => exit('Note does not exist or is expired'))
|
||||
|
||||
// Password
|
||||
let password: string
|
||||
const derivation = preview?.meta.derivation
|
||||
if (derivation) {
|
||||
const response = await inquirer.prompt([
|
||||
{
|
||||
type: 'password',
|
||||
message: 'Note password',
|
||||
name: 'password',
|
||||
},
|
||||
])
|
||||
password = response.password
|
||||
} else {
|
||||
password = url.hash.slice(1)
|
||||
}
|
||||
|
||||
const key = derivation ? (await AES.derive(password, derivation))[0] : Hex.decode(password)
|
||||
await info(id).catch(() => exit('Note does not exist or is expired'))
|
||||
const note = await get(id)
|
||||
|
||||
const password = url.hash.slice(1)
|
||||
const key = Hex.decode(password)
|
||||
|
||||
const couldNotDecrypt = () => exit('Could not decrypt note. Probably an invalid password')
|
||||
switch (note.meta.type) {
|
||||
case 'file':
|
||||
|
||||
@ -6,8 +6,7 @@ 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 { uploadFiles, uploadText } from './upload.js'
|
||||
import { exit } from './utils.js'
|
||||
|
||||
const defaultServer = process.env['CRYPTGEON_SERVER'] || 'https://cryptgeon.org'
|
||||
@ -62,12 +61,10 @@ send
|
||||
.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 })
|
||||
await uploadFiles(files, { views: options.views, expiration: options.minutes })
|
||||
})
|
||||
send
|
||||
.command('text')
|
||||
@ -75,12 +72,10 @@ send
|
||||
.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 })
|
||||
await uploadText(text, { views: options.views, expiration: options.minutes })
|
||||
})
|
||||
|
||||
program
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
export function getStdin(timeout: number = 10): Promise<string> {
|
||||
return new Promise<string>((resolve, reject) => {
|
||||
// Store the data from stdin in a buffer
|
||||
let buffer = ''
|
||||
process.stdin.on('data', (d) => (buffer += d.toString()))
|
||||
|
||||
// Stop listening for data after the timeout, otherwise hangs indefinitely
|
||||
const t = setTimeout(() => {
|
||||
process.stdin.destroy()
|
||||
resolve('')
|
||||
}, timeout)
|
||||
|
||||
// Listen for end and error events
|
||||
process.stdin.on('end', () => {
|
||||
clearTimeout(t)
|
||||
resolve(buffer.trim())
|
||||
})
|
||||
process.stdin.on('error', reject)
|
||||
})
|
||||
}
|
||||
@ -1,28 +1,29 @@
|
||||
import { readFile, stat } from 'node:fs/promises'
|
||||
import { basename } from 'node:path'
|
||||
|
||||
import { Adapters, BASE, create, FileDTO, Note, NoteMeta } from '@cryptgeon/shared'
|
||||
import { Adapters, BASE, create, FileDTO, Note } from '@cryptgeon/shared'
|
||||
import mime from 'mime'
|
||||
import { AES, Hex, TypedArray } from 'occulto'
|
||||
|
||||
import { exit } from './utils.js'
|
||||
|
||||
type UploadOptions = Pick<Note, 'views' | 'expiration'> & { password?: string }
|
||||
type UploadOptions = Pick<Note, 'views' | 'expiration'>
|
||||
|
||||
export async function upload(input: string | string[], options: UploadOptions) {
|
||||
export async function upload(key: TypedArray, note: Note) {
|
||||
try {
|
||||
const { password, ...noteOptions } = options
|
||||
const derived = options.password ? await AES.derive(options.password) : undefined
|
||||
const key = derived ? derived[0] : await AES.generateKey()
|
||||
const result = await create(note)
|
||||
const password = Hex.encode(key)
|
||||
const url = `${BASE}/note/${result.id}#${password}`
|
||||
console.log(`Note created under:\n\n${url}`)
|
||||
} catch {
|
||||
exit('Could not create note')
|
||||
}
|
||||
}
|
||||
|
||||
let contents: string
|
||||
let type: NoteMeta['type']
|
||||
if (typeof input === 'string') {
|
||||
contents = await Adapters.Text.encrypt(input, key)
|
||||
type = 'text'
|
||||
} else {
|
||||
export async function uploadFiles(paths: string[], options: UploadOptions) {
|
||||
const key = await AES.generateKey()
|
||||
const files: FileDTO[] = await Promise.all(
|
||||
input.map(async (path) => {
|
||||
paths.map(async (path) => {
|
||||
const data = new Uint8Array(await readFile(path))
|
||||
const stats = await stat(path)
|
||||
const extension = path.substring(path.indexOf('.') + 1)
|
||||
@ -35,17 +36,13 @@ export async function upload(input: string | string[], options: UploadOptions) {
|
||||
} satisfies FileDTO
|
||||
})
|
||||
)
|
||||
contents = await Adapters.Files.encrypt(files, key)
|
||||
type = 'file'
|
||||
|
||||
const contents = await Adapters.Files.encrypt(files, key)
|
||||
await upload(key, { ...options, contents, meta: { 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')
|
||||
}
|
||||
export async function uploadText(text: string, options: UploadOptions) {
|
||||
const key = await AES.generateKey()
|
||||
const contents = await Adapters.Text.encrypt(text, key)
|
||||
await upload(key, { ...options, contents, meta: { type: 'text' } })
|
||||
}
|
||||
|
||||
@ -16,8 +16,7 @@
|
||||
"decrypting": "entschlüsselt",
|
||||
"uploading": "hochladen",
|
||||
"downloading": "wird heruntergeladen",
|
||||
"qr_code": "qr-code",
|
||||
"password": "Passwort"
|
||||
"qr_code": "qr-code"
|
||||
},
|
||||
"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.",
|
||||
@ -32,10 +31,6 @@
|
||||
},
|
||||
"messages": {
|
||||
"note_created": "notiz erstellt."
|
||||
},
|
||||
"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.",
|
||||
"custom_password": "benutzerdefiniertes Passwort"
|
||||
}
|
||||
},
|
||||
"show": {
|
||||
|
||||
@ -16,8 +16,7 @@
|
||||
"decrypting": "decrypting",
|
||||
"uploading": "uploading",
|
||||
"downloading": "downloading",
|
||||
"qr_code": "qr code",
|
||||
"password": "password"
|
||||
"qr_code": "qr code"
|
||||
},
|
||||
"home": {
|
||||
"intro": "Easily send <i>fully encrypted</i>, secure notes or files with one click. Just create a note and share the link.",
|
||||
@ -32,10 +31,6 @@
|
||||
},
|
||||
"messages": {
|
||||
"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.",
|
||||
"custom_password": "custom password"
|
||||
}
|
||||
},
|
||||
"show": {
|
||||
|
||||
@ -16,8 +16,7 @@
|
||||
"decrypting": "descifrando",
|
||||
"uploading": "cargando",
|
||||
"downloading": "descargando",
|
||||
"qr_code": "código qr",
|
||||
"password": "contraseña"
|
||||
"qr_code": "código qr"
|
||||
},
|
||||
"home": {
|
||||
"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.",
|
||||
@ -32,10 +31,6 @@
|
||||
},
|
||||
"messages": {
|
||||
"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.",
|
||||
"custom_password": "contraseña personalizada"
|
||||
}
|
||||
},
|
||||
"show": {
|
||||
|
||||
@ -16,8 +16,7 @@
|
||||
"decrypting": "déchiffrer",
|
||||
"uploading": "téléchargement",
|
||||
"downloading": "téléchargement",
|
||||
"qr_code": "code qr",
|
||||
"password": "mot de passe"
|
||||
"qr_code": "code qr"
|
||||
},
|
||||
"home": {
|
||||
"intro": "Envoyez facilement des notes ou des fichiers <i>entièrement cryptés</i> et sécurisés en un seul clic. Il suffit de créer une note et de partager le lien.",
|
||||
@ -32,10 +31,6 @@
|
||||
},
|
||||
"messages": {
|
||||
"note_created": "note créée."
|
||||
},
|
||||
"advanced": {
|
||||
"explanation": "Par défaut, un mot de passe généré de manière sécurisée est utilisé pour chaque note. Vous pouvez toutefois choisir votre propre mot de passe, qui n'est pas inclus dans le lien.",
|
||||
"custom_password": "mot de passe personnalisé"
|
||||
}
|
||||
},
|
||||
"show": {
|
||||
|
||||
@ -16,8 +16,7 @@
|
||||
"decrypting": "decifrando",
|
||||
"uploading": "caricamento",
|
||||
"downloading": "scaricando",
|
||||
"qr_code": "codice qr",
|
||||
"password": "password"
|
||||
"qr_code": "codice qr"
|
||||
},
|
||||
"home": {
|
||||
"intro": "Invia facilmente note o file <i>completamente criptati</i> e sicuri con un solo clic. Basta creare una nota e condividere il link.",
|
||||
@ -32,10 +31,6 @@
|
||||
},
|
||||
"messages": {
|
||||
"note_created": "nota creata."
|
||||
},
|
||||
"advanced": {
|
||||
"explanation": "Per impostazione predefinita, per ogni nota viene utilizzata una password generata in modo sicuro. È tuttavia possibile scegliere la propria password, che non è inclusa nel link.",
|
||||
"custom_password": "password personalizzata"
|
||||
}
|
||||
},
|
||||
"show": {
|
||||
|
||||
@ -16,8 +16,7 @@
|
||||
"decrypting": "復号化",
|
||||
"uploading": "アップロード中",
|
||||
"downloading": "ダウンロード中",
|
||||
"qr_code": "QRコード",
|
||||
"password": "暗号"
|
||||
"qr_code": "QRコード"
|
||||
},
|
||||
"home": {
|
||||
"intro": "<i>完全に暗号化された</i> 、安全なメモやファイルをワンクリックで簡単に送信できます。メモを作成してリンクを共有するだけです。",
|
||||
@ -32,10 +31,6 @@
|
||||
},
|
||||
"messages": {
|
||||
"note_created": "メモが作成されました。"
|
||||
},
|
||||
"advanced": {
|
||||
"explanation": "デフォルトでは、安全に生成されたパスワードが各ノートに使用されます。しかし、リンクに含まれない独自のパスワードを選択することもできます。",
|
||||
"custom_password": "カスタムパスワード"
|
||||
}
|
||||
},
|
||||
"show": {
|
||||
|
||||
@ -16,8 +16,7 @@
|
||||
"decrypting": "расшифровка",
|
||||
"uploading": "загрузка",
|
||||
"downloading": "скачивание",
|
||||
"qr_code": "qr код",
|
||||
"password": "пароль"
|
||||
"qr_code": "qr код"
|
||||
},
|
||||
"home": {
|
||||
"intro": "Легко отправляйте <i>полностью зашифрованные</i> защищенные заметки или файлы одним щелчком мыши. Просто создайте заметку и поделитесь ссылкой.",
|
||||
@ -32,10 +31,6 @@
|
||||
},
|
||||
"messages": {
|
||||
"note_created": "заметка создана."
|
||||
},
|
||||
"advanced": {
|
||||
"explanation": "По умолчанию для каждой заметки используется безопасно сгенерированный пароль. Однако вы также можете выбрать свой собственный пароль, который не включен в ссылку.",
|
||||
"custom_password": "пользовательский пароль"
|
||||
}
|
||||
},
|
||||
"show": {
|
||||
|
||||
@ -16,8 +16,7 @@
|
||||
"decrypting": "解密",
|
||||
"uploading": "上传",
|
||||
"downloading": "下载",
|
||||
"qr_code": "二维码",
|
||||
"password": "密码"
|
||||
"qr_code": "二维码"
|
||||
},
|
||||
"home": {
|
||||
"intro": "飞鸽传书，一键传输完全加密的密信或文件，阅后即焚。",
|
||||
@ -32,10 +31,6 @@
|
||||
},
|
||||
"messages": {
|
||||
"note_created": "密信创建成功。"
|
||||
},
|
||||
"advanced": {
|
||||
"explanation": "默认情况下，每个笔记都使用安全生成的密码。但是，您也可以选择您自己的密码，该密码未包含在链接中。",
|
||||
"custom_password": "自定义密码"
|
||||
}
|
||||
},
|
||||
"show": {
|
||||
|
||||
@ -92,7 +92,7 @@ button {
|
||||
}
|
||||
|
||||
*:disabled,
|
||||
.disabled {
|
||||
*[disabled='true'] {
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
@ -126,13 +126,3 @@ fieldset {
|
||||
.tr {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
hr {
|
||||
border: none;
|
||||
border-bottom: 2px solid var(--ui-bg-1);
|
||||
margin: 1rem 0;
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
@ -8,14 +8,9 @@
|
||||
|
||||
export let note: Note
|
||||
export let timeExpiration = false
|
||||
|
||||
let customPassword = false
|
||||
|
||||
$: if (!customPassword) note.password = undefined
|
||||
</script>
|
||||
|
||||
<div class="flex col">
|
||||
<div class="flex">
|
||||
<div class="fields">
|
||||
<TextInput
|
||||
data-testid="field-views"
|
||||
type="number"
|
||||
@ -28,12 +23,14 @@
|
||||
($status && v <= $status?.max_views && v > 0) ||
|
||||
$t('home.errors.max', { values: { n: $status?.max_views ?? 0 } })}
|
||||
/>
|
||||
<div class="middle-switch">
|
||||
<Switch
|
||||
data-testid="switch-advanced-toggle"
|
||||
label={$t('common.mode')}
|
||||
bind:value={timeExpiration}
|
||||
color={false}
|
||||
/>
|
||||
</div>
|
||||
<TextInput
|
||||
data-testid="field-expiration"
|
||||
type="number"
|
||||
@ -46,31 +43,13 @@
|
||||
$t('home.errors.max', { values: { n: $status?.max_expiration ?? 0 } })}
|
||||
/>
|
||||
</div>
|
||||
<div class="flex">
|
||||
<Switch bind:value={customPassword} label={$t('home.advanced.custom_password')} />
|
||||
<TextInput
|
||||
type="password"
|
||||
bind:value={note.password}
|
||||
label={$t('common.password')}
|
||||
disabled={!customPassword}
|
||||
random
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
{$t('home.advanced.explanation')}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.flex {
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
gap: 1rem;
|
||||
width: 100%;
|
||||
.middle-switch {
|
||||
margin: 0 1rem;
|
||||
}
|
||||
|
||||
.col {
|
||||
gap: 1.5rem;
|
||||
flex-direction: column;
|
||||
.fields {
|
||||
display: flex;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<script lang="ts" context="module">
|
||||
export type NoteResult = {
|
||||
password: string
|
||||
id: string
|
||||
password?: string
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -14,8 +14,7 @@
|
||||
|
||||
export let result: NoteResult
|
||||
|
||||
let url = `${window.location.origin}/note/${result.id}`
|
||||
if (result.password) url += `#${result.password}`
|
||||
$: url = `${window.location.origin}/note/${result.id}#${result.password}`
|
||||
|
||||
function reset() {
|
||||
window.location.reload()
|
||||
|
||||
@ -4,35 +4,43 @@
|
||||
export let color = true
|
||||
</script>
|
||||
|
||||
<label {...$$restProps}>
|
||||
<div {...$$restProps}>
|
||||
<label class="switch">
|
||||
<small>{label}</small>
|
||||
<input type="checkbox" bind:checked={value} />
|
||||
<span class:color class="slider" />
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
label {
|
||||
div {
|
||||
height: 3.75rem;
|
||||
}
|
||||
|
||||
.switch {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
width: 4rem;
|
||||
height: 2.5rem;
|
||||
}
|
||||
|
||||
label input {
|
||||
display: none;
|
||||
}
|
||||
|
||||
small {
|
||||
display: block;
|
||||
width: max-content;
|
||||
.switch input {
|
||||
opacity: 0;
|
||||
width: 0;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
.slider {
|
||||
display: block;
|
||||
width: 4rem;
|
||||
height: 2.5rem;
|
||||
position: relative;
|
||||
position: absolute;
|
||||
cursor: pointer;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
border: 2px solid var(--ui-bg-1);
|
||||
background-color: var(--ui-bg-0);
|
||||
transition: var(--ui-anim);
|
||||
transform: translateY(1.2rem);
|
||||
}
|
||||
|
||||
.slider:before {
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
</script>
|
||||
|
||||
<label>
|
||||
<small class:disabled={$$restProps.disabled}>
|
||||
<small disabled={$$restProps.disabled}>
|
||||
{label}
|
||||
{#if valid !== true}
|
||||
<span class="error-text">{valid}</span>
|
||||
@ -54,7 +54,6 @@
|
||||
label {
|
||||
position: relative;
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
label > small {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { AES, Hex, Bytes } from 'occulto'
|
||||
import { AES, Hex } from 'occulto'
|
||||
import { t } from 'svelte-intl-precompile'
|
||||
import { blur } from 'svelte/transition'
|
||||
|
||||
@ -57,14 +57,13 @@
|
||||
try {
|
||||
loading = $t('common.encrypting')
|
||||
|
||||
const derived = note.password && (await AES.derive(note.password))
|
||||
const key = derived ? derived[0] : await AES.generateKey()
|
||||
const key = await AES.generateKey()
|
||||
const password = Hex.encode(key)
|
||||
|
||||
const data: Note = {
|
||||
contents: '',
|
||||
meta: note.meta,
|
||||
}
|
||||
if (derived) data.meta.derivation = derived[1]
|
||||
if (isFile) {
|
||||
if (files.length === 0) throw new EmptyContentError()
|
||||
data.contents = await Adapters.Files.encrypt(files, key)
|
||||
@ -78,8 +77,8 @@
|
||||
loading = $t('common.uploading')
|
||||
const response = await create(data)
|
||||
result = {
|
||||
password: password,
|
||||
id: response.id,
|
||||
password: note.password ? undefined : Hex.encode(key),
|
||||
}
|
||||
notify.success($t('home.messages.note_created'))
|
||||
} catch (e) {
|
||||
@ -149,7 +148,7 @@
|
||||
|
||||
{#if advanced}
|
||||
<div transition:blur={{ duration: 250 }}>
|
||||
<hr />
|
||||
<br />
|
||||
<AdvancedParameters bind:note bind:timeExpiration />
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
@ -23,7 +23,6 @@
|
||||
right: 0;
|
||||
width: 100%;
|
||||
background-color: var(--ui-bg-0-85);
|
||||
backdrop-filter: blur(2px);
|
||||
}
|
||||
|
||||
a {
|
||||
|
||||
@ -1,35 +1,30 @@
|
||||
<script lang="ts">
|
||||
import { AES, Hex } from 'occulto'
|
||||
import { Hex } from 'occulto'
|
||||
import { onMount } from 'svelte'
|
||||
import { t } from 'svelte-intl-precompile'
|
||||
|
||||
import Button from '$lib/ui/Button.svelte'
|
||||
import Loader from '$lib/ui/Loader.svelte'
|
||||
import ShowNote, { type DecryptedNote } from '$lib/ui/ShowNote.svelte'
|
||||
import TextInput from '$lib/ui/TextInput.svelte'
|
||||
import { Adapters, get, info, type NoteMeta } from '@cryptgeon/shared'
|
||||
import { Adapters, get, info } from '@cryptgeon/shared'
|
||||
import type { PageData } from './$types'
|
||||
|
||||
export let data: PageData
|
||||
|
||||
let id = data.id
|
||||
let password: string | null = null
|
||||
let password: string
|
||||
let note: DecryptedNote | null = null
|
||||
let exists = false
|
||||
let meta: NoteMeta | null = null
|
||||
|
||||
let loading: string | null = null
|
||||
let error: string | null = null
|
||||
|
||||
$: valid = !!password?.length
|
||||
|
||||
onMount(async () => {
|
||||
// Check if note exists
|
||||
try {
|
||||
loading = $t('common.loading')
|
||||
password = window.location.hash.slice(1)
|
||||
const note = await info(id)
|
||||
meta = note.meta
|
||||
await info(id)
|
||||
exists = true
|
||||
} catch {
|
||||
exists = false
|
||||
@ -43,18 +38,11 @@
|
||||
*/
|
||||
async function show() {
|
||||
try {
|
||||
if (!valid) {
|
||||
error = $t('show.errors.no_password')
|
||||
return
|
||||
}
|
||||
|
||||
// Load note
|
||||
error = null
|
||||
loading = $t('common.downloading')
|
||||
const data = await get(id)
|
||||
loading = $t('common.decrypting')
|
||||
const derived = meta?.derivation && (await AES.derive(password!, meta.derivation))
|
||||
const key = derived ? derived[0] : Hex.decode(password!)
|
||||
const key = Hex.decode(password)
|
||||
switch (data.meta.type) {
|
||||
case 'text':
|
||||
note = {
|
||||
@ -89,18 +77,9 @@
|
||||
<form on:submit|preventDefault={show}>
|
||||
<fieldset>
|
||||
<p>{$t('show.explanation')}</p>
|
||||
{#if meta?.derivation}
|
||||
<TextInput
|
||||
data-testid="show-note-password"
|
||||
type="password"
|
||||
bind:value={password}
|
||||
label={$t('common.password')}
|
||||
/>
|
||||
{/if}
|
||||
<Button disabled={!valid} data-testid="show-note-button" type="submit"
|
||||
>{$t('show.show_note')}</Button
|
||||
>
|
||||
<Button data-testid="show-note-button" type="submit">{$t('show.show_note')}</Button>
|
||||
{#if error}
|
||||
<br />
|
||||
<p class="error-text">
|
||||
{error}
|
||||
<br />
|
||||
@ -118,10 +97,4 @@
|
||||
.loader {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
fieldset {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 1rem;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -10,7 +10,7 @@ proxy.on('error', function (err, req, res) {
|
||||
|
||||
const server = http.createServer(function (req, res) {
|
||||
const target = req.url.startsWith('/api/') ? 'http://127.0.0.1:8000' : 'http://localhost:8001'
|
||||
proxy.web(req, res, { target, proxyTimeout: 250, timeout: 250 })
|
||||
proxy.web(req, res, { target })
|
||||
})
|
||||
server.listen(1234)
|
||||
console.log('Proxy on http://localhost:1234')
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
import type { KeyData, TypedArray } from 'occulto'
|
||||
import type { TypedArray } from 'occulto'
|
||||
|
||||
export type NoteMeta = {
|
||||
type: 'text' | 'file'
|
||||
derivation?: KeyData
|
||||
}
|
||||
export type NoteMeta = { type: 'text' | 'file' }
|
||||
|
||||
export type Note = {
|
||||
contents: string
|
||||
@ -11,7 +8,7 @@ export type Note = {
|
||||
views?: number
|
||||
expiration?: number
|
||||
}
|
||||
export type NoteInfo = Pick<Note, 'meta'>
|
||||
export type NoteInfo = {}
|
||||
export type NotePublic = Pick<Note, 'contents' | 'meta'>
|
||||
export type NoteCreate = Omit<Note, 'meta'> & { meta: string }
|
||||
|
||||
@ -74,12 +71,10 @@ export async function get(id: string): Promise<NotePublic> {
|
||||
method: 'delete',
|
||||
})
|
||||
const { contents, meta } = data
|
||||
const note = {
|
||||
return {
|
||||
contents,
|
||||
meta: JSON.parse(meta),
|
||||
} satisfies NotePublic
|
||||
if (note.meta.derivation) note.meta.derivation.salt = new Uint8Array(Object.values(note.meta.derivation.salt))
|
||||
return note
|
||||
meta: JSON.parse(meta) as NoteMeta,
|
||||
}
|
||||
}
|
||||
|
||||
export async function info(id: string): Promise<NoteInfo> {
|
||||
@ -87,12 +82,7 @@ export async function info(id: string): Promise<NoteInfo> {
|
||||
url: `notes/${id}`,
|
||||
method: 'get',
|
||||
})
|
||||
const { meta } = data
|
||||
const note = {
|
||||
meta: JSON.parse(meta),
|
||||
} satisfies NoteInfo
|
||||
if (note.meta.derivation) note.meta.derivation.salt = new Uint8Array(Object.values(note.meta.derivation.salt))
|
||||
return note
|
||||
return data
|
||||
}
|
||||
|
||||
export type Status = {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user