mirror of
https://github.com/cupcakearmy/cryptgeon.git
synced 2025-09-04 08:30:39 +00:00
Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
edbf8a8ecf | |||
4852804581 | |||
22b1c35b3e | |||
d1e9ffd89b | |||
9c675ba48c | |||
ef3d3d5bde |
17
CHANGELOG.md
17
CHANGELOG.md
@@ -5,7 +5,22 @@ 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).
|
||||||
|
|
||||||
## [1.0.9] - 2021-05-08
|
## [1.0.11] - 2021-05-08
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- loading text
|
||||||
|
- description for created notes about availability
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- iterations from 100 to 100k
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- time based view bug
|
||||||
|
|
||||||
|
## [1.0.10] - 2021-05-08
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
@@ -36,7 +36,7 @@ export function getKeyFromString(password: string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function getDerivedForKey(key: CryptoKey, salt: ArrayBuffer) {
|
export async function getDerivedForKey(key: CryptoKey, salt: ArrayBuffer) {
|
||||||
const iterations = 1_000
|
const iterations = 100_000
|
||||||
return window.crypto.subtle.deriveKey(
|
return window.crypto.subtle.deriveKey(
|
||||||
{
|
{
|
||||||
name: 'PBKDF2',
|
name: 'PBKDF2',
|
||||||
|
@@ -66,11 +66,21 @@
|
|||||||
<TextInput
|
<TextInput
|
||||||
type="text"
|
type="text"
|
||||||
readonly
|
readonly
|
||||||
|
label="share link"
|
||||||
value="{window.location.origin}/note/{result.id}/{result.password}"
|
value="{window.location.origin}/note/{result.id}/{result.password}"
|
||||||
copy
|
copy
|
||||||
/>
|
/>
|
||||||
<br />
|
<br />
|
||||||
<Button on:click={reset}>new</Button>
|
<p>
|
||||||
|
<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.)
|
||||||
|
</p>
|
||||||
|
<br />
|
||||||
|
<Button on:click={reset}>new note</Button>
|
||||||
{:else}
|
{:else}
|
||||||
<form on:submit|preventDefault={submit}>
|
<form on:submit|preventDefault={submit}>
|
||||||
<fieldset disabled={loading}>
|
<fieldset disabled={loading}>
|
||||||
@@ -85,7 +95,14 @@
|
|||||||
<div class="error-text">{error}</div>
|
<div class="error-text">{error}</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<p><br />{message}</p>
|
<p>
|
||||||
|
<br />
|
||||||
|
{#if loading}
|
||||||
|
loading...
|
||||||
|
{:else}
|
||||||
|
{message}
|
||||||
|
{/if}
|
||||||
|
</p>
|
||||||
|
|
||||||
<div class="advanced" class:hidden={!advanced}>
|
<div class="advanced" class:hidden={!advanced}>
|
||||||
<br />
|
<br />
|
||||||
|
@@ -7,14 +7,13 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
|
import { onMount } from 'svelte'
|
||||||
|
import copy from 'copy-to-clipboard'
|
||||||
|
|
||||||
import type { NotePublic } from '$lib/api'
|
import type { NotePublic } from '$lib/api'
|
||||||
import { info, get } from '$lib/api'
|
import { info, get } from '$lib/api'
|
||||||
import { decrypt, getKeyFromString } from '$lib/crypto'
|
import { decrypt, getKeyFromString } from '$lib/crypto'
|
||||||
import Button from '$lib/ui/Button.svelte'
|
import Button from '$lib/ui/Button.svelte'
|
||||||
import TextInput from '$lib/ui/TextInput.svelte'
|
|
||||||
import copy from 'copy-to-clipboard'
|
|
||||||
|
|
||||||
import { onMount } from 'svelte'
|
|
||||||
|
|
||||||
export let id: string
|
export let id: string
|
||||||
export let password: string
|
export let password: string
|
||||||
@@ -41,12 +40,15 @@
|
|||||||
async function show() {
|
async function show() {
|
||||||
try {
|
try {
|
||||||
error = false
|
error = false
|
||||||
|
loading = true
|
||||||
const data = note || (await get(id)) // Don't get the content twice on wrong password.
|
const data = note || (await get(id)) // Don't get the content twice on wrong password.
|
||||||
const key = await getKeyFromString(password)
|
const key = await getKeyFromString(password)
|
||||||
data.contents = await decrypt(data.contents, key)
|
data.contents = await decrypt(data.contents, key)
|
||||||
note = data
|
note = data
|
||||||
} catch {
|
} catch {
|
||||||
error = true
|
error = true
|
||||||
|
} finally {
|
||||||
|
loading = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@@ -63,18 +65,23 @@
|
|||||||
<Button on:click={() => copy(note.contents)}>copy to clipboard</Button>
|
<Button on:click={() => copy(note.contents)}>copy to clipboard</Button>
|
||||||
{:else}
|
{:else}
|
||||||
<form on:submit|preventDefault={show}>
|
<form on:submit|preventDefault={show}>
|
||||||
<p>click below to show and delete the note if the counter has reached it's limit</p>
|
<fieldset>
|
||||||
<Button type="submit">show note</Button>
|
<p>click below to show and delete the note if the counter has reached it's limit</p>
|
||||||
{#if error}
|
<Button type="submit">show note</Button>
|
||||||
<br />
|
{#if error}
|
||||||
<p class="error-text">
|
|
||||||
wrong password. could not decipher. probably a broken link. note was destroyed.
|
|
||||||
<br />
|
<br />
|
||||||
</p>
|
<p class="error-text">
|
||||||
{/if}
|
wrong password. could not decipher. probably a broken link. note was destroyed.
|
||||||
|
<br />
|
||||||
|
</p>
|
||||||
|
{/if}
|
||||||
|
</fieldset>
|
||||||
</form>
|
</form>
|
||||||
{/if}
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
|
{#if loading}
|
||||||
|
<p>loading...</p>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.note {
|
.note {
|
||||||
|
@@ -56,7 +56,8 @@ async fn create(note: web::Json<Note>) -> impl Responder {
|
|||||||
if e > 360 {
|
if e > 360 {
|
||||||
return bad_req;
|
return bad_req;
|
||||||
}
|
}
|
||||||
n.expiration = Some(now() + (e * 60))
|
let expiration = now() + (e * 60);
|
||||||
|
n.expiration = Some(expiration);
|
||||||
}
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
@@ -89,8 +90,8 @@ async fn delete(path: web::Path<NotePath>) -> impl Responder {
|
|||||||
}
|
}
|
||||||
match changed.expiration {
|
match changed.expiration {
|
||||||
Some(e) => {
|
Some(e) => {
|
||||||
if e > now() {
|
store::del(&p.id.clone());
|
||||||
store::del(&p.id.clone());
|
if e < now() {
|
||||||
return HttpResponse::BadRequest().finish();
|
return HttpResponse::BadRequest().finish();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user