@foss.global/gitmanager 2.11.0 → 2.12.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 +19 -0
- package/dist_rust/rustgitmanager_linux_amd64 +0 -0
- package/dist_rust/rustgitmanager_linux_amd64.tsrust-build.json +4 -4
- package/dist_rust/rustgitmanager_linux_arm64 +0 -0
- package/dist_rust/rustgitmanager_linux_arm64.tsrust-build.json +4 -4
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.gitmanager.d.ts +14 -0
- package/dist_ts/classes.gitmanager.js +35 -4
- package/dist_ts/classes.gitmanagererror.js +3 -1
- package/dist_ts/models.d.ts +13 -4
- package/package.json +2 -2
- package/readme.md +4 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.gitmanager.ts +35 -3
- package/ts/classes.gitmanagererror.ts +2 -0
- package/ts/models.ts +15 -4
package/changelog.md
CHANGED
|
@@ -1,5 +1,24 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-11-15 - 2.12.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- `pushRefs()` takes `connectAddress` (`IGitManagerAtomicPushRequest` from `@foss.global/interfaces` 3.7.0): an `https` push connects to that IP address, directly and never through a proxy, instead of the address DNS gives for `remoteUrl`'s host.
|
|
8
|
+
- Git gets `http.curloptResolve=<host>:<port>:<address>` (the URL's port or 443, an IPv6 address in brackets), an empty `http.proxy` and `http.followRedirects=false`, also without a credential, because a redirect to another host would be resolved through DNS, and reads no global or system Git config, so neither an inherited proxy nor a URL-specific entry such as `http.<url>.proxy` resolves the host instead. The Host header, the TLS server name and the certificate check stay `remoteUrl`'s host.
|
|
9
|
+
- Refused before anything runs, and nothing is pushed: with an `sshKey` credential or a `remoteUrl` that is not `https` as `remoteTransportMismatch`; with a `remoteUrl` host that is not a DNS name of ASCII letters, digits, hyphens and dots (an IP address, a host that ends in a number such as `2130706433`, a trailing dot, a percent-encoded or non-ASCII name), or with an address that is not an IPv4 or IPv6 address (IPv6 without brackets), as the new `invalidConnectAddress`.
|
|
10
|
+
- Git before 2.37 ignores `http.curloptResolve` and would push over DNS, so a push with `connectAddress` first runs `git --version` with the push's own command and environment and throws the new `connectAddressUnsupported`, before it reads the repository or connects, when that Git is older or does not tell its version.
|
|
11
|
+
- A `pushRefs()` request with a field the push does not know is refused, as a `TypeError` in the facade and with fixed text in the engine, instead of the field being dropped.
|
|
12
|
+
- Minor release. Upgrade: requires `@foss.global/interfaces` ^3.7.0 (from ^3.5.0). `TGitManagerErrorCode` gains `invalidConnectAddress` and `connectAddressUnsupported`; an exhaustive `switch` over the codes needs them. A push request with an unknown field, which was ignored, now throws. Rollback below this release ignores `connectAddress` and pushes over DNS; a consumer that sets it (the foss.global website S11 HTTPS push control on the direct origin) must be rolled back with it.
|
|
13
|
+
|
|
14
|
+
## 2026-11-15 - 2.11.1
|
|
15
|
+
|
|
16
|
+
### Fixes
|
|
17
|
+
|
|
18
|
+
- decide a Smart HTTP push by its whole body even when the bytes after the pack exceed Git's input pipe (receive gate)
|
|
19
|
+
- A complete pack followed by more trailing bytes than Git's stdin pipe holds now gets `413` when the body is over `maxRequestBodyBytes` and is admitted when it is within it, decided as soon as the body ends. It used to wait for the pre-receive hook's 30 s timeout and answer `200` "pre-receive hook declined"; no ref moved in either case.
|
|
20
|
+
- Trailing bytes that arrive more than 30 s after the pack still get `503` and move no ref.
|
|
21
|
+
|
|
3
22
|
## 2026-11-14 - 2.11.0
|
|
4
23
|
|
|
5
24
|
### Features
|
|
Binary file
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"format": "tsrust.build-provenance.v2",
|
|
3
|
-
"binarySha256": "
|
|
3
|
+
"binarySha256": "f4f30c04e3d3c3f95e52228ef4cc6732cb4288097b3ce4b71af3ab928970d33b",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@foss.global/gitmanager",
|
|
6
|
-
"projectVersion": "2.
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "2.12.0",
|
|
7
|
+
"gitCommit": "b8cd8355343224b1245363095b4add0f6188e865",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-11-
|
|
9
|
+
"builtAt": "2026-11-15T02:44:42.446Z",
|
|
10
10
|
"tsrustVersion": "1.3.1",
|
|
11
11
|
"binary": "rustgitmanager",
|
|
12
12
|
"target": "linux_amd64"
|
|
Binary file
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"format": "tsrust.build-provenance.v2",
|
|
3
|
-
"binarySha256": "
|
|
3
|
+
"binarySha256": "6e5cf02cbe7bf7ea9edc2873b48c797d7a5d5a8281460c2947e78ca958ad395d",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@foss.global/gitmanager",
|
|
6
|
-
"projectVersion": "2.
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "2.12.0",
|
|
7
|
+
"gitCommit": "b8cd8355343224b1245363095b4add0f6188e865",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-11-
|
|
9
|
+
"builtAt": "2026-11-15T02:46:36.175Z",
|
|
10
10
|
"tsrustVersion": "1.3.1",
|
|
11
11
|
"binary": "rustgitmanager",
|
|
12
12
|
"target": "linux_arm64"
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@foss.global/gitmanager',
|
|
6
|
-
version: '2.
|
|
6
|
+
version: '2.12.0',
|
|
7
7
|
description: 'Headless Git manager for the foss.global Git platform, with a TypeScript API and Rust engine.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx5QkFBeUI7SUFDL0IsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLCtGQUErRjtDQUM3RyxDQUFBIn0=
|
|
@@ -85,6 +85,20 @@ export declare class GitManager extends plugins.EventEmitter {
|
|
|
85
85
|
* runs. `remoteMessages` holds the remote's `remote:` lines, such as a
|
|
86
86
|
* hook's output, for every transport.
|
|
87
87
|
*
|
|
88
|
+
* `connectAddress` makes an `https` push connect to that IP address
|
|
89
|
+
* (IPv6 without brackets) on `remoteUrl`'s port, directly and never through
|
|
90
|
+
* a proxy, instead of the address DNS gives for `remoteUrl`'s host, and
|
|
91
|
+
* follows no redirect, which would lead to a host resolved through DNS; the
|
|
92
|
+
* Host header, the TLS server name and the certificate check stay the
|
|
93
|
+
* host's. It is refused before anything runs with `remoteTransportMismatch`
|
|
94
|
+
* with an `sshKey` credential or a `remoteUrl` that is not `https`, and
|
|
95
|
+
* with `invalidConnectAddress` when `remoteUrl`'s host is not a DNS name
|
|
96
|
+
* (an IP address, for one) or `connectAddress` is not an IP address. Git
|
|
97
|
+
* before 2.37 would ignore it and resolve the host, so the push first asks
|
|
98
|
+
* the Git it runs for its version and throws `connectAddressUnsupported`,
|
|
99
|
+
* before it reads the repository or connects, when that is older or
|
|
100
|
+
* unreadable. A field the push does not know is refused, never dropped.
|
|
101
|
+
*
|
|
88
102
|
* A ref that already holds its
|
|
89
103
|
* `newObjectId` is reported `ok` without its lease being checked; it is not
|
|
90
104
|
* changed, so `ok` never means the lease matched. Any refusal the remote
|
|
@@ -41,18 +41,35 @@ const assertRemoteTransferOptions = (optionsArg) => {
|
|
|
41
41
|
}
|
|
42
42
|
assertTransferLimits(optionsArg);
|
|
43
43
|
};
|
|
44
|
+
const atomicPushRequestFields = new Set([
|
|
45
|
+
'org',
|
|
46
|
+
'repo',
|
|
47
|
+
'remoteUrl',
|
|
48
|
+
'updates',
|
|
49
|
+
'credential',
|
|
50
|
+
'caCertificates',
|
|
51
|
+
'timeoutMs',
|
|
52
|
+
'connectAddress',
|
|
53
|
+
]);
|
|
44
54
|
/**
|
|
45
55
|
* Checks the options of a push, whose credential may also be an SSH key, as
|
|
46
|
-
* `assertRemoteTransferOptions` does
|
|
47
|
-
*
|
|
56
|
+
* `assertRemoteTransferOptions` does, and refuses a field the push does not
|
|
57
|
+
* know instead of dropping it. The engine validates the key, the host key,
|
|
58
|
+
* the URL and `connectAddress`.
|
|
48
59
|
*/
|
|
49
60
|
const assertAtomicPushOptions = (requestArg) => {
|
|
50
|
-
|
|
61
|
+
if (Object.keys(requestArg).some((key) => !atomicPushRequestFields.has(key))) {
|
|
62
|
+
throw new TypeError(`a push request has only the fields ${[...atomicPushRequestFields].join(', ')}`);
|
|
63
|
+
}
|
|
64
|
+
const { credential, connectAddress } = requestArg;
|
|
51
65
|
if (credential !== undefined
|
|
52
66
|
&& !isCredentialShape(credential, 'basic', basicCredentialFields)
|
|
53
67
|
&& !isCredentialShape(credential, 'sshKey', sshKeyCredentialFields)) {
|
|
54
68
|
throw new TypeError('credential must be { kind: "basic", username: string, password: string } or { kind: "sshKey", privateKey: string, hostKey: string }');
|
|
55
69
|
}
|
|
70
|
+
if (connectAddress !== undefined && typeof connectAddress !== 'string') {
|
|
71
|
+
throw new TypeError('connectAddress must be a string');
|
|
72
|
+
}
|
|
56
73
|
assertTransferLimits(requestArg);
|
|
57
74
|
};
|
|
58
75
|
/**
|
|
@@ -386,6 +403,20 @@ export class GitManager extends plugins.EventEmitter {
|
|
|
386
403
|
* runs. `remoteMessages` holds the remote's `remote:` lines, such as a
|
|
387
404
|
* hook's output, for every transport.
|
|
388
405
|
*
|
|
406
|
+
* `connectAddress` makes an `https` push connect to that IP address
|
|
407
|
+
* (IPv6 without brackets) on `remoteUrl`'s port, directly and never through
|
|
408
|
+
* a proxy, instead of the address DNS gives for `remoteUrl`'s host, and
|
|
409
|
+
* follows no redirect, which would lead to a host resolved through DNS; the
|
|
410
|
+
* Host header, the TLS server name and the certificate check stay the
|
|
411
|
+
* host's. It is refused before anything runs with `remoteTransportMismatch`
|
|
412
|
+
* with an `sshKey` credential or a `remoteUrl` that is not `https`, and
|
|
413
|
+
* with `invalidConnectAddress` when `remoteUrl`'s host is not a DNS name
|
|
414
|
+
* (an IP address, for one) or `connectAddress` is not an IP address. Git
|
|
415
|
+
* before 2.37 would ignore it and resolve the host, so the push first asks
|
|
416
|
+
* the Git it runs for its version and throws `connectAddressUnsupported`,
|
|
417
|
+
* before it reads the repository or connects, when that is older or
|
|
418
|
+
* unreadable. A field the push does not know is refused, never dropped.
|
|
419
|
+
*
|
|
389
420
|
* A ref that already holds its
|
|
390
421
|
* `newObjectId` is reported `ok` without its lease being checked; it is not
|
|
391
422
|
* changed, so `ok` never means the lease matched. Any refusal the remote
|
|
@@ -894,4 +925,4 @@ export class GitManager extends plugins.EventEmitter {
|
|
|
894
925
|
await Promise.all(services.map((service) => service.close()));
|
|
895
926
|
}
|
|
896
927
|
}
|
|
897
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.gitmanager.js","sourceRoot":"","sources":["../ts/classes.gitmanager.ts"],"names":[],"mappings":"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"}
|
|
928
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.gitmanager.js","sourceRoot":"","sources":["../ts/classes.gitmanager.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,8 @@ const gitManagerErrorCodes = new Set([
|
|
|
17
17
|
'remoteConnectionFailed',
|
|
18
18
|
'remoteProtocolError',
|
|
19
19
|
'remoteTransportMismatch',
|
|
20
|
+
'invalidConnectAddress',
|
|
21
|
+
'connectAddressUnsupported',
|
|
20
22
|
]);
|
|
21
23
|
export const isGitManagerErrorCode = (valueArg) => typeof valueArg === 'string' && gitManagerErrorCodes.has(valueArg);
|
|
22
24
|
/**
|
|
@@ -31,4 +33,4 @@ export class GitManagerError extends Error {
|
|
|
31
33
|
this.code = codeArg;
|
|
32
34
|
}
|
|
33
35
|
}
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5naXRtYW5hZ2VyZXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jbGFzc2VzLmdpdG1hbmFnZXJlcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLG9CQUFvQixHQUF3QixJQUFJLEdBQUcsQ0FBdUI7SUFDOUUsaUJBQWlCO0lBQ2pCLGdCQUFnQjtJQUNoQixpQkFBaUI7SUFDakIsd0JBQXdCO0lBQ3hCLHNCQUFzQjtJQUN0QixpQkFBaUI7SUFDakIscUJBQXFCO0lBQ3JCLHVCQUF1QjtJQUN2QixxQkFBcUI7SUFDckIsaUJBQWlCO0lBQ2pCLGdCQUFnQjtJQUNoQixzQkFBc0I7SUFDdEIsb0JBQW9CO0lBQ3BCLHlCQUF5QjtJQUN6Qix5QkFBeUI7SUFDekIsd0JBQXdCO0lBQ3hCLHFCQUFxQjtJQUNyQix5QkFBeUI7SUFDekIsdUJBQXVCO0lBQ3ZCLDJCQUEyQjtDQUM1QixDQUFDLENBQUM7QUFFSCxNQUFNLENBQUMsTUFBTSxxQkFBcUIsR0FBRyxDQUFDLFFBQWlCLEVBQW9DLEVBQUUsQ0FDM0YsT0FBTyxRQUFRLEtBQUssUUFBUSxJQUFJLG9CQUFvQixDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztBQUVyRTs7OztHQUlHO0FBQ0gsTUFBTSxPQUFPLGVBQWdCLFNBQVEsS0FBSztJQUd4QyxZQUFZLE9BQTZCLEVBQUUsVUFBa0IsRUFBRSxVQUF5QjtRQUN0RixLQUFLLENBQUMsVUFBVSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxJQUFJLEdBQUcsaUJBQWlCLENBQUM7UUFDOUIsSUFBSSxDQUFDLElBQUksR0FBRyxPQUFPLENBQUM7SUFDdEIsQ0FBQztDQUNGIn0=
|
package/dist_ts/models.d.ts
CHANGED
|
@@ -171,11 +171,20 @@ export interface IGitManagerArchiveInspection {
|
|
|
171
171
|
*
|
|
172
172
|
* - `remoteTransportMismatch`: a push's credential or options do not fit the
|
|
173
173
|
* transport of its `remoteUrl`: an `sshKey` credential without an
|
|
174
|
-
* `ssh://` URL, an `ssh://` URL without an `sshKey` credential,
|
|
175
|
-
* `caCertificates` with an `sshKey` credential
|
|
176
|
-
*
|
|
174
|
+
* `ssh://` URL, an `ssh://` URL without an `sshKey` credential,
|
|
175
|
+
* `caCertificates` with an `sshKey` credential, or a `connectAddress` with
|
|
176
|
+
* an `sshKey` credential or a `remoteUrl` that is not `https`. Refused
|
|
177
|
+
* before anything runs; nothing was pushed.
|
|
178
|
+
* - `invalidConnectAddress`: a push's `connectAddress` is not an IP address
|
|
179
|
+
* (IPv6 without brackets), or its `remoteUrl`'s host is not a DNS name the
|
|
180
|
+
* address could stand in for, such as an IP address. Refused before
|
|
181
|
+
* anything runs; nothing was pushed.
|
|
182
|
+
* - `connectAddressUnsupported`: the Git that would run a push with a
|
|
183
|
+
* `connectAddress` is older than 2.37, which ignores the address and
|
|
184
|
+
* resolves the host through DNS, or does not tell its version. Refused
|
|
185
|
+
* before the push reads its repository or connects; nothing was pushed.
|
|
177
186
|
*/
|
|
178
|
-
export type TGitManagerErrorCode = 'invalidObjectId' | 'objectNotFound' | 'objectNotCommit' | 'ancestryBudgetExceeded' | 'archiveLimitExceeded' | 'archiveRejected' | 'bundleLimitExceeded' | 'atomicPushUnsupported' | 'remoteLimitExceeded' | 'transferAborted' | 'repositoryBusy' | 'lfsScanLimitExceeded' | 'sshHostKeyMismatch' | 'sshAuthenticationFailed' | 'remoteConnectionRefused' | 'remoteConnectionFailed' | 'remoteProtocolError' | 'remoteTransportMismatch';
|
|
187
|
+
export type TGitManagerErrorCode = 'invalidObjectId' | 'objectNotFound' | 'objectNotCommit' | 'ancestryBudgetExceeded' | 'archiveLimitExceeded' | 'archiveRejected' | 'bundleLimitExceeded' | 'atomicPushUnsupported' | 'remoteLimitExceeded' | 'transferAborted' | 'repositoryBusy' | 'lfsScanLimitExceeded' | 'sshHostKeyMismatch' | 'sshAuthenticationFailed' | 'remoteConnectionRefused' | 'remoteConnectionFailed' | 'remoteProtocolError' | 'remoteTransportMismatch' | 'invalidConnectAddress' | 'connectAddressUnsupported';
|
|
179
188
|
export interface IGitManagerRepositoryLfsPointer {
|
|
180
189
|
oid: string;
|
|
181
190
|
sizeBytes: number;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@foss.global/gitmanager",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.12.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Headless Git manager for the foss.global Git platform, with a TypeScript API and Rust engine.",
|
|
6
6
|
"exports": {
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"author": "Task Venture Capital GmbH",
|
|
11
11
|
"license": "MIT",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@foss.global/interfaces": "^3.
|
|
13
|
+
"@foss.global/interfaces": "^3.7.0",
|
|
14
14
|
"@push.rocks/smartrust": "^1.7.0"
|
|
15
15
|
},
|
|
16
16
|
"devDependencies": {
|
package/readme.md
CHANGED
|
@@ -190,6 +190,7 @@ await gitManager.setDefaultBranch({ org: 'mirror.org', repo: 'interfaces', defau
|
|
|
190
190
|
- Each `newObjectId` must be in the managed repository; a missing one throws a `GitManagerError` with code `objectNotFound` before any connection. A push holds one or more updates of distinct full ref names under `refs/`; object IDs are full lowercase hexadecimal. GitManager sets no limit on the number of updates and never splits a push. It reads at most 128 MiB of the remote helper's output per push (the remote's ref listing and one status line per listed or pushed ref) and at most 64 KiB per line, and throws when the helper writes more. A remote that refuses the push request as too large (HTTP 413) makes `pushRefs()` throw a `GitManagerError` with code `remoteLimitExceeded`; nothing was pushed.
|
|
191
191
|
- URL policy, enforced by GitManager: `https://`, or `http://` only to a loopback IP literal in its canonical spelling, `127.0.0.0/8` as four decimal octets without leading zeros or exactly `[::1]`. Other spellings of a loopback address (an uppercase scheme, octal, hexadecimal or single-integer forms, a trailing dot, other IPv6 forms) are refused rather than normalized, so Git receives exactly the URL the policy checked. Host names over `http`, `localhost` included, are refused, because a credential sent over plain `http` to a name would go wherever that name resolves. `git://`, `file://`, `ext::`, local paths, scp-like URLs and URLs with user information are refused. `ssh://` is the transport of an `sshKey` credential and of nothing else (see [SSH pushes](#ssh-pushes)): an `ssh://` URL without an `sshKey` credential, an `sshKey` credential with any other URL, and `caCertificates` with an `sshKey` credential throw a `GitManagerError` with code `remoteTransportMismatch`. The policy runs before any process starts, and its errors never quote the URL.
|
|
192
192
|
- The credential, `caCertificates` and `timeoutMs` behave as for mirrors: the credential travels only in the Git process environment as an `Authorization` header, with no credential helper, no hooks, no redirects and no global or system Git config; error text replaces the remote URL with `<push-remote>`. The remote URL is never stored in the repository.
|
|
193
|
+
- `connectAddress`, an IPv4 or IPv6 address (IPv6 without brackets), makes an `https` push connect to that address instead of the one DNS gives for `remoteUrl`'s host, on `remoteUrl`'s port (443 when it names none), directly and never through a proxy: Git gets `http.curloptResolve=<host>:<port>:<address>`, an empty `http.proxy`, `http.followRedirects=false` (with or without a credential, since a redirect to another host would be resolved through DNS) and no global or system Git config, whose URL-specific entries would outrank both. The Host header, the TLS server name and the certificate check stay `remoteUrl`'s host, so the address has to serve a certificate for that name. It is refused before anything runs, and nothing is pushed: with an `sshKey` credential or a `remoteUrl` that is not `https` as `remoteTransportMismatch`; with a host that is not a DNS name of ASCII letters, digits, hyphens and dots (an IP address, a host that ends in a number such as `2130706433`, a trailing dot, a percent-encoded or non-ASCII name), or with an address that is not an IP address, as `invalidConnectAddress`. Git before 2.37 ignores `http.curloptResolve` and would resolve the host through DNS, so the push first runs `git --version` with its own command and environment and throws `connectAddressUnsupported`, before it reads the repository or connects, when that Git is older or does not tell its version. `importMirror()` and `refreshMirror()` have no such option. A push request with a field `pushRefs()` does not know is refused rather than the field being dropped.
|
|
193
194
|
- `{ signal }` aborts a push as described in [Cancellation, concurrency and stop](#cancellation-concurrency-and-stop). An abort before the updates are sent (the signal already aborted, or an abort during the local object check or the remote ref listing) changes nothing anywhere. An abort after that rejects with `transferAborted` as well, but the remote may have applied the push: the remote applies an atomic push completely or not at all, and the abort can land before or after it did. Read the remote refs again before retrying.
|
|
194
195
|
- A loopback `http` push never goes through a proxy, so the credential cannot leave the machine; see the proxy note above.
|
|
195
196
|
### SSH pushes
|
|
@@ -327,7 +328,7 @@ All numeric options must be integers.
|
|
|
327
328
|
- `gracefulShutdownMs`: `10,000`; accepted range 100–60,000.
|
|
328
329
|
- `privateRead.trustedIngressToken`: required when trusted private reads are enabled; 32–512 non-whitespace characters.
|
|
329
330
|
- `receivePack.trustedIngressToken`: required when receive-pack is enabled; 32–512 non-whitespace characters.
|
|
330
|
-
- `receivePack.maxRequestBodyBytes`: 4 GiB; accepted range 1 KiB–16 TiB. Request bodies are streamed and counted. A declared `Content-Length` above the limit is answered with `413` before Git starts. A streamed body that exceeds it is answered with `413` as well: the response status is decided only after the request body has
|
|
331
|
+
- `receivePack.maxRequestBodyBytes`: 4 GiB; accepted range 1 KiB–16 TiB. Request bodies are streamed and counted. A declared `Content-Length` above the limit is answered with `413` before Git starts. A streamed body that exceeds it is answered with `413` as well: the response status is decided only after the whole request body has been read and counted (Git reads no more of it once its pre-receive hook runs, so the rest is counted without passing it to Git, however large it is), the Git process tree is killed at once, and the private pre-receive hook admits ref updates only after the transfer supervisor confirmed the complete body within the limit. An over-limit push therefore never updates a ref, even when Git has already read a complete pack before the excess bytes arrive. The rest of a rejected body is read for up to 1 MiB or 2 seconds so the client receives the `413`.
|
|
331
332
|
|
|
332
333
|
While the service is running, access can be replaced atomically:
|
|
333
334
|
|
|
@@ -519,7 +520,7 @@ try {
|
|
|
519
520
|
- `GitManager.importMirror()`: imports a remote repository with `git clone --mirror`. Supported remote forms are `https://`, `http://`, `ssh://`, `git://`, `file://`, and SCP-like `git@host:org/repo.git` URLs.
|
|
520
521
|
- `GitManager.refreshMirror()`: atomically fetches and verifies the configured mirror source and mirrors its default branch.
|
|
521
522
|
- `GitManager.importMirror()` and `GitManager.refreshMirror()` accept a `credential`, `caCertificates` and `timeoutMs`; see [Credentialed mirrors and repository size](#credentialed-mirrors-and-repository-size).
|
|
522
|
-
- `GitManager.pushRefs()`: pushes leased ref updates to an `https` or loopback-IP `http` remote, or with an `sshKey` credential to an `ssh://` remote, as one atomic transaction and returns the remote's messages; see [Atomic pushes and the default branch](#atomic-pushes-and-the-default-branch) and [SSH pushes](#ssh-pushes).
|
|
523
|
+
- `GitManager.pushRefs()`: pushes leased ref updates to an `https` remote, optionally at a pinned `connectAddress`, or a loopback-IP `http` remote, or with an `sshKey` credential to an `ssh://` remote, as one atomic transaction and returns the remote's messages; see [Atomic pushes and the default branch](#atomic-pushes-and-the-default-branch) and [SSH pushes](#ssh-pushes).
|
|
523
524
|
- `GitManager.importMirror(request, { signal? })`, `GitManager.refreshMirror(request, { signal? })` and `GitManager.pushRefs(request, { signal? })` run concurrently with other commands, hold mirror repositories against writes (`repositoryBusy`) and reject with `transferAborted` when aborted; see [Cancellation, concurrency and stop](#cancellation-concurrency-and-stop).
|
|
524
525
|
- `GitManager.setDefaultBranch()`: points a repository's HEAD at an existing branch, or with `allowUnborn` at one a later push creates.
|
|
525
526
|
- `GitManager.getRepositorySize()`: returns the exact object count, uncompressed object bytes and on-disk object storage bytes of a repository.
|
|
@@ -572,7 +573,7 @@ pnpm run test:rust
|
|
|
572
573
|
pnpm run build
|
|
573
574
|
```
|
|
574
575
|
|
|
575
|
-
`pnpm test` runs the `pretest` hook first, which builds the Rust binaries with `rsrepo`, and then runs lifecycle, bounded readiness, local mirror/read API, raw upload-pack/receive-pack preparation, clone/fetch denial, trusted receive-pack denial, explicit policy initialization, protected create/delete/non-fast-forward enforcement, inherited self-test hardening, restart replay, and real push tests through `smartrust`. `test/test.refinventory.node.ts` covers every ref namespace, peeled and nested tags, symbolic and dangling symbolic refs, unborn HEAD, prefix selection and exact lookup, ref names that are not valid UTF-8, pagination of 1,001 refs, stale and foreign cursors, 50,000 loose and packed refs, and a bundle round trip across namespaces. `test/test.pushlimits.node.ts` covers fixed-length and chunked Smart HTTP pushes over the limit, a complete pack followed by late excess bytes, an over-limit SSH-style receive-pack, an SSH-style receive-pack cut after Git already moved a ref (the update stays), and a bounded `stop()` while a service's output is never read, the rejected cases proving the refs unchanged, no Git or hook process left, no uncaught stream error, the engine serving, and a later push succeeding. `test/test.repositorybundles.node.ts` covers bundles of a repository whose only refs are notes and of one without its default branch (restored with HEAD on the unborn default branch), the refusal of a repository without refs, `bundleLimitExceeded` leaving no file, `replaceRepository()` with a bundle and without one, and a failed replacement that keeps the live repository and leaves no scratch. `test/test.protectedrefs.node.ts` covers `evaluateProtectedRefUpdates()` for every rule, unprotected refs, missing old objects and invalid requests, names the one protected ref among 1,003 updates and counts the engine's Git processes through a PATH wrapper (3 for one protected update, 66 for 64 protected updates on a 2,000-commit history with 500 tags), pins the pre-receive hook's decline messages over Smart HTTP, shows that the hook refuses an update and a deletion naming a missing old object even where the rule allows force pushes and deletions, and renames a default branch in one atomic Smart HTTP push after `setDefaultBranch()` with `allowUnborn` (refused while HEAD names the deleted branch, HEAD left unborn by a declined push and recovered without the flag, a missing branch still refused without it). `test/test.ancestry.node.ts` covers ancestors, the reverse direction, siblings, merges, unrelated histories, the same commit, invalid, missing and non-commit objects, a budget exceeded on a 20,000-commit history next to the exact answer, and a stalled walk whose Git process is killed. `test/test.remotetransfer.node.ts` serves fixtures through `git http-backend` over HTTPS with a private CA and over plain HTTP on `127.0.0.1` and `[::1]`, and covers credentialed mirror imports and refreshes, the source default branch on import and refresh, `setDefaultBranch()`, the push URL policy, atomic creates, updates and deletes, stale leases that change no ref, a remote without the `atomic` capability, 5,000 creates and 5,000 deletes in one receive-pack request with no command line naming a ref, a stale lease on the last of 1,500 updates that changes no ref, a pre-receive hook that declines a push and an update hook that declines one ref (the others failing as collateral), with their `remoteMessages`, the `reason` of every ref that is not `ok`, and the credential staying out of every command line, error and file. Its fixture can hold or refuse a receive-pack request, which covers a ref that moves between the listing and the push (the remote fails all 1,500 updates) and a `413` answer (`remoteLimitExceeded`, no ref changed). It can also withhold pack requests to stall a transfer midway, which covers aborting an import (no repository or scratch left), a refresh (refs and HEAD unchanged) and a push, a push aborted before it sends its updates that changes nothing, other commands and transfers completing while transfers stall, `repositoryBusy` (including `replaceRepository()`) and the Smart HTTP `503` while a mirror refreshes, an atomic refresh that prunes nothing when one ref update fails, a refresh that times out inside its ref transaction without leaving lock files, a refresh refused during a Smart HTTP push, the receive-pack guard ticket (refused while held, admitted after release, idempotent release, released by `stop()`, released when its preparation times out on the bridge after the engine issued it), a bounded `stop()` during a stalled transfer, and a credentialed loopback `http` push that never reaches the `http_proxy`, `all_proxy` and `ALL_PROXY` set in the engine's environment. `test/test.sshpush.node.ts` needs `/usr/sbin/sshd`, `ssh`, `ssh-keygen` and `git-shell`: it starts an unprivileged `sshd` on `127.0.0.1` whose authorized keys run `git-shell`, and records every `ssh` and `git` command line through PATH wrappers. It pins the OpenSSH client texts the engine classifies against the system `ssh`, and covers an accepted push with the key only as a `0600` file in a `0700` directory that is gone afterwards, leased updates and deletes, a stale lease and an up-to-date ref decided without `send-pack`, a PEM RSA key, a declining hook (`hook-declined` with the nonce in `remoteMessages`), the bounds, truncation marker and redaction of `remoteMessages`, `sshHostKeyMismatch` before the key is offered, an unoffered host key type, `sshAuthenticationFailed`, `remoteConnectionRefused`, `remoteProtocolError` for a missing repository, `atomicPushUnsupported`, the refusals of URLs, users, hosts, paths, keys and transport mismatches before `ssh` runs, an abort while `ssh` runs (directory removed), the startup sweep of a stale key directory, and no key text in any command line, error or engine log. `test/test.archiveinspection.node.ts` runs every ci-spec archive conformance vector through `inspectArchive()` as bytes and as a chunked stream, the compressed limit at its boundary, an 8 MiB streamed archive, an early refusal that closes the source, and abort, source failure and `stop()` during an inspection.
|
|
576
|
+
`pnpm test` runs the `pretest` hook first, which builds the Rust binaries with `rsrepo`, and then runs lifecycle, bounded readiness, local mirror/read API, raw upload-pack/receive-pack preparation, clone/fetch denial, trusted receive-pack denial, explicit policy initialization, protected create/delete/non-fast-forward enforcement, inherited self-test hardening, restart replay, and real push tests through `smartrust`. `test/test.refinventory.node.ts` covers every ref namespace, peeled and nested tags, symbolic and dangling symbolic refs, unborn HEAD, prefix selection and exact lookup, ref names that are not valid UTF-8, pagination of 1,001 refs, stale and foreign cursors, 50,000 loose and packed refs, and a bundle round trip across namespaces. `test/test.pushlimits.node.ts` covers fixed-length and chunked Smart HTTP pushes over the limit, a complete pack followed by late excess bytes, a complete pack followed by more bytes than Git's input pipe holds (`413` over the limit, admitted within it, both decided as soon as the body ends), an over-limit SSH-style receive-pack, an SSH-style receive-pack cut after Git already moved a ref (the update stays), and a bounded `stop()` while a service's output is never read, the rejected cases proving the refs unchanged, no Git or hook process left, no uncaught stream error, the engine serving, and a later push succeeding. `test/test.repositorybundles.node.ts` covers bundles of a repository whose only refs are notes and of one without its default branch (restored with HEAD on the unborn default branch), the refusal of a repository without refs, `bundleLimitExceeded` leaving no file, `replaceRepository()` with a bundle and without one, and a failed replacement that keeps the live repository and leaves no scratch. `test/test.protectedrefs.node.ts` covers `evaluateProtectedRefUpdates()` for every rule, unprotected refs, missing old objects and invalid requests, names the one protected ref among 1,003 updates and counts the engine's Git processes through a PATH wrapper (3 for one protected update, 66 for 64 protected updates on a 2,000-commit history with 500 tags), pins the pre-receive hook's decline messages over Smart HTTP, shows that the hook refuses an update and a deletion naming a missing old object even where the rule allows force pushes and deletions, and renames a default branch in one atomic Smart HTTP push after `setDefaultBranch()` with `allowUnborn` (refused while HEAD names the deleted branch, HEAD left unborn by a declined push and recovered without the flag, a missing branch still refused without it). `test/test.ancestry.node.ts` covers ancestors, the reverse direction, siblings, merges, unrelated histories, the same commit, invalid, missing and non-commit objects, a budget exceeded on a 20,000-commit history next to the exact answer, and a stalled walk whose Git process is killed. `test/test.remotetransfer.node.ts` serves fixtures through `git http-backend` over HTTPS with a private CA and over plain HTTP on `127.0.0.1` and `[::1]`, and covers credentialed mirror imports and refreshes, the source default branch on import and refresh, `setDefaultBranch()`, the push URL policy, atomic creates, updates and deletes, stale leases that change no ref, a remote without the `atomic` capability, 5,000 creates and 5,000 deletes in one receive-pack request with no command line naming a ref, a stale lease on the last of 1,500 updates that changes no ref, a pre-receive hook that declines a push and an update hook that declines one ref (the others failing as collateral), with their `remoteMessages`, the `reason` of every ref that is not `ok`, and the credential staying out of every command line, error and file. Its fixture can hold or refuse a receive-pack request, which covers a ref that moves between the listing and the push (the remote fails all 1,500 updates) and a `413` answer (`remoteLimitExceeded`, no ref changed). It can also withhold pack requests to stall a transfer midway, which covers aborting an import (no repository or scratch left), a refresh (refs and HEAD unchanged) and a push, a push aborted before it sends its updates that changes nothing, other commands and transfers completing while transfers stall, `repositoryBusy` (including `replaceRepository()`) and the Smart HTTP `503` while a mirror refreshes, an atomic refresh that prunes nothing when one ref update fails, a refresh that times out inside its ref transaction without leaving lock files, a refresh refused during a Smart HTTP push, the receive-pack guard ticket (refused while held, admitted after release, idempotent release, released by `stop()`, released when its preparation times out on the bridge after the engine issued it), a bounded `stop()` during a stalled transfer, and a credentialed loopback `http` push that never reaches the `http_proxy`, `all_proxy` and `ALL_PROXY` set in the engine's environment. `test/test.connectaddress.node.ts` serves a push target through `git http-backend` over HTTPS on `127.0.0.1` and `[::1]` with a private-CA certificate for a name under `.invalid`, which DNS never resolves: a push to that name fails without `connectAddress` and succeeds with `127.0.0.1`, with `::1` and with the name spelled in mixed case, a pinned push without a credential whose ref listing answers with a redirect to another name fails without following it, a push to another name at the same address fails the certificate check, a pinned push succeeds past `https_proxy`, `HTTPS_PROXY`, `all_proxy` and `ALL_PROXY` set in the engine's environment that an unpinned push goes to, and every refusal (`remoteTransportMismatch`, `invalidConnectAddress`, a `TypeError` for a malformed or unknown field) starts no process and sends no request; a PATH wrapper that answers `--version` as Git 2.36.6 shows `connectAddressUnsupported` before any other Git command. `test/test.sshpush.node.ts` needs `/usr/sbin/sshd`, `ssh`, `ssh-keygen` and `git-shell`: it starts an unprivileged `sshd` on `127.0.0.1` whose authorized keys run `git-shell`, and records every `ssh` and `git` command line through PATH wrappers. It pins the OpenSSH client texts the engine classifies against the system `ssh`, and covers an accepted push with the key only as a `0600` file in a `0700` directory that is gone afterwards, leased updates and deletes, a stale lease and an up-to-date ref decided without `send-pack`, a PEM RSA key, a declining hook (`hook-declined` with the nonce in `remoteMessages`), the bounds, truncation marker and redaction of `remoteMessages`, `sshHostKeyMismatch` before the key is offered, an unoffered host key type, `sshAuthenticationFailed`, `remoteConnectionRefused`, `remoteProtocolError` for a missing repository, `atomicPushUnsupported`, the refusals of URLs, users, hosts, paths, keys and transport mismatches before `ssh` runs, an abort while `ssh` runs (directory removed), the startup sweep of a stale key directory, and no key text in any command line, error or engine log. `test/test.archiveinspection.node.ts` runs every ci-spec archive conformance vector through `inspectArchive()` as bytes and as a chunked stream, the compressed limit at its boundary, an 8 MiB streamed archive, an early refusal that closes the source, and abort, source failure and `stop()` during an inspection.
|
|
576
577
|
|
|
577
578
|
## License and Legal Information
|
|
578
579
|
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/classes.gitmanager.ts
CHANGED
|
@@ -107,13 +107,28 @@ const assertRemoteTransferOptions = (optionsArg: IGitManagerRemoteTransferOption
|
|
|
107
107
|
assertTransferLimits(optionsArg);
|
|
108
108
|
};
|
|
109
109
|
|
|
110
|
+
const atomicPushRequestFields: ReadonlySet<string> = new Set<keyof IGitManagerAtomicPushRequest>([
|
|
111
|
+
'org',
|
|
112
|
+
'repo',
|
|
113
|
+
'remoteUrl',
|
|
114
|
+
'updates',
|
|
115
|
+
'credential',
|
|
116
|
+
'caCertificates',
|
|
117
|
+
'timeoutMs',
|
|
118
|
+
'connectAddress',
|
|
119
|
+
]);
|
|
120
|
+
|
|
110
121
|
/**
|
|
111
122
|
* Checks the options of a push, whose credential may also be an SSH key, as
|
|
112
|
-
* `assertRemoteTransferOptions` does
|
|
113
|
-
*
|
|
123
|
+
* `assertRemoteTransferOptions` does, and refuses a field the push does not
|
|
124
|
+
* know instead of dropping it. The engine validates the key, the host key,
|
|
125
|
+
* the URL and `connectAddress`.
|
|
114
126
|
*/
|
|
115
127
|
const assertAtomicPushOptions = (requestArg: IGitManagerAtomicPushRequest): void => {
|
|
116
|
-
|
|
128
|
+
if (Object.keys(requestArg).some((key) => !atomicPushRequestFields.has(key))) {
|
|
129
|
+
throw new TypeError(`a push request has only the fields ${[...atomicPushRequestFields].join(', ')}`);
|
|
130
|
+
}
|
|
131
|
+
const { credential, connectAddress } = requestArg;
|
|
117
132
|
if (
|
|
118
133
|
credential !== undefined
|
|
119
134
|
&& !isCredentialShape(credential, 'basic', basicCredentialFields)
|
|
@@ -123,6 +138,9 @@ const assertAtomicPushOptions = (requestArg: IGitManagerAtomicPushRequest): void
|
|
|
123
138
|
'credential must be { kind: "basic", username: string, password: string } or { kind: "sshKey", privateKey: string, hostKey: string }',
|
|
124
139
|
);
|
|
125
140
|
}
|
|
141
|
+
if (connectAddress !== undefined && typeof connectAddress !== 'string') {
|
|
142
|
+
throw new TypeError('connectAddress must be a string');
|
|
143
|
+
}
|
|
126
144
|
assertTransferLimits(requestArg);
|
|
127
145
|
};
|
|
128
146
|
|
|
@@ -510,6 +528,20 @@ export class GitManager extends plugins.EventEmitter {
|
|
|
510
528
|
* runs. `remoteMessages` holds the remote's `remote:` lines, such as a
|
|
511
529
|
* hook's output, for every transport.
|
|
512
530
|
*
|
|
531
|
+
* `connectAddress` makes an `https` push connect to that IP address
|
|
532
|
+
* (IPv6 without brackets) on `remoteUrl`'s port, directly and never through
|
|
533
|
+
* a proxy, instead of the address DNS gives for `remoteUrl`'s host, and
|
|
534
|
+
* follows no redirect, which would lead to a host resolved through DNS; the
|
|
535
|
+
* Host header, the TLS server name and the certificate check stay the
|
|
536
|
+
* host's. It is refused before anything runs with `remoteTransportMismatch`
|
|
537
|
+
* with an `sshKey` credential or a `remoteUrl` that is not `https`, and
|
|
538
|
+
* with `invalidConnectAddress` when `remoteUrl`'s host is not a DNS name
|
|
539
|
+
* (an IP address, for one) or `connectAddress` is not an IP address. Git
|
|
540
|
+
* before 2.37 would ignore it and resolve the host, so the push first asks
|
|
541
|
+
* the Git it runs for its version and throws `connectAddressUnsupported`,
|
|
542
|
+
* before it reads the repository or connects, when that is older or
|
|
543
|
+
* unreadable. A field the push does not know is refused, never dropped.
|
|
544
|
+
*
|
|
513
545
|
* A ref that already holds its
|
|
514
546
|
* `newObjectId` is reported `ok` without its lease being checked; it is not
|
|
515
547
|
* changed, so `ok` never means the lease matched. Any refusal the remote
|
|
@@ -19,6 +19,8 @@ const gitManagerErrorCodes: ReadonlySet<string> = new Set<TGitManagerErrorCode>(
|
|
|
19
19
|
'remoteConnectionFailed',
|
|
20
20
|
'remoteProtocolError',
|
|
21
21
|
'remoteTransportMismatch',
|
|
22
|
+
'invalidConnectAddress',
|
|
23
|
+
'connectAddressUnsupported',
|
|
22
24
|
]);
|
|
23
25
|
|
|
24
26
|
export const isGitManagerErrorCode = (valueArg: unknown): valueArg is TGitManagerErrorCode =>
|
package/ts/models.ts
CHANGED
|
@@ -200,9 +200,18 @@ export interface IGitManagerArchiveInspection {
|
|
|
200
200
|
*
|
|
201
201
|
* - `remoteTransportMismatch`: a push's credential or options do not fit the
|
|
202
202
|
* transport of its `remoteUrl`: an `sshKey` credential without an
|
|
203
|
-
* `ssh://` URL, an `ssh://` URL without an `sshKey` credential,
|
|
204
|
-
* `caCertificates` with an `sshKey` credential
|
|
205
|
-
*
|
|
203
|
+
* `ssh://` URL, an `ssh://` URL without an `sshKey` credential,
|
|
204
|
+
* `caCertificates` with an `sshKey` credential, or a `connectAddress` with
|
|
205
|
+
* an `sshKey` credential or a `remoteUrl` that is not `https`. Refused
|
|
206
|
+
* before anything runs; nothing was pushed.
|
|
207
|
+
* - `invalidConnectAddress`: a push's `connectAddress` is not an IP address
|
|
208
|
+
* (IPv6 without brackets), or its `remoteUrl`'s host is not a DNS name the
|
|
209
|
+
* address could stand in for, such as an IP address. Refused before
|
|
210
|
+
* anything runs; nothing was pushed.
|
|
211
|
+
* - `connectAddressUnsupported`: the Git that would run a push with a
|
|
212
|
+
* `connectAddress` is older than 2.37, which ignores the address and
|
|
213
|
+
* resolves the host through DNS, or does not tell its version. Refused
|
|
214
|
+
* before the push reads its repository or connects; nothing was pushed.
|
|
206
215
|
*/
|
|
207
216
|
export type TGitManagerErrorCode =
|
|
208
217
|
| 'invalidObjectId'
|
|
@@ -222,7 +231,9 @@ export type TGitManagerErrorCode =
|
|
|
222
231
|
| 'remoteConnectionRefused'
|
|
223
232
|
| 'remoteConnectionFailed'
|
|
224
233
|
| 'remoteProtocolError'
|
|
225
|
-
| 'remoteTransportMismatch'
|
|
234
|
+
| 'remoteTransportMismatch'
|
|
235
|
+
| 'invalidConnectAddress'
|
|
236
|
+
| 'connectAddressUnsupported';
|
|
226
237
|
|
|
227
238
|
export interface IGitManagerRepositoryLfsPointer {
|
|
228
239
|
oid: string;
|