From ea66f1f19a124c2051a2174d61c379c193981b7b Mon Sep 17 00:00:00 2001 From: Val Packett Date: Wed, 28 Jun 2023 11:17:24 -0300 Subject: [PATCH] Update argon2ian to 2.0.0 --- deno.json | 5 +++++ deno.lock | 33 +++++++++++++++++++++++++++------ hash-admin-password.ts | 2 +- plugins/tiddlypwa/argon2ian.js | 26 +++++++++++++------------- tiddlypwa-server.ts | 2 +- 5 files changed, 47 insertions(+), 21 deletions(-) diff --git a/deno.json b/deno.json index 9788ed7..cebfa3f 100644 --- a/deno.json +++ b/deno.json @@ -6,5 +6,10 @@ "singleQuote": true, "proseWrap": "preserve" } + }, + "imports": { + "https://deno.land/std@0.159.0/": "https://deno.land/std@0.192.0/", + "https://deno.land/std@0.170.0/": "https://deno.land/std@0.192.0/", + "https://deno.land/std@0.186.0/": "https://deno.land/std@0.192.0/" } } diff --git a/deno.lock b/deno.lock index b8c13f7..eec1e99 100644 --- a/deno.lock +++ b/deno.lock @@ -1,10 +1,8 @@ { "version": "2", "remote": { - "https://deno.land/std@0.159.0/encoding/ascii85.ts": "f2b9cb8da1a55b3f120d3de2e78ac993183a4fd00dfa9cb03b51cf3a75bc0baa", - "https://deno.land/std@0.186.0/_util/asserts.ts": "178dfc49a464aee693a7e285567b3d0b555dc805ff490505a8aae34f9cfb1462", - "https://deno.land/std@0.186.0/crypto/timing_safe_equal.ts": "0fae34ee02264f309ae0b6e54e9746a7aba3996e5454903ed106967a7a9ef665", "https://deno.land/std@0.192.0/_util/asserts.ts": "178dfc49a464aee693a7e285567b3d0b555dc805ff490505a8aae34f9cfb1462", + "https://deno.land/std@0.192.0/_util/os.ts": "d932f56d41e4f6a6093d56044e29ce637f8dcc43c5a90af43504a889cf1775e3", "https://deno.land/std@0.192.0/async/abortable.ts": "fd682fa46f3b7b16b4606a5ab52a7ce309434b76f820d3221bdfb862719a15d7", "https://deno.land/std@0.192.0/async/deadline.ts": "58f72a3cc0fcb731b2cc055ba046f4b5be3349ff6bf98f2e793c3b969354aab2", "https://deno.land/std@0.192.0/async/debounce.ts": "adab11d04ca38d699444ac8a9d9856b4155e8dda2afd07ce78276c01ea5a4332", @@ -17,16 +15,39 @@ "https://deno.land/std@0.192.0/async/tee.ts": "47e42d35f622650b02234d43803d0383a89eb4387e1b83b5a40106d18ae36757", "https://deno.land/std@0.192.0/collections/filter_values.ts": "5b9feaf17b9a6e5ffccdd36cf6f38fa4ffa94cff2602d381c2ad0c2a97929652", "https://deno.land/std@0.192.0/collections/without_all.ts": "a89f5da0b5830defed4f59666e188df411d8fece35a5f6ca69be6ca71a95c185", + "https://deno.land/std@0.192.0/crypto/timing_safe_equal.ts": "0fae34ee02264f309ae0b6e54e9746a7aba3996e5454903ed106967a7a9ef665", "https://deno.land/std@0.192.0/dotenv/mod.ts": "f5a8123741d1561ae8184a7f043bc097b15132c5171c651142b804b6dbc21853", + "https://deno.land/std@0.192.0/encoding/ascii85.ts": "b87bc896283cc76adcb2d14b6c867c4951fddea8c5d27010f8c0e6f1617bb0d7", "https://deno.land/std@0.192.0/encoding/base64.ts": "144ae6234c1fbe5b68666c711dc15b1e9ee2aef6d42b3b4345bf9a6c91d70d0d", "https://deno.land/std@0.192.0/encoding/base64url.ts": "2ed4ba122b20fedf226c5d337cf22ee2024fa73a8f85d915d442af7e9ce1fae1", "https://deno.land/std@0.192.0/flags/mod.ts": "17f444ddbee43c5487568de0c6a076c7729cfe90d96d2ffcd2b8f8adadafb6e8", + "https://deno.land/std@0.192.0/fmt/colors.ts": "d67e3cd9f472535241a8e410d33423980bec45047e343577554d3356e1f0ef4e", "https://deno.land/std@0.192.0/http/server.ts": "1b23463b5b36e4eebc495417f6af47a6f7d52e3294827a1226d2a1aab23d9d20", - "https://deno.land/x/argon2ian@1.0.5/src/async.ts": "58193573c0396986272295882936d08e7545bb25116008af0a7346536507b7f3", - "https://deno.land/x/argon2ian@1.0.5/src/gen/worker.blob.js": "882885611ad3e2cc56fdabfd4145ff294a1b9071bfd91452e8e5b0dc6a93dc64", - "https://deno.land/x/argon2ian@1.0.5/src/types.ts": "961dec0306a725b7c7f2587a87bd1694fc6ef9382ce0a17766a0352a773fe7d1", + "https://deno.land/std@0.192.0/path/_constants.ts": "e49961f6f4f48039c0dfed3c3f93e963ca3d92791c9d478ac5b43183413136e0", + "https://deno.land/std@0.192.0/path/_interface.ts": "6471159dfbbc357e03882c2266d21ef9afdb1e4aa771b0545e90db58a0ba314b", + "https://deno.land/std@0.192.0/path/_util.ts": "d7abb1e0dea065f427b89156e28cdeb32b045870acdf865833ba808a73b576d0", + "https://deno.land/std@0.192.0/path/common.ts": "ee7505ab01fd22de3963b64e46cff31f40de34f9f8de1fff6a1bd2fe79380000", + "https://deno.land/std@0.192.0/path/glob.ts": "d479e0a695621c94d3fd7fe7abd4f9499caf32a8de13f25073451c6ef420a4e1", + "https://deno.land/std@0.192.0/path/mod.ts": "f065032a7189404fdac3ad1a1551a9ac84751d2f25c431e101787846c86c79ef", + "https://deno.land/std@0.192.0/path/posix.ts": "8b7c67ac338714b30c816079303d0285dd24af6b284f7ad63da5b27372a2c94d", + "https://deno.land/std@0.192.0/path/separator.ts": "0fb679739d0d1d7bf45b68dacfb4ec7563597a902edbaf3c59b50d5bcadd93b1", + "https://deno.land/std@0.192.0/path/win32.ts": "d186344e5583bcbf8b18af416d13d82b35a317116e6460a5a3953508c3de5bba", + "https://deno.land/x/argon2ian@2.0.0/src/argon2.ts": "24b9529ac21b7e1fee0be7c5cce513bb2955735ed6e23313b05c107254fb7c22", + "https://deno.land/x/argon2ian@2.0.0/src/gen/argon2.blob.js": "b0ff951c481b60bb30afbf812a9393608e1e15698505593f58eb7842a76c5cd8", + "https://deno.land/x/argon2ian@2.0.0/src/types.ts": "981cbb3d39809f6e9dc81116be5b3aeb7ad40389d91e54bf3501c6bef00f7494", "https://deno.land/x/brotli@0.1.7/mod.ts": "08b913e51488b6e7fa181f2814b9ad087fdb5520041db0368f8156bfa45fd73e", "https://deno.land/x/brotli@0.1.7/wasm.js": "77771b89e89ec7ff6e3e0939a7fb4f9b166abec3504cec0532ad5c127d6f35d2", + "https://deno.land/x/cliffy@v0.25.7/ansi/ansi_escapes.ts": "885f61f343223f27b8ec69cc138a54bea30542924eacd0f290cd84edcf691387", + "https://deno.land/x/cliffy@v0.25.7/ansi/cursor_position.ts": "d537491e31d9c254b208277448eff92ff7f55978c4928dea363df92c0df0813f", + "https://deno.land/x/cliffy@v0.25.7/ansi/deps.ts": "0f35cb7e91868ce81561f6a77426ea8bc55dc15e13f84c7352f211023af79053", + "https://deno.land/x/cliffy@v0.25.7/ansi/tty.ts": "8fb064c17ead6cdf00c2d3bc87a9fd17b1167f2daa575c42b516f38bdb604673", + "https://deno.land/x/cliffy@v0.25.7/keycode/key_code.ts": "c4ab0ffd102c2534962b765ded6d8d254631821bf568143d9352c1cdcf7a24be", + "https://deno.land/x/cliffy@v0.25.7/keycode/key_codes.ts": "917f0a2da0dbace08cf29bcfdaaa2257da9fe7e705fff8867d86ed69dfb08cfe", + "https://deno.land/x/cliffy@v0.25.7/prompt/_generic_input.ts": "737cff2de02c8ce35250f5dd79c67b5fc176423191a2abd1f471a90dd725659e", + "https://deno.land/x/cliffy@v0.25.7/prompt/_generic_prompt.ts": "8630ce89a66d83e695922df41721cada52900b515385d86def597dea35971bb2", + "https://deno.land/x/cliffy@v0.25.7/prompt/deps.ts": "4c38ab18e55a792c9a136c1c29b2b6e21ea4820c45de7ef4cf517ce94012c57d", + "https://deno.land/x/cliffy@v0.25.7/prompt/figures.ts": "26af0fbfe21497220e4b887bb550fab997498cde14703b98e78faf370fbb4b94", + "https://deno.land/x/cliffy@v0.25.7/prompt/secret.ts": "58745f5231fb2c44294c4acf2511f8c5bfddfa1e12f259580ff90dedea2703d6", "https://deno.land/x/kv_toolbox@0.0.2/blob.ts": "3458bd57ad5a1861292d9ef6f43eaec399aecc9de361f1acb5bd21c53d41a824", "https://deno.land/x/kv_toolbox@0.0.2/keys.ts": "161bb4cfe9b7625a7b55d5f7e545ace34add39e58d2a0e5e67750f185789f3ac", "https://deno.land/x/lz4@v0.1.2/mod.ts": "4decfc1a3569d03fd1813bd39128b71c8f082850fe98ecfdde20025772916582", diff --git a/hash-admin-password.ts b/hash-admin-password.ts index c946d41..100e622 100644 --- a/hash-admin-password.ts +++ b/hash-admin-password.ts @@ -1,6 +1,6 @@ /// import { Secret } from 'https://deno.land/x/cliffy@v0.25.7/prompt/secret.ts'; -import { hash } from 'https://deno.land/x/argon2ian@1.0.5/src/argon2.ts'; +import { hash } from 'https://deno.land/x/argon2ian@2.0.0/src/argon2.ts'; import { encode } from 'https://deno.land/std@0.192.0/encoding/base64url.ts'; const password = await Secret.prompt('New admin password'); diff --git a/plugins/tiddlypwa/argon2ian.js b/plugins/tiddlypwa/argon2ian.js index 0460952..4dae97b 100644 --- a/plugins/tiddlypwa/argon2ian.js +++ b/plugins/tiddlypwa/argon2ian.js @@ -14,33 +14,33 @@ Formatted with `deno fmt`. class n { #e = 0; - #s = new Map(); - #n = new Worker( + #t = new Map(); + #s = new Worker( URL.createObjectURL( new Blob([ - 'const e=2,n=19,s=await WebAssembly.compileStreaming(new Response((await fetch("data:w/e;base64,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")).body?.pipeThrough(new DecompressionStream("gzip")),{headers:{"content-type":"application/wasm"}}));function t(e){return{malloc:n=>[e.malloc(n),n],buf:([n,s])=>new Uint8Array(e.memory.buffer,n,s)}}function l(l,c,a){const r=new WebAssembly.Instance(s,{}),{malloc:o,buf:m}=t(r.exports),y=o(l.length);m(y).set(l);const f=o(c.length);m(f).set(c);const u=a?.secret?o(a.secret.length):[0,0];a?.secret&&m(u).set(a.secret);const w=a?.ad?o(a.ad.length):[0,0];a?.ad&&m(w).set(a.ad);const Z=o(a?.length??32),W=r.exports.argon2_hash_wasm(a?.t??3,a?.m??65536,1,y[0],y[1],f[0],f[1],u[0],u[1],w[0],w[1],Z[0],Z[1],a?.variant??e,a?.version??n);if(0!=W)throw Error(W);const k=new ArrayBuffer(Z[1]),p=new Uint8Array(k);return p.set(m(Z)),p}function c(l,c,a,r){const o=new WebAssembly.Instance(s,{}),{malloc:m,buf:y}=t(o.exports),f=m(l.length);y(f).set(l);const u=m(c.length);y(u).set(c);const w=m(a.length);y(w).set(a);const Z=r?.secret?m(r.secret.length):[0,0];r?.secret&&y(Z).set(r.secret);const W=r?.ad?m(r.ad.length):[0,0];r?.ad&&y(W).set(r.ad);const k=o.exports.argon2_verify_wasm(r?.t??3,r?.m??65536,1,w[0],w[1],f[0],f[1],u[0],u[1],Z[0],Z[1],W[0],W[1],r?.variant??e,r?.version??n);if(0!==k&&-35!==k)throw Error(k);return 0===k}self.onmessage=function(e){const[n,s,...t]=e.data;try{self.postMessage([n,!0,(s?c:l).apply(null,t)])}catch(e){self.postMessage([n,!1,e])}};', + 'const e={Argon2d:0,Argon2i:1,Argon2id:2},t=await WebAssembly.compileStreaming(new Response((await fetch("data:w/e;base64,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")).body?.pipeThrough(new DecompressionStream("gzip")),{headers:{"content-type":"application/wasm"}}));function s(t,s,n,o){const{malloc:r,buf:a}=(p=t.exports,{malloc:e=>[p.m(e),e],buf:([e,t])=>new Uint8Array(p.memory.buffer,e,t)});var p;const u=r(s.length);a(u).set(s);const l=r(n.length);a(l).set(n);const m=o?.secret?r(o.secret.length):[0,0];o?.secret&&a(m).set(o.secret);const g=o?.ad?r(o.ad.length):[0,0];o?.ad&&a(g).set(o.ad);const f=r(o?.length??32),w=o?.m??65536,c=o?.p??1,y=o?.t??3;if(c<1)throw Error("p");if(y<1)throw Error("t");if(w<8*c*1024||w%1024!=0)throw Error("m");const h=r(1024*w);return t.exports.a(f[0],f[1],h[0],o?.variant??e.Argon2id,w,y,c,u[0],l[0],u[1],l[1],m[0],g[0],m[1],g[1]),t.exports.w(u[0],u[1]),{malloc:r,buf:a,result:f}}function n(e,n,o){const r=new WebAssembly.Instance(t,{}),{buf:a,result:p}=s(r,e,n,o);return function(e,t){const s=new ArrayBuffer(t[1]),n=new Uint8Array(s);return n.set(e(t)),n}(a,p)}function o(e,n,o,r){const a=new WebAssembly.Instance(t,{}),{malloc:p,buf:u,result:l}=s(a,e,n,r);if(l[1]!==o.length)throw Error("lenm");const m=p(o.length);if(u(m).set(o),32===o.length)return 0===a.exports.t(l[0],m[0]);if(64===o.length)return 0===a.exports.s(l[0],m[0]);throw Error("lenu")}self.onmessage=function(e){const[t,s,...r]=e.data;try{self.postMessage([t,!0,(s?o:n).apply(null,r)])}catch(e){self.postMessage([t,!1,e])}};', ], { type: 'application/javascript' }), ), { type: 'module' }, ); constructor() { - this.#n.onmessage = (e) => { - const [s, n, t] = e.data, [r, a] = this.#s.get(s); - this.#s.delete(s), (n ? r : a)(t); + this.#s.onmessage = (e) => { + const [t, s, o] = e.data, [r, n] = this.#t.get(t); + this.#t.delete(t), (s ? r : n)(o); }; } - hash(e, s, n) { - return new Promise((t, r) => { - this.#s.set(this.#e, [t, r]), this.#n.postMessage([this.#e, !1, e, s, n]), this.#e++; + hash(e, t, s) { + return new Promise((o, r) => { + this.#t.set(this.#e, [o, r]), this.#s.postMessage([this.#e, !1, e, t, s]), this.#e++; }); } - verify(e, s, n, t) { - return new Promise((r, a) => { - this.#s.set(this.#e, [r, a]), this.#n.postMessage([this.#e, !0, e, s, n, t]), this.#e++; + verify(e, t, s, o) { + return new Promise((r, n) => { + this.#t.set(this.#e, [r, n]), this.#s.postMessage([this.#e, !0, e, t, s, o]), this.#e++; }); } terminate() { - this.#n.terminate(); + this.#s.terminate(); } } diff --git a/tiddlypwa-server.ts b/tiddlypwa-server.ts index 6046563..43c57bf 100644 --- a/tiddlypwa-server.ts +++ b/tiddlypwa-server.ts @@ -5,7 +5,7 @@ import * as base64nourl from 'https://deno.land/std@0.192.0/encoding/base64.ts'; import * as dotenv from 'https://deno.land/std@0.192.0/dotenv/mod.ts'; import { parse as argparse } from 'https://deno.land/std@0.192.0/flags/mod.ts'; import { serveListener } from 'https://deno.land/std@0.192.0/http/server.ts'; -import * as argon from 'https://deno.land/x/argon2ian@1.0.5/src/argon2.ts'; +import * as argon from 'https://deno.land/x/argon2ian@2.0.0/src/argon2.ts'; import * as brotli from 'https://deno.land/x/brotli@0.1.7/mod.ts'; import * as blob from 'https://deno.land/x/kv_toolbox@0.0.2/blob.ts';