Skip to content

Commit 9ba2e22

Browse files
committed
crypto cleanup
hash prior session keys clear buffers dependency updates prep for crypto middleware completion
1 parent 27a7994 commit 9ba2e22

31 files changed

+297
-176
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,6 @@
7575
"docwriter.style": "JSDoc",
7676
"diffEditor.codeLens": true,
7777
"MutableAI.upsell": false,
78-
"todo-tree.tree.scanMode": "workspace only"
78+
"todo-tree.tree.scanMode": "workspace only",
79+
"editor.fontSize": 15
7980
}

cspell.json

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,29 @@
11
{
2-
"version": "0.2",
3-
"ignorePaths": [],
4-
"dictionaryDefinitions": [],
5-
"dictionaries": [],
6-
"words": [
7-
"cbor",
8-
"cldmv",
9-
"daisyui",
10-
"iife",
11-
"sarif",
12-
"simc",
13-
"uwrl"
14-
],
15-
"ignoreWords": [],
16-
"import": []
17-
}
2+
"version": "0.2",
3+
"language": "en-US",
4+
"files": [
5+
"**/*.{js,jsx,ts,tsx,md,yml}"
6+
],
7+
"ignorePaths": [
8+
"node_modules/**",
9+
"**/.git/**",
10+
"**/.github/**",
11+
"**/package-lock.json",
12+
"!./*"
13+
],
14+
"languageId": "javascript,json,markdown,plaintext",
15+
"useGitignore": true,
16+
"dictionaryDefinitions": [],
17+
"dictionaries": [],
18+
"words": [
19+
"cbor",
20+
"cldmv",
21+
"daisyui",
22+
"iife",
23+
"sarif",
24+
"simc",
25+
"uwrl"
26+
],
27+
"ignoreWords": [],
28+
"import": []
29+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,4 @@
135135
"testatron": "^2.1.0",
136136
"textlint": "^13.4.1"
137137
}
138-
}
138+
}

profiles/profile.cert

0 Bytes
Binary file not shown.

scripts/certificates.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ const UWCertificate = await domainCertificate({
1212
signatureAlgorithm: 1,
1313
cipherSuites: [
1414
0,
15-
1,
16-
2,
17-
3
15+
// 1,
16+
// 2,
17+
// 3
1818
],
19-
encryptionKeypairAlgorithm: 3,
19+
encryptionKeypairAlgorithm: 0,
2020
protocolOptions: {
2121
realtime: true,
2222
},

serverApp/certs/universalWeb.cert

-3.5 KB
Binary file not shown.
-1.16 KB
Binary file not shown.

serverApp/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44
import { app } from '#udsp';
55
import { currentPath } from '@universalweb/acid';
6-
import { get } from '../udsp/app/methods/get.js';
6+
import { getMethod } from '../udsp/app/methods/get.js';
77
import { info } from '#logs';
88
import { listen } from '../udsp/server/listen.js';
99
import path from 'node:path';
@@ -58,7 +58,7 @@ const uwApp = await app({
5858
if (uwApp) {
5959
uwApp.get((req, resp, client) => {
6060
info('GET REQUEST APP LEVEL');
61-
return get(req, resp, client);
61+
return getMethod(req, resp, client);
6262
});
6363
uwApp.listen();
6464
}

todo.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ Make DIS check for certificate when sending or when created - means move part of
1212
Enforce Realtime options for server side
1313
Data Streams and breaking up downloads with write a stream
1414
initialRealtimeGracePeriod
15+
1516
Add ability to either have multiple encryption keypairs or have x25519+Kyber be able to also do either or for a client so client can connect with only kyber, hybrid, or x25519
1617
Might need to add way for them to check which ciphers are compatible with its keys
1718
Means you need to create a hybrid full ciphersuite for that to happen then it can support both
1819
Make sure that client cant choose incompatible cipher based on encryption keypair?
1920
Modify certs so that encryption keypair algorithm is specified so that hybrid options can exist?
2021
this allows clients to auto choose the best ciphersuite according to the encryption algorithm used
2122
Make encryption keypair hybrid of both to support kyber half, x25519, kyber, or x25519kyber(strict)
23+
2224
Auto/manual update client and or server's IP & Port
2325
timeout for extended header
2426
Set state when session is completed fully so that those steps cant be re-done
@@ -35,3 +37,7 @@ Multi FRAME RESPONSE Packet condense response to singular packet instead of size
3537

3638
JUMBO MODE
3739
A future feature which can take advantage of JUMBO Frames for intranet situations.
40+
41+
Add universal request type that can handle all data sections params data could be no reason to have method types or are they usefull to help determine what basic server operations
42+
43+
consider hashing all prior generated keys into new ones

udsp/app/methods/get.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ const dots = /\./g;
99
* @todo
1010
*/
1111
const cache = {};
12+
// Might just want to read file and catch error instead of access checking
13+
// Need cache mechanisms built in
1214
async function checkFileExists(filePath) {
1315
try {
1416
await fs.access(filePath, fs.constants.F_OK);
@@ -17,7 +19,7 @@ async function checkFileExists(filePath) {
1719
console.error('File does not exist');
1820
}
1921
}
20-
export async function get(req, resp, client) {
22+
export async function getMethod(req, resp, client) {
2123
const {
2224
resourceDirectory,
2325
defaultExtension,

0 commit comments

Comments
 (0)