pleb/flockstr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

buffer issue fixed

Browse Source
This commit is contained in:
zmeyer44 2023-10-18 14:56:28 -04:00
parent 50329b9e4e
commit 66a6a983ed
6 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/(app)/(profile)/[npub]/page.tsx
View File

@ -115,7 +115,7 @@ export default function ProfilePage({
</div> </div>
</div> </div>
<div className="mx-auto max-w-[800px] space-y-6"> <div className="mx-auto max-w-[800px] space-y-6">
<div className="flex max-w-2xl flex-col gap-5 px-5"> <div className="flex max-w-2xl flex-col gap-4 px-4">
{demo.map((e) => ( {demo.map((e) => (
<SubscriptionCard key={e.id} {...e} /> <SubscriptionCard key={e.id} {...e} />
))} ))}

2
app/(app)/list/[naddr]/_components/Header.tsx
View File

@ -148,7 +148,7 @@ export default function Header({ event }: { event: NDKEvent }) {
<ProfileInfo pubkey={pubkey} /> <ProfileInfo pubkey={pubkey} />
</div> </div>
</div> </div>
<div className="flex items-center gap-3"> <div className="flex flex-wrap items-center gap-3">
{!!currentUser && currentUser.pubkey === pubkey && ( {!!currentUser && currentUser.pubkey === pubkey && (
<> <>
<Button onClick={() => modal?.show(<CreateEventModal />)}> <Button onClick={() => modal?.show(<CreateEventModal />)}>

BIN
bun.lockb
View File

Binary file not shown.

4
components/KindCard/3745.tsx
View File

@ -35,10 +35,12 @@ export default function Kind3745(props: Event) {
["#e"]: [id], ["#e"]: [id],
}); });
if (directMessageEvent) { if (directMessageEvent) {
console.log("Found DM", directMessageEvent);
await directMessageEvent.decrypt( await directMessageEvent.decrypt(
new NDKUser({ hexpubkey: pubkey }), new NDKUser({ hexpubkey: pubkey }),
ndk?.signer, ndk!.signer,
); );
console.log("Decryped DM", directMessageEvent);
const passphrase = directMessageEvent.content; const passphrase = directMessageEvent.content;
if (!passphrase) { if (!passphrase) {
setError("Unable to parse event"); setError("Unable to parse event");

13
lib/nostr/index.ts
View File

@ -5,6 +5,7 @@ import { getTagValues } from "./utils";
import { sha256 as SHA256 } from "@noble/hashes/sha256"; import { sha256 as SHA256 } from "@noble/hashes/sha256";
import { bytesToHex } from "@noble/hashes/utils"; import { bytesToHex } from "@noble/hashes/utils";
import crypto from "crypto"; import crypto from "crypto";
import { Buffer } from "buffer";
export enum Kind { export enum Kind {
Metadata = 0, Metadata = 0,
@ -118,8 +119,8 @@ export function encryptMessage(message: string, password: string) {
} }
} }
// Function to decrypt a hashed message using a passphrase // Function to decrypt a hashed message using a passphrase
// Function to decrypt a hashed message using a passphrase
export function decryptMessage(encryptedMessage: string, password: string) { export function decryptMessage(encryptedMessage: string, password: string) {
console.log("Attemping decrypto", encryptedMessage, "with", password);
try { try {
const buffer = create32ByteBuffer(password); const buffer = create32ByteBuffer(password);
// Extract IV from the received message // Extract IV from the received message
@ -127,19 +128,11 @@ export function decryptMessage(encryptedMessage: string, password: string) {
if (!ivBase64) { if (!ivBase64) {
return; return;
} }
const iv = Buffer.from(ivBase64, "base64"); const iv = Buffer.from(ivBase64, "base64");
const encryptedText = Buffer.from(encryptedMessage, "base64"); const encryptedText = Buffer.from(encryptedMessage, "base64");
console.log("at bugger");
const decipher = crypto.createDecipheriv("aes-256-cbc", buffer, iv); const decipher = crypto.createDecipheriv("aes-256-cbc", buffer, iv);
console.log("at decipher");
const decrypted = decipher.update(encryptedText); const decrypted = decipher.update(encryptedText);
return Buffer.concat([decrypted, decipher.final()]).toString();
const toReturn = Buffer.concat([decrypted, decipher.final()]).toString();
console.log("toReturn", toReturn);
return toReturn;
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }

1
package.json
View File

@ -30,6 +30,7 @@
"@radix-ui/react-tooltip": "^1.0.7", "@radix-ui/react-tooltip": "^1.0.7",
"@tailwindcss/container-queries": "^0.1.1", "@tailwindcss/container-queries": "^0.1.1",
"aws-sdk": "^2.1475.0", "aws-sdk": "^2.1475.0",
"buffer": "^6.0.3",
"class-variance-authority": "^0.7.0", "class-variance-authority": "^0.7.0",
"clsx": "^2.0.0", "clsx": "^2.0.0",
"cmdk": "^0.2.0", "cmdk": "^0.2.0",