@push.rocks/smartlinuxrepo 1.1.0 → 1.1.1
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/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/debian/control.d.ts +7 -1
- package/dist_ts/debian/control.js +26 -4
- package/dist_ts/debian/indexbuilder.js +8 -10
- package/dist_ts/debian/rules.d.ts +7 -0
- package/dist_ts/debian/rules.js +20 -1
- package/dist_ts/shared/architecture.d.ts +5 -1
- package/dist_ts/shared/architecture.js +6 -2
- package/package.json +1 -1
- package/readme.md +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/debian/control.ts +25 -3
- package/ts/debian/indexbuilder.ts +11 -9
- package/ts/debian/rules.ts +21 -0
- package/ts/shared/architecture.ts +5 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartlinuxrepo',
|
|
6
|
-
version: '1.1.
|
|
6
|
+
version: '1.1.1',
|
|
7
7
|
description: 'A pure codec for Linux package repositories (Alpine apk, Debian apt, RPM dnf, Arch pacman): read packages into records, build index file sets and sign them.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSw0QkFBNEI7SUFDbEMsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLDhKQUE4SjtDQUM1SyxDQUFBIn0=
|
|
@@ -15,6 +15,12 @@ export interface IDebianControl {
|
|
|
15
15
|
* verbatim, and the Depends text split on `,` (`['']` when there is none).
|
|
16
16
|
*
|
|
17
17
|
* Gitea's scanner refuses lines over 64 KiB; the codec accepts lines up to
|
|
18
|
-
* `maxLineBytes` (`maxHeaderBytes`), which is at least that.
|
|
18
|
+
* `maxLineBytes` (`maxHeaderBytes`), which is at least that. A version that
|
|
19
|
+
* matches Gitea's pattern but holds `/` or `?` (both inside the revision's
|
|
20
|
+
* range) is refused with `invalid-field` (`Version`): no pool file name can
|
|
21
|
+
* hold it (`hasPoolFileNameRefusedCharacter`), where Gitea accepts the upload
|
|
22
|
+
* and then cannot serve it. An Architecture that fails `isIndexableArchitecture`
|
|
23
|
+
* or `hasPoolFileNameRefusedCharacter` (decoded) is refused with
|
|
24
|
+
* `invalid-field` (`Architecture`), where Gitea accepts any non-empty value.
|
|
19
25
|
*/
|
|
20
26
|
export declare function parseDebianControlFile(bytesArg: Uint8Array, maxLineBytesArg: number): IDebianControl;
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { isIndexableArchitecture } from '../shared/architecture.js';
|
|
1
2
|
import { LinuxRepoError, limitExceeded } from '../shared/errors.js';
|
|
2
3
|
import { isValidUrl } from '../shared/url.js';
|
|
3
4
|
import { fromByteString, goTrimSpace, toByteString } from './gostring.js';
|
|
5
|
+
import { hasPoolFileNameRefusedCharacter } from './rules.js';
|
|
4
6
|
import { parseMailAddress } from './mailaddress.js';
|
|
5
7
|
/**
|
|
6
8
|
* Gitea 28.2.0 `modules/packages/debian/metadata.go` patterns. In both Go and
|
|
@@ -19,7 +21,13 @@ const VERSION_PATTERN = /^(?:(0|[1-9][0-9]*):)?[a-zA-Z0-9.+~]+(?:-[a-zA-Z0-9.+-~
|
|
|
19
21
|
* verbatim, and the Depends text split on `,` (`['']` when there is none).
|
|
20
22
|
*
|
|
21
23
|
* Gitea's scanner refuses lines over 64 KiB; the codec accepts lines up to
|
|
22
|
-
* `maxLineBytes` (`maxHeaderBytes`), which is at least that.
|
|
24
|
+
* `maxLineBytes` (`maxHeaderBytes`), which is at least that. A version that
|
|
25
|
+
* matches Gitea's pattern but holds `/` or `?` (both inside the revision's
|
|
26
|
+
* range) is refused with `invalid-field` (`Version`): no pool file name can
|
|
27
|
+
* hold it (`hasPoolFileNameRefusedCharacter`), where Gitea accepts the upload
|
|
28
|
+
* and then cannot serve it. An Architecture that fails `isIndexableArchitecture`
|
|
29
|
+
* or `hasPoolFileNameRefusedCharacter` (decoded) is refused with
|
|
30
|
+
* `invalid-field` (`Architecture`), where Gitea accepts any non-empty value.
|
|
23
31
|
*/
|
|
24
32
|
export function parseDebianControlFile(bytesArg, maxLineBytesArg) {
|
|
25
33
|
const text = toByteString(bytesArg);
|
|
@@ -108,7 +116,10 @@ export function parseDebianControlFile(bytesArg, maxLineBytesArg) {
|
|
|
108
116
|
if (version === '') {
|
|
109
117
|
throw new LinuxRepoError('missing-field', 'the control file has no Version field', { field: 'Version' });
|
|
110
118
|
}
|
|
111
|
-
|
|
119
|
+
// a departure from Gitea's version pattern: the revision range admits
|
|
120
|
+
// `/` and `?`, which the pool file name cannot hold, so the version is
|
|
121
|
+
// refused here rather than by buildDebianIndex
|
|
122
|
+
if (!VERSION_PATTERN.test(version) || hasPoolFileNameRefusedCharacter(version)) {
|
|
112
123
|
throw new LinuxRepoError('invalid-field', 'the package version is invalid', {
|
|
113
124
|
field: 'Version',
|
|
114
125
|
value: fromByteString(version),
|
|
@@ -119,10 +130,21 @@ export function parseDebianControlFile(bytesArg, maxLineBytesArg) {
|
|
|
119
130
|
field: 'Architecture',
|
|
120
131
|
});
|
|
121
132
|
}
|
|
133
|
+
// a departure from Gitea, which accepts any non-empty Architecture: the
|
|
134
|
+
// file name embeds it, so it must pass the builder's rules; checked on the
|
|
135
|
+
// decoded text the record carries (on the byte string, `\s` and `\p{Cc}`
|
|
136
|
+
// would match the UTF-8 continuation bytes 0x85 and 0xA0)
|
|
137
|
+
const decodedArchitecture = fromByteString(architecture);
|
|
138
|
+
if (!isIndexableArchitecture(decodedArchitecture) || hasPoolFileNameRefusedCharacter(decodedArchitecture)) {
|
|
139
|
+
throw new LinuxRepoError('invalid-field', 'the package architecture cannot name an index path or pool file', {
|
|
140
|
+
field: 'Architecture',
|
|
141
|
+
value: decodedArchitecture,
|
|
142
|
+
});
|
|
143
|
+
}
|
|
122
144
|
return {
|
|
123
145
|
name,
|
|
124
146
|
version,
|
|
125
|
-
architecture:
|
|
147
|
+
architecture: decodedArchitecture,
|
|
126
148
|
metadata: {
|
|
127
149
|
control: fromByteString(goTrimSpace(control)),
|
|
128
150
|
maintainer: fromByteString(maintainer),
|
|
@@ -132,4 +154,4 @@ export function parseDebianControlFile(bytesArg, maxLineBytesArg) {
|
|
|
132
154
|
},
|
|
133
155
|
};
|
|
134
156
|
}
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJvbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2RlYmlhbi9jb250cm9sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3BFLE9BQU8sRUFBRSxjQUFjLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDcEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTlDLE9BQU8sRUFBRSxjQUFjLEVBQUUsV0FBVyxFQUFFLFlBQVksRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMxRSxPQUFPLEVBQUUsK0JBQStCLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDN0QsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQ7Ozs7R0FJRztBQUNILE1BQU0sWUFBWSxHQUFHLHdCQUF3QixDQUFDO0FBQzlDLE1BQU0sZUFBZSxHQUFHLDhEQUE4RCxDQUFDO0FBU3ZGOzs7Ozs7Ozs7Ozs7Ozs7OztHQWlCRztBQUNILE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxRQUFvQixFQUFFLGVBQXVCO0lBQ2xGLE1BQU0sSUFBSSxHQUFHLFlBQVksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNwQyxJQUFJLElBQUksR0FBRyxFQUFFLENBQUM7SUFDZCxJQUFJLE9BQU8sR0FBRyxFQUFFLENBQUM7SUFDakIsSUFBSSxZQUFZLEdBQUcsRUFBRSxDQUFDO0lBQ3RCLElBQUksVUFBVSxHQUFHLEVBQUUsQ0FBQztJQUNwQixJQUFJLFVBQVUsR0FBRyxFQUFFLENBQUM7SUFDcEIsSUFBSSxHQUFHLEdBQUcsRUFBRSxDQUFDO0lBQ2IsSUFBSSxPQUFPLEdBQUcsRUFBRSxDQUFDO0lBQ2pCLElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQztJQUNqQixJQUFJLFdBQVcsR0FBRyxFQUFFLENBQUM7SUFFckIsSUFBSSxNQUFNLEdBQUcsQ0FB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
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
2
|
import { isIndexableArchitecture } from '../shared/architecture.js';
|
|
3
3
|
import { LinuxRepoError } from '../shared/errors.js';
|
|
4
|
-
import {
|
|
4
|
+
import { assertString, assertTimestamp } from '../shared/validation.js';
|
|
5
5
|
import { createCleartextSignedMessage, createDetachedArmoredSignature } from '../signing/openpgpframing.js';
|
|
6
6
|
import { compareUtf8, goTrimSpace, utf8ByteString } from './gostring.js';
|
|
7
|
-
import { DEBIAN_SYMBOL_PATTERN, isDebianReleaseValue, isDebianSymbol } from './rules.js';
|
|
7
|
+
import { DEBIAN_SYMBOL_PATTERN, hasPoolFileNameRefusedCharacter, isDebianReleaseValue, isDebianSymbol } from './rules.js';
|
|
8
8
|
/** The fields the `Packages` stanza writes itself; a control file's own copies are dropped. */
|
|
9
9
|
const INDEX_OWNED_FIELDS = new Set(['filename', 'size', 'md5sum', 'sha1', 'sha256', 'sha512']);
|
|
10
10
|
const PACKAGES_FILES = ['Packages', 'Packages.gz', 'Packages.xz'];
|
|
@@ -196,7 +196,8 @@ export function renderDebianPackagesStanza(input) {
|
|
|
196
196
|
}
|
|
197
197
|
/**
|
|
198
198
|
* Refuses a record the index cannot list: wrong format, an architecture that
|
|
199
|
-
* is not a path segment, a file name
|
|
199
|
+
* is not a path segment, a file name apt cannot fetch as one pool path
|
|
200
|
+
* segment (`hasPoolFileNameRefusedCharacter`), digests that are not
|
|
200
201
|
* hex of the right length, or a control text that is not one stanza (empty,
|
|
201
202
|
* or holding a blank line that would start another stanza).
|
|
202
203
|
*/
|
|
@@ -207,12 +208,9 @@ function assertRecord(recordArg) {
|
|
|
207
208
|
if (!isIndexableArchitecture(recordArg.architecture)) {
|
|
208
209
|
throw new LinuxRepoError('invalid-input', `${String(recordArg.fileName)}: architecture "${String(recordArg.architecture)}" cannot name an index path`, { field: 'record.architecture', value: String(recordArg.fileName) });
|
|
209
210
|
}
|
|
210
|
-
|
|
211
|
-
if (
|
|
212
|
-
throw new LinuxRepoError('invalid-input', 'record.fileName must
|
|
213
|
-
field: 'record.fileName',
|
|
214
|
-
value: recordArg.fileName,
|
|
215
|
-
});
|
|
211
|
+
assertString(recordArg.fileName, 'record.fileName');
|
|
212
|
+
if (recordArg.fileName === '' || hasPoolFileNameRefusedCharacter(recordArg.fileName)) {
|
|
213
|
+
throw new LinuxRepoError('invalid-input', 'record.fileName must be non-empty and contain no "/", "#", "?", whitespace or control characters', { field: 'record.fileName', value: recordArg.fileName });
|
|
216
214
|
}
|
|
217
215
|
const digests = recordArg.digests;
|
|
218
216
|
if (digests === null || typeof digests !== 'object' || !Number.isSafeInteger(digests.size) || digests.size < 0) {
|
|
@@ -296,4 +294,4 @@ function formatRfc1123Utc(timestampArg) {
|
|
|
296
294
|
`${timestampArg.getUTCFullYear()} ${pad(timestampArg.getUTCHours())}:${pad(timestampArg.getUTCMinutes())}:` +
|
|
297
295
|
`${pad(timestampArg.getUTCSeconds())} UTC`);
|
|
298
296
|
}
|
|
299
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"indexbuilder.js","sourceRoot":"","sources":["../../ts/debian/indexbuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE3F,OAAO,EAAE,4BAA4B,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AAC5G,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEzF,+FAA+F;AAC/F,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;AAE/F,MAAM,cAAc,GAAG,CAAC,UAAU,EAAE,aAAa,EAAE,aAAa,CAAU,CAAC;AAE3E,MAAM,WAAW,GAA2B;IAC1C,QAAQ,EAAE,2BAA2B;IACrC,aAAa,EAAE,kBAAkB;IACjC,aAAa,EAAE,kBAAkB;IACjC,OAAO,EAAE,2BAA2B;IACpC,aAAa,EAAE,2BAA2B;IAC1C,SAAS,EAAE,2BAA2B;CACvC,CAAC;AAEF,MAAM,aAAa,GAAG;IACpB,GAAG,EAAE,gBAAgB;IACrB,IAAI,EAAE,gBAAgB;IACtB,MAAM,EAAE,gBAAgB;IACxB,MAAM,EAAE,iBAAiB;CAC1B,CAAC;AAQF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,KAOtC;IACC,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,MAAM,IAAI,cAAc,CAAC,eAAe,EAAE,yBAAyB,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3F,CAAC;IACD,YAAY,CAAC,KAAK,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IACjD,kBAAkB,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC3C,kBAAkB,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACzC,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACjC,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC9D,MAAM,IAAI,cAAc,CAAC,eAAe,EAAE,kCAAkC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IACrG,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,cAAc,CAAC,eAAe,EAAE,0BAA0B,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAC9F,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,GAAG,EAAqF,CAAC;IAC5G,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClC,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAChD,MAAM,IAAI,cAAc,CAAC,eAAe,EAAE,8BAA8B,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAClG,CAAC;QACD,YAAY,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC3C,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3B,MAAM,QAAQ,GAAG,GAAG,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC/D,IAAI,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,cAAc,CAAC,eAAe,EAAE,+BAA+B,KAAK,CAAC,YAAY,IAAI,QAAQ,EAAE,EAAE;gBACzG,KAAK,EAAE,SAAS;gBAChB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ;aAC7B,CAAC,CAAC;QACL,CAAC;QACD,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,GAAG,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QACpE,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,KAAK,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YAC7F,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC9B,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,YAAY,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAC5C,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,YAAY,CAAC,CAC/F,CAAC;IACF,MAAM,YAAY,GAAsB,EAAE,CAAC;IAC3C,MAAM,YAAY,GAA2D,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IAC3H,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;QACjC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO;aAC1B,KAAK,EAAE;aACP,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;aAClD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,0BAA0B,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACtI,yDAAyD;QACzD,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9D,MAAM,SAAS,GAAG,SAAS,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,SAAS,WAAW,KAAK,CAAC,YAAY,EAAE,CAAC;QAChG,MAAM,OAAO,GAAwD;YACnE,QAAQ,EAAE,QAAQ;YAClB,aAAa,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC;YACnC,aAAa,EAAE,IAAI,UAAU,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;SACxE,CAAC;QACF,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE,CAAC;YACtC,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;YAChC,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YAChC,MAAM,WAAW,GAAG,GAAG,KAAK,CAAC,SAAS,WAAW,KAAK,CAAC,YAAY,IAAI,QAAQ,EAAE,CAAC;YAClF,KAAK,MAAM,SAAS,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAU,EAAE,CAAC;gBACrE,YAAY,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,MAAM,IAAI,WAAW,EAAE,CAAC,CAAC;YACvF,CAAC;YACD,YAAY,CAAC,IAAI,CAAC;gBAChB,IAAI,EAAE,GAAG,SAAS,IAAI,QAAQ,EAAE;gBAChC,KAAK;gBACL,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAC;gBAChC,KAAK,EAAE,SAAS;gBAChB,OAAO,EAAE;oBACP,GAAG,SAAS,mBAAmB,MAAM,CAAC,GAAG,EAAE;oBAC3C,GAAG,SAAS,iBAAiB,MAAM,CAAC,IAAI,EAAE;oBAC1C,GAAG,SAAS,mBAAmB,MAAM,CAAC,MAAM,EAAE;oBAC9C,GAAG,SAAS,mBAAmB,MAAM,CAAC,MAAM,EAAE;iBAC/C;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,cAAc,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IAChF,MAAM,aAAa,GAAG,cAAc,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;IACtF,wBAAwB;IACxB,MAAM,OAAO,GACX,WAAW,KAAK,CAAC,MAAM,IAAI;QAC3B,UAAU,KAAK,CAAC,KAAK,IAAI;QACzB,UAAU,KAAK,CAAC,YAAY,IAAI;QAChC,aAAa,KAAK,CAAC,YAAY,IAAI;QACnC,eAAe,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI;QACvC,kBAAkB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI;QAC7C,SAAS,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI;QAC9C,wBAAwB;QACxB,YAAY,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;QAClE,UAAU,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;QACjE,YAAY,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;QACrE,YAAY,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;IACxE,MAAM,YAAY,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CACzC,MAAM,8BAA8B,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAC/G,CAAC;IACF,MAAM,SAAS,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CACxC,MAAM,4BAA4B,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CACxG,CAAC;IACF,MAAM,YAAY,GAAsB;QACtC,CAAC,SAAS,EAAE,YAAY,CAAC;QACzB,CAAC,aAAa,EAAE,UAAU,CAAC;QAC3B,CAAC,WAAW,EAAE,SAAS,CAAC;KACzB,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5B,IAAI,EAAE,SAAS,KAAK,CAAC,YAAY,IAAI,QAAkB,EAAE;QACzD,KAAK,EAAE,KAAmB;QAC1B,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAmB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;QACrF,SAAS,EAAE,WAAW,CAAC,QAAkB,CAAC;QAC1C,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,EAAE;KACZ,CAAC,CAAC,CAAC;IACJ,OAAO,CAAC,GAAG,YAAY,EAAE,GAAG,YAAY,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,0BAA0B,CAAC,KAI1C;IACC,YAAY,CAAC,KAAK,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IACjD,YAAY,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC3C,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC3B,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,4EAA4E;IAC5E,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9E,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YACxC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC;YACD,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAChC,MAAM,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACrF,QAAQ,GAAG,KAAK,KAAK,IAAI,IAAI,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC3D,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;QACnB,MAAM,IAAI,cAAc,CAAC,eAAe,EAAE,sEAAsE,EAAE;YAChH,KAAK,EAAE,yBAAyB;SACjC,CAAC,CAAC;IACL,CAAC;IACD,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC;IACjC,OAAO,CACL,GAAG,OAAO,IAAI;QACd,kBAAkB,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,IAAI;QACpF,SAAS,OAAO,CAAC,IAAI,IAAI;QACzB,WAAW,OAAO,CAAC,GAAG,IAAI;QAC1B,SAAS,OAAO,CAAC,IAAI,IAAI;QACzB,WAAW,OAAO,CAAC,MAAM,IAAI;QAC7B,WAAW,OAAO,CAAC,MAAM,IAAI,CAC9B,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,YAAY,CAAC,SAA+B;IACnD,IAAI,SAAS,KAAK,IAAI,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACzF,MAAM,IAAI,cAAc,CAAC,eAAe,EAAE,wCAAwC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC3G,CAAC;IACD,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,cAAc,CACtB,eAAe,EACf,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,mBAAmB,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,6BAA6B,EAC3G,EAAE,KAAK,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CACpE,CAAC;IACJ,CAAC;IACD,iBAAiB,CAAC,SAAS,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IACzD,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,cAAc,CAAC,eAAe,EAAE,6CAA6C,EAAE;YACvF,KAAK,EAAE,iBAAiB;YACxB,KAAK,EAAE,SAAS,CAAC,QAAQ;SAC1B,CAAC,CAAC;IACL,CAAC;IACD,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;IAClC,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC/G,MAAM,IAAI,cAAc,CAAC,eAAe,EAAE,yDAAyD,EAAE;YACnG,KAAK,EAAE,gBAAgB;SACxB,CAAC,CAAC;IACL,CAAC;IACD,KAAK,MAAM,SAAS,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAU,EAAE,CAAC;QACrE,IAAI,OAAO,OAAO,CAAC,SAAS,CAAC,KAAK,QAAQ,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;YACjG,MAAM,IAAI,cAAc,CAAC,eAAe,EAAE,kBAAkB,SAAS,wBAAwB,EAAE;gBAC7F,KAAK,EAAE,kBAAkB,SAAS,EAAE;aACrC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;IACpC,IAAI,QAAQ,KAAK,IAAI,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACtD,MAAM,IAAI,cAAc,CAAC,eAAe,EAAE,mCAAmC,EAAE,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC/G,CAAC;IACD,YAAY,CAAC,QAAQ,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;IAC1D,IAAI,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC;QAC/F,MAAM,IAAI,cAAc,CAAC,eAAe,EAAE,gEAAgE,EAAE;YAC1G,KAAK,EAAE,yBAAyB;SACjC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,QAAiB,EAAE,QAAgB;IACvD,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACjC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,cAAc,CAAC,eAAe,EAAE,GAAG,QAAQ,eAAe,qBAAqB,CAAC,MAAM,EAAE,EAAE;YAClG,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,QAAQ;SAChB,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,4GAA4G;AAC5G,SAAS,kBAAkB,CAAC,QAAiB,EAAE,QAAgB;IAC7D,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACjC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,cAAc,CACtB,eAAe,EACf,GAAG,QAAQ,0EAA0E,EACrF,EAAE,KAAK,EAAE,QAAQ,EAAE,CACpB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,kDAAkD;AAClD,SAAS,eAAe,CAAC,QAAgB;IACvC,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AACvF,CAAC;AAED,SAAS,cAAc,CAAC,IAA0B,EAAE,IAA0B;IAC5E,OAAO,CACL,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC;QACjC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;QACvC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC;QACjD,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAC1C,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,SAAmB;IACzC,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,SAAS,CAAC,QAAoB;IACrC,OAAO;QACL,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;QACpE,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;QACtE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;QAC1E,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;KAC3E,CAAC;AACJ,CAAC;AAED,SAAS,IAAI,CAAC,QAAoB;IAChC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC5C,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AACnE,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAEpG,kFAAkF;AAClF,SAAS,gBAAgB,CAAC,YAAkB;IAC1C,MAAM,GAAG,GAAG,CAAC,QAAgB,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACpE,OAAO,CACL,GAAG,QAAQ,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,KAAK,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,IAAI,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,GAAG;QACjH,GAAG,YAAY,CAAC,cAAc,EAAE,IAAI,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC,GAAG;QAC3G,GAAG,GAAG,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC,MAAM,CAC3C,CAAC;AACJ,CAAC"}
|
|
297
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"indexbuilder.js","sourceRoot":"","sources":["../../ts/debian/indexbuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,3 +13,10 @@ export declare function isDebianSymbol(valueArg: string): boolean;
|
|
|
13
13
|
* is not one.
|
|
14
14
|
*/
|
|
15
15
|
export declare function isDebianReleaseValue(valueArg: string): boolean;
|
|
16
|
+
/**
|
|
17
|
+
* Whether a text holds a character a pool file name must not hold. The one
|
|
18
|
+
* rule both `buildDebianIndex` (on `record.fileName`) and `readDebianPackage`
|
|
19
|
+
* (on the version and the decoded architecture) apply, so the reader never
|
|
20
|
+
* returns a record the builder refuses for its file name.
|
|
21
|
+
*/
|
|
22
|
+
export declare function hasPoolFileNameRefusedCharacter(textArg: string): boolean;
|
package/dist_ts/debian/rules.js
CHANGED
|
@@ -18,4 +18,23 @@ export function isDebianSymbol(valueArg) {
|
|
|
18
18
|
export function isDebianReleaseValue(valueArg) {
|
|
19
19
|
return typeof valueArg === 'string' && valueArg !== '' && !hasControlCharacter(valueArg) && valueArg === valueArg.trim();
|
|
20
20
|
}
|
|
21
|
-
|
|
21
|
+
/**
|
|
22
|
+
* The characters a pool file name (`<name>_<version>_<architecture>.deb`,
|
|
23
|
+
* written as a `Packages` `Filename`) must not hold: `/`, which would make it
|
|
24
|
+
* more than one path segment; whitespace and control characters, which split
|
|
25
|
+
* or end the field; and `#` and `?`, which apt sends unescaped in the request
|
|
26
|
+
* path (apt 2.6.1 `pkgAcquire::URIEncode` escapes only `%`, `+`, `~`, space,
|
|
27
|
+
* control and non-ASCII bytes), so a server reads the rest as a fragment or a
|
|
28
|
+
* query and apt cannot fetch the file.
|
|
29
|
+
*/
|
|
30
|
+
const POOL_FILE_NAME_REFUSED_PATTERN = /[/#?\s\p{Cc}]/u;
|
|
31
|
+
/**
|
|
32
|
+
* Whether a text holds a character a pool file name must not hold. The one
|
|
33
|
+
* rule both `buildDebianIndex` (on `record.fileName`) and `readDebianPackage`
|
|
34
|
+
* (on the version and the decoded architecture) apply, so the reader never
|
|
35
|
+
* returns a record the builder refuses for its file name.
|
|
36
|
+
*/
|
|
37
|
+
export function hasPoolFileNameRefusedCharacter(textArg) {
|
|
38
|
+
return POOL_FILE_NAME_REFUSED_PATTERN.test(textArg);
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVsZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kZWJpYW4vcnVsZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFOUQsNkdBQTZHO0FBQzdHLE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFHLGdDQUFnQyxDQUFDO0FBRXRFOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsY0FBYyxDQUFDLFFBQWdCO0lBQzdDLE9BQU8sT0FBTyxRQUFRLEtBQUssUUFBUSxJQUFJLHFCQUFxQixDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztBQUM5RSxDQUFDO0FBRUQ7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsb0JBQW9CLENBQUMsUUFBZ0I7SUFDbkQsT0FBTyxPQUFPLFFBQVEsS0FBSyxRQUFRLElBQUksUUFBUSxLQUFLLEVBQUUsSUFBSSxDQUFDLG1CQUFtQixDQUFDLFFBQVEsQ0FBQyxJQUFJLFFBQVEsS0FBSyxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUM7QUFDM0gsQ0FBQztBQUVEOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSw4QkFBOEIsR0FBRyxnQkFBZ0IsQ0FBQztBQUV4RDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSwrQkFBK0IsQ0FBQyxPQUFlO0lBQzdELE9BQU8sOEJBQThCLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBQ3RELENBQUMifQ==
|
|
@@ -2,7 +2,11 @@
|
|
|
2
2
|
* Whether an architecture can name an index path segment. Readers record any
|
|
3
3
|
* architecture a package states (Gitea accepts them); builders refuse an entry
|
|
4
4
|
* whose architecture fails this rule with `invalid-input`, and never skip it
|
|
5
|
-
* silently.
|
|
5
|
+
* silently. The exception is `readDebianPackage`: the record's file name
|
|
6
|
+
* (`<name>_<version>_<architecture>.deb`) embeds the architecture, so it
|
|
7
|
+
* refuses one that fails this rule or the pool file name rule with
|
|
8
|
+
* `invalid-field` (`Architecture`), and never returns a record
|
|
9
|
+
* `buildDebianIndex` refuses. Refused: the empty string, `.` and `..`, and any value containing
|
|
6
10
|
* `/`, whitespace or a control character.
|
|
7
11
|
*/
|
|
8
12
|
export declare function isIndexableArchitecture(architectureArg: string): boolean;
|
|
@@ -2,7 +2,11 @@
|
|
|
2
2
|
* Whether an architecture can name an index path segment. Readers record any
|
|
3
3
|
* architecture a package states (Gitea accepts them); builders refuse an entry
|
|
4
4
|
* whose architecture fails this rule with `invalid-input`, and never skip it
|
|
5
|
-
* silently.
|
|
5
|
+
* silently. The exception is `readDebianPackage`: the record's file name
|
|
6
|
+
* (`<name>_<version>_<architecture>.deb`) embeds the architecture, so it
|
|
7
|
+
* refuses one that fails this rule or the pool file name rule with
|
|
8
|
+
* `invalid-field` (`Architecture`), and never returns a record
|
|
9
|
+
* `buildDebianIndex` refuses. Refused: the empty string, `.` and `..`, and any value containing
|
|
6
10
|
* `/`, whitespace or a control character.
|
|
7
11
|
*/
|
|
8
12
|
export function isIndexableArchitecture(architectureArg) {
|
|
@@ -14,4 +18,4 @@ export function isIndexableArchitecture(architectureArg) {
|
|
|
14
18
|
}
|
|
15
19
|
return !/[/\s\p{Cc}]/u.test(architectureArg);
|
|
16
20
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl0ZWN0dXJlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvc2hhcmVkL2FyY2hpdGVjdHVyZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7OztHQVVHO0FBQ0gsTUFBTSxVQUFVLHVCQUF1QixDQUFDLGVBQXVCO0lBQzdELElBQUksT0FBTyxlQUFlLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDeEMsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBQ0QsSUFBSSxlQUFlLEtBQUssRUFBRSxJQUFJLGVBQWUsS0FBSyxHQUFHLElBQUksZUFBZSxLQUFLLElBQUksRUFBRSxDQUFDO1FBQ2xGLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUNELE9BQU8sQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFDO0FBQy9DLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartlinuxrepo",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A pure codec for Linux package repositories (Alpine apk, Debian apt, RPM dnf, Arch pacman): read packages into records, build index file sets and sign them.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
package/readme.md
CHANGED
|
@@ -138,7 +138,7 @@ const files = await buildDebianIndex({
|
|
|
138
138
|
});
|
|
139
139
|
```
|
|
140
140
|
|
|
141
|
-
`readDebianPackage` reads the `control.tar` member (plain, `.gz`, `.xz` or `.zst`) and hashes the rest of the file without decompressing it. The record keeps Gitea's derived values exactly, and its `fileName` is `<name>_<version>_<architecture>.deb`.
|
|
141
|
+
`readDebianPackage` reads the `control.tar` member (plain, `.gz`, `.xz` or `.zst`) and hashes the rest of the file without decompressing it. The record keeps Gitea's derived values exactly, and its `fileName` is `<name>_<version>_<architecture>.deb`. Two departures from Gitea's control checks keep every record indexable. The version: a version that holds `/` or `?` is refused with `invalid-field` (`detail.field` `Version`), a departure from Gitea's version pattern, which admits both in the revision (its `+-~` class is the range 0x2B-0x7E); no pool file name can hold them, because `/` splits the path and apt sends `?` unescaped, so the server would read the rest as a query. The architecture: Gitea accepts any non-empty Architecture; the reader refuses one that is `.` or `..` or holds `/`, `#`, `?`, whitespace or a control character (`invalid-field`, `detail.field` `Architecture`), because the file name embeds it. `buildDebianIndex` applies the same rules to `record.architecture` and `record.fileName` (`invalid-input`), so every record the reader returns can be indexed.
|
|
142
142
|
|
|
143
143
|
`buildDebianIndex` returns the complete set for one distribution. For every component and architecture with packages it writes `dists/<distribution>/<component>/binary-<architecture>/Packages`, `Packages.gz` and `Packages.xz` (`content` files). Packages of architecture `all` are listed only under `binary-all`, as in Gitea. Then it writes `dists/<distribution>/Release`, its armored detached signature `Release.gpg` and the cleartext-signed `InRelease` (`pointer` files). `distribution` and `component` must match `^[a-zA-Z0-9][a-zA-Z0-9.~+_-]*$` (`isDebianSymbol`); `origin` and `label` are each one non-empty line without surrounding whitespace (`isDebianReleaseValue`). Both predicates are the builder's own rules, for checking configuration before a build. Entries are `IDebianIndexEntry` objects (`{ component, record }`). Your route serves:
|
|
144
144
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartlinuxrepo',
|
|
6
|
-
version: '1.1.
|
|
6
|
+
version: '1.1.1',
|
|
7
7
|
description: 'A pure codec for Linux package repositories (Alpine apk, Debian apt, RPM dnf, Arch pacman): read packages into records, build index file sets and sign them.'
|
|
8
8
|
}
|
package/ts/debian/control.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { isIndexableArchitecture } from '../shared/architecture.js';
|
|
1
2
|
import { LinuxRepoError, limitExceeded } from '../shared/errors.js';
|
|
2
3
|
import { isValidUrl } from '../shared/url.js';
|
|
3
4
|
import type { IDebianPackageMetadata } from '../shared/types.js';
|
|
4
5
|
import { fromByteString, goTrimSpace, toByteString } from './gostring.js';
|
|
6
|
+
import { hasPoolFileNameRefusedCharacter } from './rules.js';
|
|
5
7
|
import { parseMailAddress } from './mailaddress.js';
|
|
6
8
|
|
|
7
9
|
/**
|
|
@@ -29,7 +31,13 @@ export interface IDebianControl {
|
|
|
29
31
|
* verbatim, and the Depends text split on `,` (`['']` when there is none).
|
|
30
32
|
*
|
|
31
33
|
* Gitea's scanner refuses lines over 64 KiB; the codec accepts lines up to
|
|
32
|
-
* `maxLineBytes` (`maxHeaderBytes`), which is at least that.
|
|
34
|
+
* `maxLineBytes` (`maxHeaderBytes`), which is at least that. A version that
|
|
35
|
+
* matches Gitea's pattern but holds `/` or `?` (both inside the revision's
|
|
36
|
+
* range) is refused with `invalid-field` (`Version`): no pool file name can
|
|
37
|
+
* hold it (`hasPoolFileNameRefusedCharacter`), where Gitea accepts the upload
|
|
38
|
+
* and then cannot serve it. An Architecture that fails `isIndexableArchitecture`
|
|
39
|
+
* or `hasPoolFileNameRefusedCharacter` (decoded) is refused with
|
|
40
|
+
* `invalid-field` (`Architecture`), where Gitea accepts any non-empty value.
|
|
33
41
|
*/
|
|
34
42
|
export function parseDebianControlFile(bytesArg: Uint8Array, maxLineBytesArg: number): IDebianControl {
|
|
35
43
|
const text = toByteString(bytesArg);
|
|
@@ -121,7 +129,10 @@ export function parseDebianControlFile(bytesArg: Uint8Array, maxLineBytesArg: nu
|
|
|
121
129
|
if (version === '') {
|
|
122
130
|
throw new LinuxRepoError('missing-field', 'the control file has no Version field', { field: 'Version' });
|
|
123
131
|
}
|
|
124
|
-
|
|
132
|
+
// a departure from Gitea's version pattern: the revision range admits
|
|
133
|
+
// `/` and `?`, which the pool file name cannot hold, so the version is
|
|
134
|
+
// refused here rather than by buildDebianIndex
|
|
135
|
+
if (!VERSION_PATTERN.test(version) || hasPoolFileNameRefusedCharacter(version)) {
|
|
125
136
|
throw new LinuxRepoError('invalid-field', 'the package version is invalid', {
|
|
126
137
|
field: 'Version',
|
|
127
138
|
value: fromByteString(version),
|
|
@@ -132,11 +143,22 @@ export function parseDebianControlFile(bytesArg: Uint8Array, maxLineBytesArg: nu
|
|
|
132
143
|
field: 'Architecture',
|
|
133
144
|
});
|
|
134
145
|
}
|
|
146
|
+
// a departure from Gitea, which accepts any non-empty Architecture: the
|
|
147
|
+
// file name embeds it, so it must pass the builder's rules; checked on the
|
|
148
|
+
// decoded text the record carries (on the byte string, `\s` and `\p{Cc}`
|
|
149
|
+
// would match the UTF-8 continuation bytes 0x85 and 0xA0)
|
|
150
|
+
const decodedArchitecture = fromByteString(architecture);
|
|
151
|
+
if (!isIndexableArchitecture(decodedArchitecture) || hasPoolFileNameRefusedCharacter(decodedArchitecture)) {
|
|
152
|
+
throw new LinuxRepoError('invalid-field', 'the package architecture cannot name an index path or pool file', {
|
|
153
|
+
field: 'Architecture',
|
|
154
|
+
value: decodedArchitecture,
|
|
155
|
+
});
|
|
156
|
+
}
|
|
135
157
|
|
|
136
158
|
return {
|
|
137
159
|
name,
|
|
138
160
|
version,
|
|
139
|
-
architecture:
|
|
161
|
+
architecture: decodedArchitecture,
|
|
140
162
|
metadata: {
|
|
141
163
|
control: fromByteString(goTrimSpace(control)),
|
|
142
164
|
maintainer: fromByteString(maintainer),
|
|
@@ -2,11 +2,11 @@ import * as plugins from '../plugins.js';
|
|
|
2
2
|
import { isIndexableArchitecture } from '../shared/architecture.js';
|
|
3
3
|
import { LinuxRepoError } from '../shared/errors.js';
|
|
4
4
|
import type { IDebianPackageRecord, ILinuxIndexFile } from '../shared/types.js';
|
|
5
|
-
import {
|
|
5
|
+
import { assertString, assertTimestamp } from '../shared/validation.js';
|
|
6
6
|
import type { IOpenPgpSigner } from '../signing/signers.js';
|
|
7
7
|
import { createCleartextSignedMessage, createDetachedArmoredSignature } from '../signing/openpgpframing.js';
|
|
8
8
|
import { compareUtf8, goTrimSpace, utf8ByteString } from './gostring.js';
|
|
9
|
-
import { DEBIAN_SYMBOL_PATTERN, isDebianReleaseValue, isDebianSymbol } from './rules.js';
|
|
9
|
+
import { DEBIAN_SYMBOL_PATTERN, hasPoolFileNameRefusedCharacter, isDebianReleaseValue, isDebianSymbol } from './rules.js';
|
|
10
10
|
|
|
11
11
|
/** The fields the `Packages` stanza writes itself; a control file's own copies are dropped. */
|
|
12
12
|
const INDEX_OWNED_FIELDS = new Set(['filename', 'size', 'md5sum', 'sha1', 'sha256', 'sha512']);
|
|
@@ -234,7 +234,8 @@ export function renderDebianPackagesStanza(input: {
|
|
|
234
234
|
|
|
235
235
|
/**
|
|
236
236
|
* Refuses a record the index cannot list: wrong format, an architecture that
|
|
237
|
-
* is not a path segment, a file name
|
|
237
|
+
* is not a path segment, a file name apt cannot fetch as one pool path
|
|
238
|
+
* segment (`hasPoolFileNameRefusedCharacter`), digests that are not
|
|
238
239
|
* hex of the right length, or a control text that is not one stanza (empty,
|
|
239
240
|
* or holding a blank line that would start another stanza).
|
|
240
241
|
*/
|
|
@@ -249,12 +250,13 @@ function assertRecord(recordArg: IDebianPackageRecord): void {
|
|
|
249
250
|
{ field: 'record.architecture', value: String(recordArg.fileName) },
|
|
250
251
|
);
|
|
251
252
|
}
|
|
252
|
-
|
|
253
|
-
if (
|
|
254
|
-
throw new LinuxRepoError(
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
253
|
+
assertString(recordArg.fileName, 'record.fileName');
|
|
254
|
+
if (recordArg.fileName === '' || hasPoolFileNameRefusedCharacter(recordArg.fileName)) {
|
|
255
|
+
throw new LinuxRepoError(
|
|
256
|
+
'invalid-input',
|
|
257
|
+
'record.fileName must be non-empty and contain no "/", "#", "?", whitespace or control characters',
|
|
258
|
+
{ field: 'record.fileName', value: recordArg.fileName },
|
|
259
|
+
);
|
|
258
260
|
}
|
|
259
261
|
const digests = recordArg.digests;
|
|
260
262
|
if (digests === null || typeof digests !== 'object' || !Number.isSafeInteger(digests.size) || digests.size < 0) {
|
package/ts/debian/rules.ts
CHANGED
|
@@ -21,3 +21,24 @@ export function isDebianSymbol(valueArg: string): boolean {
|
|
|
21
21
|
export function isDebianReleaseValue(valueArg: string): boolean {
|
|
22
22
|
return typeof valueArg === 'string' && valueArg !== '' && !hasControlCharacter(valueArg) && valueArg === valueArg.trim();
|
|
23
23
|
}
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* The characters a pool file name (`<name>_<version>_<architecture>.deb`,
|
|
27
|
+
* written as a `Packages` `Filename`) must not hold: `/`, which would make it
|
|
28
|
+
* more than one path segment; whitespace and control characters, which split
|
|
29
|
+
* or end the field; and `#` and `?`, which apt sends unescaped in the request
|
|
30
|
+
* path (apt 2.6.1 `pkgAcquire::URIEncode` escapes only `%`, `+`, `~`, space,
|
|
31
|
+
* control and non-ASCII bytes), so a server reads the rest as a fragment or a
|
|
32
|
+
* query and apt cannot fetch the file.
|
|
33
|
+
*/
|
|
34
|
+
const POOL_FILE_NAME_REFUSED_PATTERN = /[/#?\s\p{Cc}]/u;
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* Whether a text holds a character a pool file name must not hold. The one
|
|
38
|
+
* rule both `buildDebianIndex` (on `record.fileName`) and `readDebianPackage`
|
|
39
|
+
* (on the version and the decoded architecture) apply, so the reader never
|
|
40
|
+
* returns a record the builder refuses for its file name.
|
|
41
|
+
*/
|
|
42
|
+
export function hasPoolFileNameRefusedCharacter(textArg: string): boolean {
|
|
43
|
+
return POOL_FILE_NAME_REFUSED_PATTERN.test(textArg);
|
|
44
|
+
}
|
|
@@ -2,7 +2,11 @@
|
|
|
2
2
|
* Whether an architecture can name an index path segment. Readers record any
|
|
3
3
|
* architecture a package states (Gitea accepts them); builders refuse an entry
|
|
4
4
|
* whose architecture fails this rule with `invalid-input`, and never skip it
|
|
5
|
-
* silently.
|
|
5
|
+
* silently. The exception is `readDebianPackage`: the record's file name
|
|
6
|
+
* (`<name>_<version>_<architecture>.deb`) embeds the architecture, so it
|
|
7
|
+
* refuses one that fails this rule or the pool file name rule with
|
|
8
|
+
* `invalid-field` (`Architecture`), and never returns a record
|
|
9
|
+
* `buildDebianIndex` refuses. Refused: the empty string, `.` and `..`, and any value containing
|
|
6
10
|
* `/`, whitespace or a control character.
|
|
7
11
|
*/
|
|
8
12
|
export function isIndexableArchitecture(architectureArg: string): boolean {
|