@digabi/exam-engine-mastering 24.0.0-alpha.0 → 24.0.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/dist/createMex.js
CHANGED
|
@@ -53,6 +53,7 @@ const pipeline = (0, util_1.promisify)(stream_1.default.pipeline);
|
|
|
53
53
|
exports.REQUIRED_SERVER_VERSION_FILENAME = 'required-server-version.json';
|
|
54
54
|
async function createMex(xml, attachments, nsaScripts, securityCodes, passphrase, answersPrivateKey, outputStream, json, ktpUpdate, koeUpdate, requiredServerVersion) {
|
|
55
55
|
const zipFile = new yazl_1.default.ZipFile();
|
|
56
|
+
const promise = pipeZipFile(zipFile, outputStream);
|
|
56
57
|
const keyAndIv = (0, crypto_utils_1.deriveAES256KeyAndIv)(passphrase);
|
|
57
58
|
if (requiredServerVersion) {
|
|
58
59
|
addSignedManifest(zipFile, answersPrivateKey, requiredServerVersion);
|
|
@@ -79,18 +80,18 @@ async function createMex(xml, attachments, nsaScripts, securityCodes, passphrase
|
|
|
79
80
|
filename: restricted ? path_1.default.join('restricted', filename) : filename,
|
|
80
81
|
contents
|
|
81
82
|
})));
|
|
82
|
-
const promise = pipeline(zipFile.outputStream, outputStream);
|
|
83
83
|
zipFile.end();
|
|
84
84
|
await promise;
|
|
85
85
|
}
|
|
86
86
|
async function createMultiMex(exams, nsaScripts, securityCodes, passphrase, answersPrivateKey, outputStream, loadSimulationConfiguration, ktpUpdate, koeUpdate, requiredServerVersion) {
|
|
87
87
|
const zipFile = new yazl_1.default.ZipFile();
|
|
88
|
+
const promise = pipeZipFile(zipFile, outputStream);
|
|
88
89
|
const keyAndIv = (0, crypto_utils_1.deriveAES256KeyAndIv)(passphrase);
|
|
89
90
|
if (requiredServerVersion) {
|
|
90
91
|
addSignedManifest(zipFile, answersPrivateKey, requiredServerVersion);
|
|
91
92
|
}
|
|
92
93
|
for (const exam of exams) {
|
|
93
|
-
|
|
94
|
+
addReadStream(zipFile, exam.contents, exam.filename);
|
|
94
95
|
}
|
|
95
96
|
encryptAndSign(zipFile, 'nsa.zip', keyAndIv, answersPrivateKey, nsaScripts);
|
|
96
97
|
encryptAndSign(zipFile, 'security-codes.json', keyAndIv, answersPrivateKey, securityCodes);
|
|
@@ -105,26 +106,27 @@ async function createMultiMex(exams, nsaScripts, securityCodes, passphrase, answ
|
|
|
105
106
|
encryptAndSign(zipFile, 'koe-update.zip', keyAndIv, answersPrivateKey, koeUpdateCloneable.clone());
|
|
106
107
|
sign(zipFile, 'koe-update.zip', answersPrivateKey, koeUpdateCloneable);
|
|
107
108
|
}
|
|
108
|
-
const promise = pipeline(zipFile.outputStream, outputStream);
|
|
109
109
|
zipFile.end();
|
|
110
110
|
await promise;
|
|
111
111
|
}
|
|
112
112
|
function encryptAndSignFiles(zipFile, filename, keyAndIv, answersPrivateKey, files) {
|
|
113
113
|
const innerZipFile = new yazl_1.default.ZipFile();
|
|
114
|
+
innerZipFile.on('error', error => zipFile.emit('error', error));
|
|
114
115
|
for (const file of files) {
|
|
115
|
-
|
|
116
|
+
addReadStream(innerZipFile, file.contents, file.filename);
|
|
116
117
|
}
|
|
117
118
|
innerZipFile.end();
|
|
118
119
|
encryptAndSign(zipFile, filename, keyAndIv, answersPrivateKey, innerZipFile.outputStream);
|
|
119
120
|
}
|
|
120
121
|
function encryptAndSign(zipFile, filename, keyAndIv, answersPrivateKey, input) {
|
|
122
|
+
input.once('error', error => zipFile.emit('error', error));
|
|
121
123
|
const encrypted = (0, cloneable_readable_1.default)(input.pipe((0, crypto_utils_1.createAES256EncryptStreamWithIv)(keyAndIv)));
|
|
122
|
-
|
|
124
|
+
addReadStream(zipFile, encrypted.clone(), `${filename}.bin`);
|
|
123
125
|
sign(zipFile, `${filename}.bin`, answersPrivateKey, encrypted);
|
|
124
126
|
}
|
|
125
127
|
function sign(zipFile, filename, answersPrivateKey, input) {
|
|
126
128
|
const signer = (0, crypto_utils_1.signWithSHA256AndRSA)(input, answersPrivateKey);
|
|
127
|
-
|
|
129
|
+
addReadStream(zipFile, signer, `${filename}.sig`);
|
|
128
130
|
}
|
|
129
131
|
/**
|
|
130
132
|
* Adds the required-server-version manifest as a top-level, unencrypted but signed
|
|
@@ -133,9 +135,17 @@ function sign(zipFile, filename, answersPrivateKey, input) {
|
|
|
133
135
|
function addSignedManifest(zipFile, answersPrivateKey, requiredServerVersion) {
|
|
134
136
|
const manifest = Buffer.from(JSON.stringify({ requiredServerVersion }));
|
|
135
137
|
const input = (0, cloneable_readable_1.default)(toStream(manifest));
|
|
136
|
-
|
|
138
|
+
addReadStream(zipFile, input.clone(), exports.REQUIRED_SERVER_VERSION_FILENAME);
|
|
137
139
|
sign(zipFile, exports.REQUIRED_SERVER_VERSION_FILENAME, answersPrivateKey, input);
|
|
138
140
|
}
|
|
141
|
+
function pipeZipFile(zipFile, outputStream) {
|
|
142
|
+
zipFile.on('error', (error) => outputStream.destroy(error));
|
|
143
|
+
return pipeline(zipFile.outputStream, outputStream);
|
|
144
|
+
}
|
|
145
|
+
function addReadStream(zipFile, input, filename) {
|
|
146
|
+
input.once('error', error => zipFile.emit('error', error));
|
|
147
|
+
zipFile.addReadStream(input, filename);
|
|
148
|
+
}
|
|
139
149
|
function toStream(buffer) {
|
|
140
150
|
const readable = new stream_1.Readable();
|
|
141
151
|
readable.push(buffer);
|
package/dist/createMex.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMex.js","sourceRoot":"","sources":["../src/createMex.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2BA,8BA2DC;AAED,wCA8CC;AAtID,gDAAuB;AACvB,iDAAmD;AACnD,gDAAoC;AACpC,iDAAsH;AACtH,4EAA0C;AAC1C,+BAAgC;AAEhC,MAAM,QAAQ,GAAG,IAAA,gBAAS,EAAC,gBAAM,CAAC,QAAQ,CAAC,CAAA;AAE3C;;;GAGG;AACU,QAAA,gCAAgC,GAAG,8BAA8B,CAAA;AAcvE,KAAK,UAAU,SAAS,CAC7B,GAAW,EACX,WAA6B,EAC7B,UAA2B,EAC3B,aAA8B,EAC9B,UAAkB,EAClB,iBAAyB,EACzB,YAAsB,EACtB,IAAoB,EACpB,SAAoB,EACpB,SAAoB,EACpB,qBAA8B;IAE9B,MAAM,OAAO,GAAG,IAAI,cAAI,CAAC,OAAO,EAAE,CAAA;IAClC,MAAM,QAAQ,GAAG,IAAA,mCAAoB,EAAC,UAAU,CAAC,CAAA;IAEjD,IAAI,qBAAqB,EAAE,CAAC;QAC1B,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,CAAC,CAAA;IACtE,CAAC;IAED,cAAc,CACZ,OAAO,EACP,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,UAAU,EACrC,QAAQ,EACR,iBAAiB,EACjB,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAC3B,CAAA;IAED,IAAI,IAAI,EAAE,CAAC;QACT,cAAc,CAAC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;IACnF,CAAC;IACD,IAAI,UAAU,EAAE,CAAC;QACf,cAAc,CAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU,CAAC,CAAA;IAC7E,CAAC;IACD,IAAI,aAAa,EAAE,CAAC;QAClB,cAAc,CAAC,OAAO,EAAE,qBAAqB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,aAAa,CAAC,CAAA;IAC5F,CAAC;IACD,IAAI,SAAS,EAAE,CAAC;QACd,cAAc,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAA;IACnF,CAAC;IACD,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,kBAAkB,GAAG,IAAA,4BAAS,EAAC,SAAS,CAAC,CAAA;QAC/C,cAAc,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,KAAK,EAAE,CAAC,CAAA;QAClG,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAAA;IACxE,CAAC;IACD,mBAAmB,CACjB,OAAO,EACP,iBAAiB,EACjB,QAAQ,EACR,iBAAiB,EACjB,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;QACvD,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ;QACnE,QAAQ;KACT,CAAC,CAAC,CACJ,CAAA;IAED,
|
|
1
|
+
{"version":3,"file":"createMex.js","sourceRoot":"","sources":["../src/createMex.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@digabi/exam-engine-mastering",
|
|
3
|
-
"version": "24.0.0
|
|
3
|
+
"version": "24.0.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"repository": "https://github.com/digabi/exam-engine",
|
|
6
6
|
"author": "Matriculation Examination Board, Finland",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"schema"
|
|
11
11
|
],
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@digabi/exam-engine-core": "24.0.0
|
|
13
|
+
"@digabi/exam-engine-core": "24.0.0",
|
|
14
14
|
"@ffprobe-installer/ffprobe": "^2.0.0",
|
|
15
15
|
"cloneable-readable": "^3.0.0",
|
|
16
16
|
"compare-versions": "^6.0.0",
|
|
@@ -20,5 +20,5 @@
|
|
|
20
20
|
"mathjax-node": "^2.1.1",
|
|
21
21
|
"yazl": "^3.2.1"
|
|
22
22
|
},
|
|
23
|
-
"gitHead": "
|
|
23
|
+
"gitHead": "022558a635a6099029f7f81c0641b2ccefad45e1"
|
|
24
24
|
}
|