@serve.zone/interfaces 32.23.0 → 32.24.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/changelog.md +30 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/corestorelegacyadoption.d.ts +6 -2
- package/dist_ts/data/corestorelegacyadoption.js +11 -8
- package/dist_ts/data/runtimelocalstorageclaim.d.ts +73 -10
- package/dist_ts/data/runtimelocalstorageclaim.js +89 -2
- package/package.json +1 -1
- package/readme.md +56 -13
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/corestorelegacyadoption.ts +19 -9
- package/ts/data/runtimelocalstorageclaim.ts +169 -10
package/changelog.md
CHANGED
|
@@ -1,5 +1,35 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-25 - 32.24.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- Add NFS and SMB sources to runtime local storage claims.
|
|
8
|
+
- `TRuntimeLocalStorageSource` gains `{ kind: 'nfs', server, export, subPath, version }`
|
|
9
|
+
(`TRuntimeLocalStorageNfsSource`) and `{ kind: 'smb', server, share, subPath, version, credential }`
|
|
10
|
+
(`TRuntimeLocalStorageSmbSource`); `{ kind: 'directory' }` is unchanged and now also named
|
|
11
|
+
`TRuntimeLocalStorageDirectorySource`. `credential` is an `IRuntimeAuthorityReference`, never a
|
|
12
|
+
value, and neither source carries a mount option or a port.
|
|
13
|
+
- `server` is a lowercase fully qualified hostname or a canonical IP literal; `export` a canonical
|
|
14
|
+
absolute path; `share` one segment; `subPath` `.` or canonical relative segments. Every segment is
|
|
15
|
+
printable ASCII without a space, a comma, `=` or a character a mount source or SMB name gives
|
|
16
|
+
meaning to, and never exactly `.` or `..`. `version` pins one kernel `vers=` value: `3`, `4.0`, `4.1` or `4.2` for NFS,
|
|
17
|
+
`3.0`, `3.02` or `3.1.1` for SMB (`runtimeLocalStorageClaimContract.nfsVersions`, `smbVersions`).
|
|
18
|
+
- An `smb` claim is always `initialization: 'empty'`, because SMB carries no POSIX ownership an
|
|
19
|
+
imported tree could keep.
|
|
20
|
+
- Add the Corestore legacy resource blocker `fence-lineage-conflict`: a bucket whose object-storage
|
|
21
|
+
fence lineage is duplicated, does not validate, belongs to another authority or has an unfinished
|
|
22
|
+
mutation, which Corestore's offline adoption refuses. `validateCorestoreLegacyResourceInventory` admits it on a
|
|
23
|
+
bucket only.
|
|
24
|
+
|
|
25
|
+
### Maintenance
|
|
26
|
+
|
|
27
|
+
- Replace real infrastructure addresses in test fixtures with documentation and synthetic addresses.
|
|
28
|
+
Protected-authority resolvers, platform endpoints and hubs use the synthetic private range
|
|
29
|
+
`192.168.255.0/24`, which keeps them outside `10.0.0.0/8` as the range-coverage test requires.
|
|
30
|
+
Host bind addresses and addresses that only need to be valid use RFC 5737 ranges. Tests only; no
|
|
31
|
+
contract change.
|
|
32
|
+
|
|
3
33
|
## 2026-09-25 - 32.23.0
|
|
4
34
|
|
|
5
35
|
### Features
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '32.
|
|
6
|
+
version: '32.24.0',
|
|
7
7
|
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
|
|
@@ -26,9 +26,13 @@ export type TCorestoreLegacyCapability = 'database' | 'objectstorage';
|
|
|
26
26
|
* - `ordinary-credentials-rotated`: its credentials were rotated, so the delivered ones are no
|
|
27
27
|
* longer the generation a binding adopts;
|
|
28
28
|
* - `owned-by-binding`: a credential binding or a named storage binding already owns the service
|
|
29
|
-
* capability, the resource or the bucket
|
|
29
|
+
* capability, the resource or the bucket;
|
|
30
|
+
* - `fence-lineage-conflict`: the bucket's object-storage fence lineage cannot move to the adopting
|
|
31
|
+
* binding, because the bucket has more than one lineage, or its lineage does not validate,
|
|
32
|
+
* belongs to another authority or has an unfinished mutation. Only a bucket has a fence lineage,
|
|
33
|
+
* so a database never names it.
|
|
30
34
|
*/
|
|
31
|
-
export type TCorestoreLegacyResourceBlocker = 'not-adoptable' | 'ordinary-credentials-rotated' | 'owned-by-binding';
|
|
35
|
+
export type TCorestoreLegacyResourceBlocker = 'not-adoptable' | 'ordinary-credentials-rotated' | 'owned-by-binding' | 'fence-lineage-conflict';
|
|
32
36
|
/**
|
|
33
37
|
* `unadopted` names what would stop the offline adoption, or `null` when nothing would;
|
|
34
38
|
* `authorized` names the binding the operator authorized, which is the only binding Corestore will
|
|
@@ -17,22 +17,25 @@ const identifierPattern = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
|
17
17
|
const printableNamePattern = /^[\x21-\x7e]+$/;
|
|
18
18
|
const bareSha256Pattern = /^[a-f0-9]{64}$/;
|
|
19
19
|
const blockers = [
|
|
20
|
-
'not-adoptable', 'ordinary-credentials-rotated', 'owned-by-binding',
|
|
20
|
+
'not-adoptable', 'ordinary-credentials-rotated', 'owned-by-binding', 'fence-lineage-conflict',
|
|
21
21
|
];
|
|
22
22
|
const isIdentifier = (valueArg) => (typeof valueArg === 'string' && identifierPattern.test(valueArg));
|
|
23
23
|
const isLegacyName = (valueArg) => (typeof valueArg === 'string'
|
|
24
24
|
&& valueArg.length <= corestoreLegacyAdoptionContract.maximumNameLength
|
|
25
25
|
&& printableNamePattern.test(valueArg));
|
|
26
26
|
const isCapability = (valueArg) => (valueArg === 'database' || valueArg === 'objectstorage');
|
|
27
|
-
const validateAdoption = (valueArg, pathArg) => {
|
|
27
|
+
const validateAdoption = (valueArg, capabilityArg, pathArg) => {
|
|
28
28
|
if (!isPlainRecord(valueArg))
|
|
29
29
|
return [`${pathArg} must use its exact schema`];
|
|
30
30
|
if (valueArg.state === 'unadopted') {
|
|
31
31
|
if (!hasExactKeys(valueArg, ['state', 'blocker']))
|
|
32
32
|
return [`${pathArg} must use its exact schema`];
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
33
|
+
if (valueArg.blocker !== null && !blockers.includes(valueArg.blocker)) {
|
|
34
|
+
return [`${pathArg} blocker must be null or a named blocker`];
|
|
35
|
+
}
|
|
36
|
+
return valueArg.blocker === 'fence-lineage-conflict' && capabilityArg !== 'objectstorage'
|
|
37
|
+
? [`${pathArg} blocker fence-lineage-conflict must name a bucket`]
|
|
38
|
+
: [];
|
|
36
39
|
}
|
|
37
40
|
if (valueArg.state === 'authorized') {
|
|
38
41
|
if (!hasExactKeys(valueArg, ['state', 'bindingId']))
|
|
@@ -50,7 +53,7 @@ const validateResource = (valueArg, pathArg) => {
|
|
|
50
53
|
if (!hasExactKeys(valueArg, ['capability', 'databaseName', 'adoption'])) {
|
|
51
54
|
return [`${pathArg} must use its exact schema`];
|
|
52
55
|
}
|
|
53
|
-
const errors = validateAdoption(valueArg.adoption, `${pathArg} adoption`);
|
|
56
|
+
const errors = validateAdoption(valueArg.adoption, 'database', `${pathArg} adoption`);
|
|
54
57
|
if (!isLegacyName(valueArg.databaseName))
|
|
55
58
|
errors.push(`${pathArg} databaseName must be a bounded printable name`);
|
|
56
59
|
return errors;
|
|
@@ -59,7 +62,7 @@ const validateResource = (valueArg, pathArg) => {
|
|
|
59
62
|
if (!hasExactKeys(valueArg, ['capability', 'bucketName', 'retention', 'adoption'])) {
|
|
60
63
|
return [`${pathArg} must use its exact schema`];
|
|
61
64
|
}
|
|
62
|
-
const errors = validateAdoption(valueArg.adoption, `${pathArg} adoption`);
|
|
65
|
+
const errors = validateAdoption(valueArg.adoption, 'objectstorage', `${pathArg} adoption`);
|
|
63
66
|
if (!isLegacyName(valueArg.bucketName)) {
|
|
64
67
|
errors.push(`${pathArg} bucketName must be a bounded printable name`);
|
|
65
68
|
}
|
|
@@ -286,4 +289,4 @@ export const readCorestoreLegacyAdoptionRefusal = (statusCodeArg, bodyArg) => (s
|
|
|
286
289
|
&& platformBindingStatusReasons.includes(bodyArg.code)
|
|
287
290
|
? bodyArg.code
|
|
288
291
|
: null);
|
|
289
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"corestorelegacyadoption.js","sourceRoot":"","sources":["../../ts/data/corestorelegacyadoption.ts"],"names":[],"mappings":"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"}
|
|
292
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"corestorelegacyadoption.js","sourceRoot":"","sources":["../../ts/data/corestorelegacyadoption.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,65 @@
|
|
|
1
1
|
import type { TSha256Digest } from './immutableimage.js';
|
|
2
2
|
import type { IRuntimeAssignment, IRuntimeAuthorityReference, IRuntimeController } from './runtimeassignment.js';
|
|
3
3
|
import type { IRuntimeSessionBinding } from './runtimesession.js';
|
|
4
|
+
/** A node-local directory the node derives from the claim's identity under a root only the node knows. */
|
|
5
|
+
export type TRuntimeLocalStorageDirectorySource = {
|
|
6
|
+
kind: 'directory';
|
|
7
|
+
};
|
|
4
8
|
/**
|
|
5
|
-
*
|
|
9
|
+
* A directory on an NFS export. The node mounts `server:export` and uses `subPath` below it.
|
|
6
10
|
*
|
|
7
|
-
* `
|
|
8
|
-
*
|
|
9
|
-
*
|
|
11
|
+
* `server` is a lowercase fully qualified hostname or a canonical IP literal, on the standard port.
|
|
12
|
+
* `export` is the canonical absolute path the server exports, `/` included. `subPath` is the
|
|
13
|
+
* volume's directory below the export, as canonical relative segments, or `.` for the export
|
|
14
|
+
* itself. `version` pins one protocol version. NFS authenticates the node's host, not a user, so
|
|
15
|
+
* the source names no credential.
|
|
10
16
|
*/
|
|
11
|
-
export type
|
|
12
|
-
kind: '
|
|
17
|
+
export type TRuntimeLocalStorageNfsSource = {
|
|
18
|
+
kind: 'nfs';
|
|
19
|
+
server: string;
|
|
20
|
+
export: string;
|
|
21
|
+
subPath: string;
|
|
22
|
+
version: TRuntimeLocalStorageNfsVersion;
|
|
23
|
+
};
|
|
24
|
+
/**
|
|
25
|
+
* A directory on an SMB share. The node mounts `//server/share` and uses `subPath` below it.
|
|
26
|
+
*
|
|
27
|
+
* `server` and `subPath` follow the NFS rules; `share` is one share name. `version` pins one
|
|
28
|
+
* dialect. `credential` names the credential authority the node authenticates with, by reference
|
|
29
|
+
* only: the claim never carries a user name, password or domain, and the node resolves the material
|
|
30
|
+
* through the controller's secret delivery.
|
|
31
|
+
*/
|
|
32
|
+
export type TRuntimeLocalStorageSmbSource = {
|
|
33
|
+
kind: 'smb';
|
|
34
|
+
server: string;
|
|
35
|
+
share: string;
|
|
36
|
+
subPath: string;
|
|
37
|
+
version: TRuntimeLocalStorageSmbVersion;
|
|
38
|
+
credential: IRuntimeAuthorityReference;
|
|
13
39
|
};
|
|
40
|
+
/**
|
|
41
|
+
* Where a local storage claim's bytes live, named by kind and never by a node's host path.
|
|
42
|
+
*
|
|
43
|
+
* A network source names the remote location and nothing about how to mount it: no mount option,
|
|
44
|
+
* no port and no credential value. The node derives every mount parameter from these fields alone.
|
|
45
|
+
* The kinds are type aliases, as `{ kind: 'directory' }` always was, so a source stays assignable
|
|
46
|
+
* to a plain record.
|
|
47
|
+
*/
|
|
48
|
+
export type TRuntimeLocalStorageSource = TRuntimeLocalStorageDirectorySource | TRuntimeLocalStorageNfsSource | TRuntimeLocalStorageSmbSource;
|
|
49
|
+
/**
|
|
50
|
+
* The NFS protocol versions a claim may pin, spelled as the kernel's NFS `vers=` parameter spells
|
|
51
|
+
* them. NFS version 4 is always stated with its minor version: the bare `4` negotiates one, which
|
|
52
|
+
* the kernel keeps only for backward compatibility, and a claim must mean the same mount on every
|
|
53
|
+
* node. Version 2 is refused.
|
|
54
|
+
*/
|
|
55
|
+
export type TRuntimeLocalStorageNfsVersion = (typeof runtimeLocalStorageClaimContract.nfsVersions)[number];
|
|
56
|
+
/**
|
|
57
|
+
* The SMB dialects a claim may pin, spelled as the kernel's CIFS `vers=` parameter spells them.
|
|
58
|
+
* Only SMB 3 dialects, the first that encrypt; the kernel refuses 1.0 and 2.0 unless built with
|
|
59
|
+
* insecure legacy dialects. `3` alone negotiates one and is refused for the same reason as a bare
|
|
60
|
+
* NFS `4`.
|
|
61
|
+
*/
|
|
62
|
+
export type TRuntimeLocalStorageSmbVersion = (typeof runtimeLocalStorageClaimContract.smbVersions)[number];
|
|
14
63
|
/** The owner and permission bits a node gives an `empty` volume's root directory when it creates it. */
|
|
15
64
|
export interface IRuntimeLocalStorageOwnership {
|
|
16
65
|
uid: number;
|
|
@@ -29,15 +78,19 @@ export interface IRuntimeLocalStorageMount {
|
|
|
29
78
|
*/
|
|
30
79
|
export type TRuntimeLocalStorageLifecycle = 'bound' | 'purge';
|
|
31
80
|
/**
|
|
32
|
-
* A controller's authority for one retained
|
|
81
|
+
* A controller's authority for one retained volume of one service, mounted on one node.
|
|
33
82
|
*
|
|
34
|
-
* Cloudly and Onebox issue it alike. It names
|
|
35
|
-
*
|
|
83
|
+
* Cloudly and Onebox issue it alike. It never names a host path, a device, a mount option or a
|
|
84
|
+
* credential value. A `directory` source names the volume by identity only, and the node resolves
|
|
85
|
+
* it to its own storage; a network source names the remote directory and, for SMB, the credential
|
|
86
|
+
* by reference.
|
|
36
87
|
*
|
|
37
88
|
* `initialization` says what the node does when the volume does not exist yet. `empty` creates an
|
|
38
89
|
* empty root with `initialOwnership`, which it must state, so a workload that runs as the image's
|
|
39
90
|
* own user never meets a root-owned directory by accident. `import` waits for the volume's bytes to
|
|
40
|
-
* be imported and states no ownership: an imported tree keeps the ownership it carries.
|
|
91
|
+
* be imported and states no ownership: an imported tree keeps the ownership it carries. SMB carries
|
|
92
|
+
* no POSIX ownership, so the node presents an SMB volume with `initialOwnership`, and an `smb`
|
|
93
|
+
* source is always `empty`.
|
|
41
94
|
*/
|
|
42
95
|
export interface IRuntimeLocalStorageClaim {
|
|
43
96
|
id: string;
|
|
@@ -90,6 +143,16 @@ export declare const runtimeLocalStorageClaimContract: Readonly<{
|
|
|
90
143
|
readonly reclaimPolicy: "retain";
|
|
91
144
|
/** Every permission bit a claim may state: setgid, sticky and the rwx triplets. */
|
|
92
145
|
readonly directoryModeBits: 2047;
|
|
146
|
+
readonly nfsVersions: readonly ["3", "4.0", "4.1", "4.2"];
|
|
147
|
+
readonly smbVersions: readonly ["3.0", "3.02", "3.1.1"];
|
|
148
|
+
/** The longest hostname a network source may name, in characters. */
|
|
149
|
+
readonly maximumServerLength: 253;
|
|
150
|
+
/** The longest `export` or `subPath`, in characters; every character is printable ASCII. */
|
|
151
|
+
readonly maximumPathLength: 1024;
|
|
152
|
+
/** The longest segment of an `export` or `subPath`. */
|
|
153
|
+
readonly maximumSegmentLength: 255;
|
|
154
|
+
/** The longest SMB share name. */
|
|
155
|
+
readonly maximumShareLength: 80;
|
|
93
156
|
}>;
|
|
94
157
|
/** Detached exact-schema snapshot. The digest is a separate check. */
|
|
95
158
|
export declare const snapshotRuntimeLocalStorageClaim: (valueArg: unknown) => IRuntimeLocalStorageClaim;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { snapshotRuntimeAssignment, validateRuntimeAssignment } from './runtimeassignment.js';
|
|
2
2
|
import { snapshotRuntimeSessionBinding } from './runtimesession.js';
|
|
3
3
|
import { captureNetwork, networkController, networkDigest, networkEqual, networkHash, networkId, networkNodeId, networkRecord, networkReference, networkReferenceOf, networkRevision, requireNetwork, } from '../private/networkcontract.js';
|
|
4
|
+
import { parseCanonicalIpAddress } from '../private/ipaddress.js';
|
|
4
5
|
import { isRuntimeIdentityNumber } from '../private/runtimepolicy.js';
|
|
5
6
|
import { createStorageContractReaders } from '../private/storagecontract.js';
|
|
6
7
|
export const runtimeLocalStorageClaimContract = Object.freeze({
|
|
@@ -10,6 +11,16 @@ export const runtimeLocalStorageClaimContract = Object.freeze({
|
|
|
10
11
|
reclaimPolicy: 'retain',
|
|
11
12
|
/** Every permission bit a claim may state: setgid, sticky and the rwx triplets. */
|
|
12
13
|
directoryModeBits: 0o3777,
|
|
14
|
+
nfsVersions: ['3', '4.0', '4.1', '4.2'],
|
|
15
|
+
smbVersions: ['3.0', '3.02', '3.1.1'],
|
|
16
|
+
/** The longest hostname a network source may name, in characters. */
|
|
17
|
+
maximumServerLength: 253,
|
|
18
|
+
/** The longest `export` or `subPath`, in characters; every character is printable ASCII. */
|
|
19
|
+
maximumPathLength: 1024,
|
|
20
|
+
/** The longest segment of an `export` or `subPath`. */
|
|
21
|
+
maximumSegmentLength: 255,
|
|
22
|
+
/** The longest SMB share name. */
|
|
23
|
+
maximumShareLength: 80,
|
|
13
24
|
});
|
|
14
25
|
const fail = () => { throw new Error(runtimeLocalStorageClaimContract.error); };
|
|
15
26
|
const safe = (operationArg) => { try {
|
|
@@ -21,7 +32,81 @@ catch {
|
|
|
21
32
|
const { readMountPath } = createStorageContractReaders(fail);
|
|
22
33
|
const claimStates = ['ready', 'import-required', 'purged', 'uncertain'];
|
|
23
34
|
const responseStatuses = ['accepted', 'replay', 'historical'];
|
|
35
|
+
const hostnameLabelPattern = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/;
|
|
36
|
+
/**
|
|
37
|
+
* Printable ASCII without a space. One spelling per name, so two claims cannot name one directory
|
|
38
|
+
* two ways, and nothing a mount source or an option string reads as a separator.
|
|
39
|
+
*/
|
|
40
|
+
const printableAsciiPattern = /^[\x21-\x7e]+$/;
|
|
41
|
+
/** A comma or `=` would read as a mount option; the rest have meaning in a mount source or an SMB name. */
|
|
42
|
+
const pathSegmentForbiddenPattern = /["*,/:<=>?\\|]/;
|
|
43
|
+
/** SMB refuses these in a share name, beyond what it refuses in a path segment. */
|
|
44
|
+
const shareForbiddenPattern = /[+;\[\]]/;
|
|
45
|
+
/**
|
|
46
|
+
* A lowercase fully qualified hostname of two or more labels whose last label is not numeric, or a
|
|
47
|
+
* canonical IP literal. One label would resolve through each node's own search domains; a numeric
|
|
48
|
+
* last label would let a non-canonical address pass as a hostname. There is no port and no
|
|
49
|
+
* userinfo: the node connects to the protocol's standard port.
|
|
50
|
+
*/
|
|
51
|
+
const serverOf = (valueArg) => {
|
|
52
|
+
requireNetwork(typeof valueArg === 'string');
|
|
53
|
+
if (parseCanonicalIpAddress(valueArg) !== null)
|
|
54
|
+
return valueArg;
|
|
55
|
+
const labels = valueArg.split('.');
|
|
56
|
+
requireNetwork(valueArg.length <= runtimeLocalStorageClaimContract.maximumServerLength && labels.length >= 2
|
|
57
|
+
&& labels.every((labelArg) => hostnameLabelPattern.test(labelArg))
|
|
58
|
+
&& !/^[0-9]+$/.test(labels[labels.length - 1]));
|
|
59
|
+
return valueArg;
|
|
60
|
+
};
|
|
61
|
+
const isPathSegment = (valueArg) => valueArg.length <= runtimeLocalStorageClaimContract.maximumSegmentLength
|
|
62
|
+
&& printableAsciiPattern.test(valueArg) && !pathSegmentForbiddenPattern.test(valueArg)
|
|
63
|
+
&& valueArg !== '.' && valueArg !== '..';
|
|
64
|
+
const isRelativeSegments = (valueArg) => valueArg.length <= runtimeLocalStorageClaimContract.maximumPathLength
|
|
65
|
+
&& valueArg.split('/').every(isPathSegment);
|
|
66
|
+
/** `/`, or `/` followed by canonical segments without a trailing slash. */
|
|
67
|
+
const exportOf = (valueArg) => {
|
|
68
|
+
requireNetwork(typeof valueArg === 'string' && valueArg.length <= runtimeLocalStorageClaimContract.maximumPathLength
|
|
69
|
+
&& valueArg.startsWith('/') && (valueArg === '/' || isRelativeSegments(valueArg.slice(1))));
|
|
70
|
+
return valueArg;
|
|
71
|
+
};
|
|
72
|
+
/** `.`, or canonical relative segments. */
|
|
73
|
+
const subPathOf = (valueArg) => {
|
|
74
|
+
requireNetwork(typeof valueArg === 'string' && (valueArg === '.' || isRelativeSegments(valueArg)));
|
|
75
|
+
return valueArg;
|
|
76
|
+
};
|
|
77
|
+
const shareOf = (valueArg) => {
|
|
78
|
+
requireNetwork(typeof valueArg === 'string' && valueArg.length <= runtimeLocalStorageClaimContract.maximumShareLength
|
|
79
|
+
&& isPathSegment(valueArg) && !shareForbiddenPattern.test(valueArg));
|
|
80
|
+
return valueArg;
|
|
81
|
+
};
|
|
82
|
+
const literalOf = (valueArg, allowedArg) => {
|
|
83
|
+
requireNetwork(allowedArg.includes(valueArg));
|
|
84
|
+
return valueArg;
|
|
85
|
+
};
|
|
24
86
|
const sourceOf = (valueArg) => {
|
|
87
|
+
requireNetwork(valueArg !== null && typeof valueArg === 'object');
|
|
88
|
+
const { kind } = valueArg;
|
|
89
|
+
if (kind === 'nfs') {
|
|
90
|
+
const value = networkRecord(valueArg, ['kind', 'server', 'export', 'subPath', 'version']);
|
|
91
|
+
return {
|
|
92
|
+
kind: 'nfs',
|
|
93
|
+
server: serverOf(value.server),
|
|
94
|
+
export: exportOf(value.export),
|
|
95
|
+
subPath: subPathOf(value.subPath),
|
|
96
|
+
version: literalOf(value.version, runtimeLocalStorageClaimContract.nfsVersions),
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
if (kind === 'smb') {
|
|
100
|
+
const value = networkRecord(valueArg, ['kind', 'server', 'share', 'subPath', 'version', 'credential']);
|
|
101
|
+
return {
|
|
102
|
+
kind: 'smb',
|
|
103
|
+
server: serverOf(value.server),
|
|
104
|
+
share: shareOf(value.share),
|
|
105
|
+
subPath: subPathOf(value.subPath),
|
|
106
|
+
version: literalOf(value.version, runtimeLocalStorageClaimContract.smbVersions),
|
|
107
|
+
credential: networkReference(value.credential),
|
|
108
|
+
};
|
|
109
|
+
}
|
|
25
110
|
const value = networkRecord(valueArg, ['kind']);
|
|
26
111
|
requireNetwork(value.kind === 'directory');
|
|
27
112
|
return { kind: 'directory' };
|
|
@@ -48,6 +133,8 @@ export const snapshotRuntimeLocalStorageClaim = (valueArg) => safe(() => {
|
|
|
48
133
|
|| (value.initialization === 'import' && value.initialOwnership === null));
|
|
49
134
|
requireNetwork(value.accessMode === 'ReadWriteOnce' && value.reclaimPolicy === 'retain');
|
|
50
135
|
requireNetwork(value.lifecycle === 'bound' || (value.lifecycle === 'purge' && previous !== null));
|
|
136
|
+
const source = sourceOf(value.source);
|
|
137
|
+
requireNetwork(source.kind !== 'smb' || value.initialization === 'empty');
|
|
51
138
|
return {
|
|
52
139
|
id, generation, previous,
|
|
53
140
|
controller: networkController(value.controller),
|
|
@@ -57,7 +144,7 @@ export const snapshotRuntimeLocalStorageClaim = (valueArg) => safe(() => {
|
|
|
57
144
|
runtimeNamespace: networkId(value.runtimeNamespace),
|
|
58
145
|
serviceId: networkId(value.serviceId),
|
|
59
146
|
volumeId: networkId(value.volumeId),
|
|
60
|
-
source
|
|
147
|
+
source,
|
|
61
148
|
initialization: value.initialization,
|
|
62
149
|
initialOwnership: value.initialOwnership === null ? null : ownershipOf(value.initialOwnership),
|
|
63
150
|
mount: mountOf(value.mount),
|
|
@@ -164,4 +251,4 @@ export const bindApplyRuntimeLocalStorageClaimResponse = (valueArg, requestArg)
|
|
|
164
251
|
}
|
|
165
252
|
return response;
|
|
166
253
|
});
|
|
167
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtimelocalstorageclaim.js","sourceRoot":"","sources":["../../ts/data/runtimelocalstorageclaim.ts"],"names":[],"mappings":"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"}
|
|
254
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtimelocalstorageclaim.js","sourceRoot":"","sources":["../../ts/data/runtimelocalstorageclaim.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -1984,25 +1984,64 @@ native fence.
|
|
|
1984
1984
|
|
|
1985
1985
|
### Runtime local storage claims
|
|
1986
1986
|
|
|
1987
|
-
`data.IRuntimeLocalStorageClaim` is a controller's authority for one retained
|
|
1988
|
-
one
|
|
1989
|
-
the claim revision (`id`, `generation`, `previous`), the organization, cluster, node,
|
|
1990
|
-
namespace, service and the service's own `volumeId`, and it states:
|
|
1991
|
-
|
|
1992
|
-
- `source
|
|
1993
|
-
|
|
1994
|
-
|
|
1987
|
+
`data.IRuntimeLocalStorageClaim` is a controller's authority for one retained volume of one service,
|
|
1988
|
+
mounted on one node. Cloudly and Onebox issue it alike (`controller.kind` is `cloudly` or `onebox`).
|
|
1989
|
+
It names the claim revision (`id`, `generation`, `previous`), the organization, cluster, node,
|
|
1990
|
+
runtime namespace, service and the service's own `volumeId`, and it states:
|
|
1991
|
+
|
|
1992
|
+
- `source` (`TRuntimeLocalStorageSource`), one of:
|
|
1993
|
+
- `{ kind: 'directory' }` (`TRuntimeLocalStorageDirectorySource`), a node-local directory the node
|
|
1994
|
+
derives from the claim's identity under a root only the node knows;
|
|
1995
|
+
- `{ kind: 'nfs', server, export, subPath, version }` (`TRuntimeLocalStorageNfsSource`), the
|
|
1996
|
+
directory `subPath` below the NFS export `server:export`;
|
|
1997
|
+
- `{ kind: 'smb', server, share, subPath, version, credential }` (`TRuntimeLocalStorageSmbSource`),
|
|
1998
|
+
the directory `subPath` below the SMB share `//server/share`. `credential` is an
|
|
1999
|
+
`IRuntimeAuthorityReference { id, generation, digest }` naming the credential the node
|
|
2000
|
+
authenticates with; the claim never carries a user name, password or domain, and the node
|
|
2001
|
+
resolves the material through the controller's secret delivery. NFS authenticates the node's
|
|
2002
|
+
host, so an `nfs` source names no credential;
|
|
1995
2003
|
- `initialization`: `empty` creates an empty root with `initialOwnership { uid, gid, mode }`, which
|
|
1996
2004
|
an `empty` claim must state, so a workload without `runAs` never meets a root-owned directory by
|
|
1997
2005
|
accident; `import` waits for the volume's bytes to be imported and states `initialOwnership: null`,
|
|
1998
2006
|
because an imported tree keeps its own ownership. `mode` holds directory permission bits only
|
|
1999
|
-
(`runtimeLocalStorageClaimContract.directoryModeBits`, `0o3777`; setuid is refused)
|
|
2007
|
+
(`runtimeLocalStorageClaimContract.directoryModeBits`, `0o3777`; setuid is refused). SMB carries no
|
|
2008
|
+
POSIX ownership, so the node presents an SMB volume with `initialOwnership`, and an `smb` claim is
|
|
2009
|
+
always `empty`;
|
|
2000
2010
|
- `mount { mountPath, readOnly }`, judged by the storage request's own mount path rule: canonical,
|
|
2001
2011
|
absolute, not `/`, and never overlapping `/run/secrets`;
|
|
2002
2012
|
- `accessMode: 'ReadWriteOnce'`, `reclaimPolicy: 'retain'`, and `lifecycle`: `bound` keeps the
|
|
2003
2013
|
volume, `purge` orders its bytes deleted and always follows a bound generation of the same claim.
|
|
2004
2014
|
|
|
2005
|
-
|
|
2015
|
+
A network source names the remote directory and nothing about how to mount it, so the node derives
|
|
2016
|
+
every mount parameter from these fields alone and a claim cannot smuggle an option in:
|
|
2017
|
+
|
|
2018
|
+
| Field | Rule |
|
|
2019
|
+
| --- | --- |
|
|
2020
|
+
| `server` | a lowercase fully qualified hostname of two or more labels whose last label is not numeric (a single label would resolve through each node's own search domains), or a canonical IP literal (a dotted quad without leading zeros, or RFC 5952 IPv6 without brackets or zone). No scheme, user info or port: the node connects to the protocol's standard port |
|
|
2021
|
+
| `export` | `/`, or `/` and canonical segments without a trailing slash |
|
|
2022
|
+
| `subPath` | `.` for the export or share itself, or canonical relative segments |
|
|
2023
|
+
| `share` | one segment of at most 80 characters, without `+`, `;`, `[` or `]` |
|
|
2024
|
+
| `version` | `nfs`: `3`, `4.0`, `4.1` or `4.2`; `smb`: `3.0`, `3.02` or `3.1.1` |
|
|
2025
|
+
|
|
2026
|
+
A segment is printable ASCII without a space, at most 255 characters, never `.` or `..`, and holds
|
|
2027
|
+
none of `"`, `*`, `,`, `/`, `:`, `<`, `=`, `>`, `?`, `\` or `|`: a comma or `=` would read as a mount
|
|
2028
|
+
option, and the rest have meaning in a mount source or an SMB name. `export` and `subPath` are at
|
|
2029
|
+
most 1024 characters. ASCII keeps one spelling per segment, but one remote directory can still be
|
|
2030
|
+
named several ways: a hostname and an address of the same server, a different `export`/`subPath`
|
|
2031
|
+
split, or a nested `subPath`. The contract cannot detect these aliases, so the controller must refuse
|
|
2032
|
+
overlapping bound claims itself. The versions are the kernel's own `vers=` spellings, and each pins one protocol version: a
|
|
2033
|
+
bare NFS `4` or SMB `3` negotiates one, which a claim that must mean the same mount on every node
|
|
2034
|
+
cannot allow. NFS version 2 and the SMB 1 and 2 dialects are refused; SMB 3 is the first dialect
|
|
2035
|
+
that encrypts. The bounds and version lists
|
|
2036
|
+
are `runtimeLocalStorageClaimContract.nfsVersions`, `smbVersions`, `maximumServerLength`,
|
|
2037
|
+
`maximumPathLength`, `maximumSegmentLength` and `maximumShareLength`.
|
|
2038
|
+
|
|
2039
|
+
`ReadWriteOnce` holds on the node that mounts the claim. A network directory is reachable from more
|
|
2040
|
+
than one node, so the controller issues at most one bound claim per remote directory; a node cannot
|
|
2041
|
+
see another node's mounts. A `purge` of a network claim deletes everything below `subPath`, the
|
|
2042
|
+
whole export or share for `.`.
|
|
2043
|
+
|
|
2044
|
+
The claim carries no host path, device, mount option or credential value.
|
|
2006
2045
|
`snapshotRuntimeLocalStorageClaim` makes a detached exact-schema snapshot,
|
|
2007
2046
|
`computeRuntimeLocalStorageClaimDigest` hashes it under `serve.zone/runtime-local-storage-claim`,
|
|
2008
2047
|
`validateRuntimeLocalStorageClaim` verifies the stated digest, and
|
|
@@ -3394,9 +3433,13 @@ Coreflow, all exported from `data` and `platform`:
|
|
|
3394
3433
|
`{ state: 'authorized', bindingId }`. The blocker names what would stop the offline adoption,
|
|
3395
3434
|
`null` when nothing would: `not-adoptable` (an allocation-managed database, another provider, a
|
|
3396
3435
|
resource name that is not its database or bucket name, or a bucket name that is not a canonical S3
|
|
3397
|
-
name), `ordinary-credentials-rotated
|
|
3398
|
-
|
|
3399
|
-
|
|
3436
|
+
name), `ordinary-credentials-rotated`, `owned-by-binding` or `fence-lineage-conflict` (the
|
|
3437
|
+
bucket's object-storage fence lineage cannot move to the adopting binding: the bucket has more than
|
|
3438
|
+
one lineage, or its lineage does not validate, belongs to another authority or has an unfinished
|
|
3439
|
+
mutation).
|
|
3440
|
+
Only a bucket has a fence lineage, so a database never names `fence-lineage-conflict`. An
|
|
3441
|
+
adoptable bucket must have a canonical S3 name, because a binding request carries only such a
|
|
3442
|
+
name. A consumed adoption removes the legacy entry, so it never appears.
|
|
3400
3443
|
2. **Relay.** `getClusterCorestoreLegacyResources { nodeId }` asks the relay for one node's
|
|
3401
3444
|
inventory, answered as `TClusterCorestoreLegacyResourceInventory`: `reachable: true` with the
|
|
3402
3445
|
services, or `reachable: false` with `errorCode` `CORESTORE_ENDPOINT_UNKNOWN` or
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -42,12 +42,17 @@ export type TCorestoreLegacyCapability = 'database' | 'objectstorage';
|
|
|
42
42
|
* - `ordinary-credentials-rotated`: its credentials were rotated, so the delivered ones are no
|
|
43
43
|
* longer the generation a binding adopts;
|
|
44
44
|
* - `owned-by-binding`: a credential binding or a named storage binding already owns the service
|
|
45
|
-
* capability, the resource or the bucket
|
|
45
|
+
* capability, the resource or the bucket;
|
|
46
|
+
* - `fence-lineage-conflict`: the bucket's object-storage fence lineage cannot move to the adopting
|
|
47
|
+
* binding, because the bucket has more than one lineage, or its lineage does not validate,
|
|
48
|
+
* belongs to another authority or has an unfinished mutation. Only a bucket has a fence lineage,
|
|
49
|
+
* so a database never names it.
|
|
46
50
|
*/
|
|
47
51
|
export type TCorestoreLegacyResourceBlocker =
|
|
48
52
|
| 'not-adoptable'
|
|
49
53
|
| 'ordinary-credentials-rotated'
|
|
50
|
-
| 'owned-by-binding'
|
|
54
|
+
| 'owned-by-binding'
|
|
55
|
+
| 'fence-lineage-conflict';
|
|
51
56
|
|
|
52
57
|
/**
|
|
53
58
|
* `unadopted` names what would stop the offline adoption, or `null` when nothing would;
|
|
@@ -155,7 +160,7 @@ const identifierPattern = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
|
|
|
155
160
|
const printableNamePattern = /^[\x21-\x7e]+$/;
|
|
156
161
|
const bareSha256Pattern = /^[a-f0-9]{64}$/;
|
|
157
162
|
const blockers: readonly TCorestoreLegacyResourceBlocker[] = [
|
|
158
|
-
'not-adoptable', 'ordinary-credentials-rotated', 'owned-by-binding',
|
|
163
|
+
'not-adoptable', 'ordinary-credentials-rotated', 'owned-by-binding', 'fence-lineage-conflict',
|
|
159
164
|
];
|
|
160
165
|
|
|
161
166
|
const isIdentifier = (valueArg: unknown): valueArg is string => (
|
|
@@ -172,13 +177,18 @@ const isCapability = (valueArg: unknown): valueArg is TCorestoreLegacyCapability
|
|
|
172
177
|
valueArg === 'database' || valueArg === 'objectstorage'
|
|
173
178
|
);
|
|
174
179
|
|
|
175
|
-
const validateAdoption = (
|
|
180
|
+
const validateAdoption = (
|
|
181
|
+
valueArg: unknown, capabilityArg: TCorestoreLegacyCapability, pathArg: string,
|
|
182
|
+
): string[] => {
|
|
176
183
|
if (!isPlainRecord(valueArg)) return [`${pathArg} must use its exact schema`];
|
|
177
184
|
if (valueArg.state === 'unadopted') {
|
|
178
185
|
if (!hasExactKeys(valueArg, ['state', 'blocker'])) return [`${pathArg} must use its exact schema`];
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
186
|
+
if (valueArg.blocker !== null && !(blockers as readonly unknown[]).includes(valueArg.blocker)) {
|
|
187
|
+
return [`${pathArg} blocker must be null or a named blocker`];
|
|
188
|
+
}
|
|
189
|
+
return valueArg.blocker === 'fence-lineage-conflict' && capabilityArg !== 'objectstorage'
|
|
190
|
+
? [`${pathArg} blocker fence-lineage-conflict must name a bucket`]
|
|
191
|
+
: [];
|
|
182
192
|
}
|
|
183
193
|
if (valueArg.state === 'authorized') {
|
|
184
194
|
if (!hasExactKeys(valueArg, ['state', 'bindingId'])) return [`${pathArg} must use its exact schema`];
|
|
@@ -198,7 +208,7 @@ const validateResource = (valueArg: unknown, pathArg: string): string[] => {
|
|
|
198
208
|
if (!hasExactKeys(valueArg, ['capability', 'databaseName', 'adoption'])) {
|
|
199
209
|
return [`${pathArg} must use its exact schema`];
|
|
200
210
|
}
|
|
201
|
-
const errors = validateAdoption(valueArg.adoption, `${pathArg} adoption`);
|
|
211
|
+
const errors = validateAdoption(valueArg.adoption, 'database', `${pathArg} adoption`);
|
|
202
212
|
if (!isLegacyName(valueArg.databaseName)) errors.push(`${pathArg} databaseName must be a bounded printable name`);
|
|
203
213
|
return errors;
|
|
204
214
|
}
|
|
@@ -206,7 +216,7 @@ const validateResource = (valueArg: unknown, pathArg: string): string[] => {
|
|
|
206
216
|
if (!hasExactKeys(valueArg, ['capability', 'bucketName', 'retention', 'adoption'])) {
|
|
207
217
|
return [`${pathArg} must use its exact schema`];
|
|
208
218
|
}
|
|
209
|
-
const errors = validateAdoption(valueArg.adoption, `${pathArg} adoption`);
|
|
219
|
+
const errors = validateAdoption(valueArg.adoption, 'objectstorage', `${pathArg} adoption`);
|
|
210
220
|
if (!isLegacyName(valueArg.bucketName)) {
|
|
211
221
|
errors.push(`${pathArg} bucketName must be a bounded printable name`);
|
|
212
222
|
} else if (errors.length === 0 && isAdoptable(valueArg.adoption)) {
|
|
@@ -6,17 +6,77 @@ import { snapshotRuntimeSessionBinding } from './runtimesession.js';
|
|
|
6
6
|
import { captureNetwork, networkController, networkDigest, networkEqual, networkHash, networkId,
|
|
7
7
|
networkNodeId, networkRecord, networkReference, networkReferenceOf, networkRevision, requireNetwork,
|
|
8
8
|
} from '../private/networkcontract.js';
|
|
9
|
+
import { parseCanonicalIpAddress } from '../private/ipaddress.js';
|
|
9
10
|
import { isRuntimeIdentityNumber } from '../private/runtimepolicy.js';
|
|
10
11
|
import { createStorageContractReaders } from '../private/storagecontract.js';
|
|
11
12
|
|
|
13
|
+
/** A node-local directory the node derives from the claim's identity under a root only the node knows. */
|
|
14
|
+
export type TRuntimeLocalStorageDirectorySource = {
|
|
15
|
+
kind: 'directory';
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* A directory on an NFS export. The node mounts `server:export` and uses `subPath` below it.
|
|
20
|
+
*
|
|
21
|
+
* `server` is a lowercase fully qualified hostname or a canonical IP literal, on the standard port.
|
|
22
|
+
* `export` is the canonical absolute path the server exports, `/` included. `subPath` is the
|
|
23
|
+
* volume's directory below the export, as canonical relative segments, or `.` for the export
|
|
24
|
+
* itself. `version` pins one protocol version. NFS authenticates the node's host, not a user, so
|
|
25
|
+
* the source names no credential.
|
|
26
|
+
*/
|
|
27
|
+
export type TRuntimeLocalStorageNfsSource = {
|
|
28
|
+
kind: 'nfs';
|
|
29
|
+
server: string;
|
|
30
|
+
export: string;
|
|
31
|
+
subPath: string;
|
|
32
|
+
version: TRuntimeLocalStorageNfsVersion;
|
|
33
|
+
};
|
|
34
|
+
|
|
12
35
|
/**
|
|
13
|
-
*
|
|
36
|
+
* A directory on an SMB share. The node mounts `//server/share` and uses `subPath` below it.
|
|
14
37
|
*
|
|
15
|
-
* `
|
|
16
|
-
*
|
|
17
|
-
*
|
|
38
|
+
* `server` and `subPath` follow the NFS rules; `share` is one share name. `version` pins one
|
|
39
|
+
* dialect. `credential` names the credential authority the node authenticates with, by reference
|
|
40
|
+
* only: the claim never carries a user name, password or domain, and the node resolves the material
|
|
41
|
+
* through the controller's secret delivery.
|
|
18
42
|
*/
|
|
19
|
-
export type
|
|
43
|
+
export type TRuntimeLocalStorageSmbSource = {
|
|
44
|
+
kind: 'smb';
|
|
45
|
+
server: string;
|
|
46
|
+
share: string;
|
|
47
|
+
subPath: string;
|
|
48
|
+
version: TRuntimeLocalStorageSmbVersion;
|
|
49
|
+
credential: IRuntimeAuthorityReference;
|
|
50
|
+
};
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* Where a local storage claim's bytes live, named by kind and never by a node's host path.
|
|
54
|
+
*
|
|
55
|
+
* A network source names the remote location and nothing about how to mount it: no mount option,
|
|
56
|
+
* no port and no credential value. The node derives every mount parameter from these fields alone.
|
|
57
|
+
* The kinds are type aliases, as `{ kind: 'directory' }` always was, so a source stays assignable
|
|
58
|
+
* to a plain record.
|
|
59
|
+
*/
|
|
60
|
+
export type TRuntimeLocalStorageSource =
|
|
61
|
+
| TRuntimeLocalStorageDirectorySource
|
|
62
|
+
| TRuntimeLocalStorageNfsSource
|
|
63
|
+
| TRuntimeLocalStorageSmbSource;
|
|
64
|
+
|
|
65
|
+
/**
|
|
66
|
+
* The NFS protocol versions a claim may pin, spelled as the kernel's NFS `vers=` parameter spells
|
|
67
|
+
* them. NFS version 4 is always stated with its minor version: the bare `4` negotiates one, which
|
|
68
|
+
* the kernel keeps only for backward compatibility, and a claim must mean the same mount on every
|
|
69
|
+
* node. Version 2 is refused.
|
|
70
|
+
*/
|
|
71
|
+
export type TRuntimeLocalStorageNfsVersion = (typeof runtimeLocalStorageClaimContract.nfsVersions)[number];
|
|
72
|
+
|
|
73
|
+
/**
|
|
74
|
+
* The SMB dialects a claim may pin, spelled as the kernel's CIFS `vers=` parameter spells them.
|
|
75
|
+
* Only SMB 3 dialects, the first that encrypt; the kernel refuses 1.0 and 2.0 unless built with
|
|
76
|
+
* insecure legacy dialects. `3` alone negotiates one and is refused for the same reason as a bare
|
|
77
|
+
* NFS `4`.
|
|
78
|
+
*/
|
|
79
|
+
export type TRuntimeLocalStorageSmbVersion = (typeof runtimeLocalStorageClaimContract.smbVersions)[number];
|
|
20
80
|
|
|
21
81
|
/** The owner and permission bits a node gives an `empty` volume's root directory when it creates it. */
|
|
22
82
|
export interface IRuntimeLocalStorageOwnership {
|
|
@@ -39,15 +99,19 @@ export interface IRuntimeLocalStorageMount {
|
|
|
39
99
|
export type TRuntimeLocalStorageLifecycle = 'bound' | 'purge';
|
|
40
100
|
|
|
41
101
|
/**
|
|
42
|
-
* A controller's authority for one retained
|
|
102
|
+
* A controller's authority for one retained volume of one service, mounted on one node.
|
|
43
103
|
*
|
|
44
|
-
* Cloudly and Onebox issue it alike. It names
|
|
45
|
-
*
|
|
104
|
+
* Cloudly and Onebox issue it alike. It never names a host path, a device, a mount option or a
|
|
105
|
+
* credential value. A `directory` source names the volume by identity only, and the node resolves
|
|
106
|
+
* it to its own storage; a network source names the remote directory and, for SMB, the credential
|
|
107
|
+
* by reference.
|
|
46
108
|
*
|
|
47
109
|
* `initialization` says what the node does when the volume does not exist yet. `empty` creates an
|
|
48
110
|
* empty root with `initialOwnership`, which it must state, so a workload that runs as the image's
|
|
49
111
|
* own user never meets a root-owned directory by accident. `import` waits for the volume's bytes to
|
|
50
|
-
* be imported and states no ownership: an imported tree keeps the ownership it carries.
|
|
112
|
+
* be imported and states no ownership: an imported tree keeps the ownership it carries. SMB carries
|
|
113
|
+
* no POSIX ownership, so the node presents an SMB volume with `initialOwnership`, and an `smb`
|
|
114
|
+
* source is always `empty`.
|
|
51
115
|
*/
|
|
52
116
|
export interface IRuntimeLocalStorageClaim {
|
|
53
117
|
id: string;
|
|
@@ -104,6 +168,16 @@ export const runtimeLocalStorageClaimContract = Object.freeze({
|
|
|
104
168
|
reclaimPolicy: 'retain',
|
|
105
169
|
/** Every permission bit a claim may state: setgid, sticky and the rwx triplets. */
|
|
106
170
|
directoryModeBits: 0o3777,
|
|
171
|
+
nfsVersions: ['3', '4.0', '4.1', '4.2'],
|
|
172
|
+
smbVersions: ['3.0', '3.02', '3.1.1'],
|
|
173
|
+
/** The longest hostname a network source may name, in characters. */
|
|
174
|
+
maximumServerLength: 253,
|
|
175
|
+
/** The longest `export` or `subPath`, in characters; every character is printable ASCII. */
|
|
176
|
+
maximumPathLength: 1024,
|
|
177
|
+
/** The longest segment of an `export` or `subPath`. */
|
|
178
|
+
maximumSegmentLength: 255,
|
|
179
|
+
/** The longest SMB share name. */
|
|
180
|
+
maximumShareLength: 80,
|
|
107
181
|
} as const);
|
|
108
182
|
|
|
109
183
|
const fail = (): never => { throw new Error(runtimeLocalStorageClaimContract.error); };
|
|
@@ -112,7 +186,90 @@ const { readMountPath } = createStorageContractReaders(fail);
|
|
|
112
186
|
const claimStates = ['ready', 'import-required', 'purged', 'uncertain'] as const;
|
|
113
187
|
const responseStatuses = ['accepted', 'replay', 'historical'] as const;
|
|
114
188
|
|
|
189
|
+
const hostnameLabelPattern = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/;
|
|
190
|
+
/**
|
|
191
|
+
* Printable ASCII without a space. One spelling per name, so two claims cannot name one directory
|
|
192
|
+
* two ways, and nothing a mount source or an option string reads as a separator.
|
|
193
|
+
*/
|
|
194
|
+
const printableAsciiPattern = /^[\x21-\x7e]+$/;
|
|
195
|
+
/** A comma or `=` would read as a mount option; the rest have meaning in a mount source or an SMB name. */
|
|
196
|
+
const pathSegmentForbiddenPattern = /["*,/:<=>?\\|]/;
|
|
197
|
+
/** SMB refuses these in a share name, beyond what it refuses in a path segment. */
|
|
198
|
+
const shareForbiddenPattern = /[+;\[\]]/;
|
|
199
|
+
|
|
200
|
+
/**
|
|
201
|
+
* A lowercase fully qualified hostname of two or more labels whose last label is not numeric, or a
|
|
202
|
+
* canonical IP literal. One label would resolve through each node's own search domains; a numeric
|
|
203
|
+
* last label would let a non-canonical address pass as a hostname. There is no port and no
|
|
204
|
+
* userinfo: the node connects to the protocol's standard port.
|
|
205
|
+
*/
|
|
206
|
+
const serverOf = (valueArg: unknown): string => {
|
|
207
|
+
requireNetwork(typeof valueArg === 'string');
|
|
208
|
+
if (parseCanonicalIpAddress(valueArg) !== null) return valueArg;
|
|
209
|
+
const labels = valueArg.split('.');
|
|
210
|
+
requireNetwork(valueArg.length <= runtimeLocalStorageClaimContract.maximumServerLength && labels.length >= 2
|
|
211
|
+
&& labels.every((labelArg) => hostnameLabelPattern.test(labelArg))
|
|
212
|
+
&& !/^[0-9]+$/.test(labels[labels.length - 1]));
|
|
213
|
+
return valueArg;
|
|
214
|
+
};
|
|
215
|
+
|
|
216
|
+
const isPathSegment = (valueArg: string): boolean =>
|
|
217
|
+
valueArg.length <= runtimeLocalStorageClaimContract.maximumSegmentLength
|
|
218
|
+
&& printableAsciiPattern.test(valueArg) && !pathSegmentForbiddenPattern.test(valueArg)
|
|
219
|
+
&& valueArg !== '.' && valueArg !== '..';
|
|
220
|
+
|
|
221
|
+
const isRelativeSegments = (valueArg: string): boolean =>
|
|
222
|
+
valueArg.length <= runtimeLocalStorageClaimContract.maximumPathLength
|
|
223
|
+
&& valueArg.split('/').every(isPathSegment);
|
|
224
|
+
|
|
225
|
+
/** `/`, or `/` followed by canonical segments without a trailing slash. */
|
|
226
|
+
const exportOf = (valueArg: unknown): string => {
|
|
227
|
+
requireNetwork(typeof valueArg === 'string' && valueArg.length <= runtimeLocalStorageClaimContract.maximumPathLength
|
|
228
|
+
&& valueArg.startsWith('/') && (valueArg === '/' || isRelativeSegments(valueArg.slice(1))));
|
|
229
|
+
return valueArg;
|
|
230
|
+
};
|
|
231
|
+
|
|
232
|
+
/** `.`, or canonical relative segments. */
|
|
233
|
+
const subPathOf = (valueArg: unknown): string => {
|
|
234
|
+
requireNetwork(typeof valueArg === 'string' && (valueArg === '.' || isRelativeSegments(valueArg)));
|
|
235
|
+
return valueArg;
|
|
236
|
+
};
|
|
237
|
+
|
|
238
|
+
const shareOf = (valueArg: unknown): string => {
|
|
239
|
+
requireNetwork(typeof valueArg === 'string' && valueArg.length <= runtimeLocalStorageClaimContract.maximumShareLength
|
|
240
|
+
&& isPathSegment(valueArg) && !shareForbiddenPattern.test(valueArg));
|
|
241
|
+
return valueArg;
|
|
242
|
+
};
|
|
243
|
+
|
|
244
|
+
const literalOf = <TLiteral extends string>(valueArg: unknown, allowedArg: readonly TLiteral[]): TLiteral => {
|
|
245
|
+
requireNetwork((allowedArg as readonly unknown[]).includes(valueArg));
|
|
246
|
+
return valueArg as TLiteral;
|
|
247
|
+
};
|
|
248
|
+
|
|
115
249
|
const sourceOf = (valueArg: unknown): TRuntimeLocalStorageSource => {
|
|
250
|
+
requireNetwork(valueArg !== null && typeof valueArg === 'object');
|
|
251
|
+
const { kind } = valueArg as Record<string, unknown>;
|
|
252
|
+
if (kind === 'nfs') {
|
|
253
|
+
const value = networkRecord(valueArg, ['kind', 'server', 'export', 'subPath', 'version']);
|
|
254
|
+
return {
|
|
255
|
+
kind: 'nfs',
|
|
256
|
+
server: serverOf(value.server),
|
|
257
|
+
export: exportOf(value.export),
|
|
258
|
+
subPath: subPathOf(value.subPath),
|
|
259
|
+
version: literalOf(value.version, runtimeLocalStorageClaimContract.nfsVersions),
|
|
260
|
+
};
|
|
261
|
+
}
|
|
262
|
+
if (kind === 'smb') {
|
|
263
|
+
const value = networkRecord(valueArg, ['kind', 'server', 'share', 'subPath', 'version', 'credential']);
|
|
264
|
+
return {
|
|
265
|
+
kind: 'smb',
|
|
266
|
+
server: serverOf(value.server),
|
|
267
|
+
share: shareOf(value.share),
|
|
268
|
+
subPath: subPathOf(value.subPath),
|
|
269
|
+
version: literalOf(value.version, runtimeLocalStorageClaimContract.smbVersions),
|
|
270
|
+
credential: networkReference(value.credential),
|
|
271
|
+
};
|
|
272
|
+
}
|
|
116
273
|
const value = networkRecord(valueArg, ['kind']);
|
|
117
274
|
requireNetwork(value.kind === 'directory');
|
|
118
275
|
return { kind: 'directory' };
|
|
@@ -142,6 +299,8 @@ export const snapshotRuntimeLocalStorageClaim = (valueArg: unknown): IRuntimeLoc
|
|
|
142
299
|
|| (value.initialization === 'import' && value.initialOwnership === null));
|
|
143
300
|
requireNetwork(value.accessMode === 'ReadWriteOnce' && value.reclaimPolicy === 'retain');
|
|
144
301
|
requireNetwork(value.lifecycle === 'bound' || (value.lifecycle === 'purge' && previous !== null));
|
|
302
|
+
const source = sourceOf(value.source);
|
|
303
|
+
requireNetwork(source.kind !== 'smb' || value.initialization === 'empty');
|
|
145
304
|
return {
|
|
146
305
|
id, generation, previous,
|
|
147
306
|
controller: networkController(value.controller),
|
|
@@ -151,7 +310,7 @@ export const snapshotRuntimeLocalStorageClaim = (valueArg: unknown): IRuntimeLoc
|
|
|
151
310
|
runtimeNamespace: networkId(value.runtimeNamespace),
|
|
152
311
|
serviceId: networkId(value.serviceId),
|
|
153
312
|
volumeId: networkId(value.volumeId),
|
|
154
|
-
source
|
|
313
|
+
source,
|
|
155
314
|
initialization: value.initialization as IRuntimeLocalStorageClaim['initialization'],
|
|
156
315
|
initialOwnership: value.initialOwnership === null ? null : ownershipOf(value.initialOwnership),
|
|
157
316
|
mount: mountOf(value.mount),
|