@mikeyt23/node-cli-utils 2.0.0-beta.1 → 2.0.0-beta.2
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/cjs/GitUtility.d.ts +7 -0
- package/dist/cjs/GitUtility.d.ts.map +1 -0
- package/dist/cjs/GitUtility.js +49 -0
- package/dist/cjs/TarballUtility.d.ts +17 -7
- package/dist/cjs/TarballUtility.d.ts.map +1 -1
- package/dist/cjs/TarballUtility.js +18 -24
- package/dist/cjs/certUtils.d.ts +53 -17
- package/dist/cjs/certUtils.d.ts.map +1 -1
- package/dist/cjs/certUtils.js +175 -111
- package/dist/cjs/dbMigrationUtils.js +44 -54
- package/dist/cjs/dotnetUtils.d.ts.map +1 -1
- package/dist/cjs/dotnetUtils.js +4 -2
- package/dist/cjs/esmSpecific.d.mts +5 -0
- package/dist/cjs/esmSpecific.d.mts.map +1 -1
- package/dist/cjs/esmSpecific.mjs +6 -1
- package/dist/cjs/generalUtils.d.ts +268 -26
- package/dist/cjs/generalUtils.d.ts.map +1 -1
- package/dist/cjs/generalUtils.js +522 -106
- package/dist/cjs/generalUtilsInternal.d.ts +9 -3
- package/dist/cjs/generalUtilsInternal.d.ts.map +1 -1
- package/dist/cjs/generalUtilsInternal.js +159 -59
- package/dist/cjs/hostsUtils.d.ts +16 -0
- package/dist/cjs/hostsUtils.d.ts.map +1 -0
- package/dist/cjs/hostsUtils.js +82 -0
- package/dist/cjs/runWhileParentAlive.js +7 -9
- package/dist/esm/GitUtility.d.ts +7 -0
- package/dist/esm/GitUtility.d.ts.map +1 -0
- package/dist/esm/GitUtility.js +43 -0
- package/dist/esm/TarballUtility.d.ts +17 -7
- package/dist/esm/TarballUtility.d.ts.map +1 -1
- package/dist/esm/TarballUtility.js +21 -25
- package/dist/esm/certUtils.d.ts +53 -17
- package/dist/esm/certUtils.d.ts.map +1 -1
- package/dist/esm/certUtils.js +172 -86
- package/dist/esm/dbMigrationUtils.js +45 -55
- package/dist/esm/dotnetUtils.d.ts.map +1 -1
- package/dist/esm/dotnetUtils.js +4 -2
- package/dist/esm/esmSpecific.d.mts +5 -0
- package/dist/esm/esmSpecific.d.mts.map +1 -1
- package/dist/esm/esmSpecific.mjs +6 -1
- package/dist/esm/generalUtils.d.ts +268 -26
- package/dist/esm/generalUtils.d.ts.map +1 -1
- package/dist/esm/generalUtils.js +490 -105
- package/dist/esm/generalUtilsInternal.d.ts +9 -3
- package/dist/esm/generalUtilsInternal.d.ts.map +1 -1
- package/dist/esm/generalUtilsInternal.js +150 -57
- package/dist/esm/hostsUtils.d.ts +16 -0
- package/dist/esm/hostsUtils.d.ts.map +1 -0
- package/dist/esm/hostsUtils.js +69 -0
- package/dist/esm/runWhileParentAlive.js +8 -10
- package/package.json +4 -2
package/dist/cjs/certUtils.js
CHANGED
|
@@ -1,57 +1,39 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
4
|
};
|
|
28
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.
|
|
6
|
+
exports.linuxInstallCert = exports.winGetPfxInfo = exports.winUninstallCert = exports.winCertIsInstalled = exports.winInstallCert = exports.generateCertWithOpenSsl = void 0;
|
|
30
7
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
31
8
|
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
32
9
|
const node_path_1 = __importDefault(require("node:path"));
|
|
33
|
-
const nodeCliUtils = __importStar(require("./generalUtils.js"));
|
|
34
10
|
const generalUtils_js_1 = require("./generalUtils.js");
|
|
35
|
-
const
|
|
36
|
-
|
|
11
|
+
const defaultCertLogOptions = {
|
|
12
|
+
logSpawnOutput: false,
|
|
13
|
+
logTraceMessages: false,
|
|
14
|
+
logElevatedPermissionsMessage: true,
|
|
15
|
+
logSuccess: true
|
|
16
|
+
};
|
|
37
17
|
/**
|
|
38
18
|
* Wrapper function for calling openssl to generate a self-signed cert to be used for developing a local website with trusted https.
|
|
39
19
|
* @param url The url to generate a cert for. This will be used as the common name (CN) in the cert as well as the filename for the generated cert files.
|
|
40
|
-
* @param
|
|
20
|
+
* @param options Options for generating the cert.
|
|
21
|
+
* @returns The path to the generated pfx file.
|
|
41
22
|
*/
|
|
42
|
-
async function generateCertWithOpenSsl(url,
|
|
43
|
-
|
|
23
|
+
async function generateCertWithOpenSsl(url, options) {
|
|
24
|
+
(0, generalUtils_js_1.requireString)('url', url);
|
|
44
25
|
throwIfMaybeBadUrlChars(url);
|
|
45
|
-
const isMac =
|
|
46
|
-
const
|
|
47
|
-
|
|
26
|
+
const isMac = (0, generalUtils_js_1.isPlatformMac)();
|
|
27
|
+
const mergedOptions = { ...defaultCertLogOptions, outputDirectory: './cert', ...options };
|
|
28
|
+
const spawnArgs = { cwd: mergedOptions.outputDirectory, stdio: mergedOptions.logSpawnOutput ? 'inherit' : 'pipe' };
|
|
29
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logTraceMessages, 'checking if openssl is installed');
|
|
48
30
|
let brewOpenSslPath = '';
|
|
49
31
|
if (!isMac) {
|
|
50
|
-
const openSslPath =
|
|
32
|
+
const openSslPath = (0, generalUtils_js_1.whichSync)('openssl').location;
|
|
51
33
|
if (!openSslPath) {
|
|
52
34
|
throw Error('openssl is required but was not found');
|
|
53
35
|
}
|
|
54
|
-
(0, generalUtils_js_1.
|
|
36
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logTraceMessages, `using openssl at: ${openSslPath}`);
|
|
55
37
|
}
|
|
56
38
|
else if (isMac) {
|
|
57
39
|
const brewOpenSslDirectory = getBrewOpensslPath();
|
|
@@ -63,81 +45,154 @@ async function generateCertWithOpenSsl(url, outputDirectory = './cert') {
|
|
|
63
45
|
throw Error(`openssl (brew version) is required but was not found at: ${brewOpenSslPath}`);
|
|
64
46
|
}
|
|
65
47
|
else {
|
|
66
|
-
(0, generalUtils_js_1.
|
|
48
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logTraceMessages, `using openssl at: ${brewOpenSslPath}`);
|
|
67
49
|
}
|
|
68
50
|
}
|
|
69
|
-
|
|
70
|
-
const keyName = url + '.key';
|
|
51
|
+
(0, generalUtils_js_1.ensureDirectory)(mergedOptions.outputDirectory);
|
|
71
52
|
const crtName = url + '.crt';
|
|
53
|
+
const keyName = url + '.key';
|
|
72
54
|
const pfxName = url + '.pfx';
|
|
73
|
-
const
|
|
74
|
-
|
|
75
|
-
|
|
55
|
+
const sanCnfName = url + '.cnf';
|
|
56
|
+
const filesToCheck = [crtName, keyName, pfxName, sanCnfName];
|
|
57
|
+
for (const file of filesToCheck) {
|
|
58
|
+
const filePath = node_path_1.default.join(mergedOptions.outputDirectory, file);
|
|
59
|
+
if (node_fs_1.default.existsSync(filePath)) {
|
|
60
|
+
throw Error(`${generalUtils_js_1.Emoji.Stop} File ${filePath} already exists. Delete or rename all of the following files from '${mergedOptions.outputDirectory}' if you want to generate a new cert: ${filesToCheck.join(', ')}.`);
|
|
61
|
+
}
|
|
76
62
|
}
|
|
77
|
-
(0, generalUtils_js_1.
|
|
63
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logTraceMessages, `writing ${sanCnfName} file for use with openssl command`);
|
|
78
64
|
const sanCnfContents = getSanCnfFileContents(url);
|
|
79
|
-
const sanCnfPath = node_path_1.default.join(outputDirectory,
|
|
65
|
+
const sanCnfPath = node_path_1.default.join(mergedOptions.outputDirectory, sanCnfName);
|
|
80
66
|
await promises_1.default.writeFile(sanCnfPath, sanCnfContents);
|
|
81
|
-
(0, generalUtils_js_1.
|
|
82
|
-
const genKeyAndCrtArgs = `req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes -keyout ${keyName} -out ${crtName} -subj /CN=${url} -config
|
|
67
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logTraceMessages, `attempting to generate cert ${pfxName}`);
|
|
68
|
+
const genKeyAndCrtArgs = `req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes -keyout ${keyName} -out ${crtName} -subj /CN=${url} -config ${sanCnfName}`.split(' ');
|
|
83
69
|
const command = isMac ? brewOpenSslPath : 'openssl';
|
|
84
|
-
let result = await
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
}
|
|
88
|
-
(0, generalUtils_js_1.log)('- converting key and crt to pfx');
|
|
70
|
+
let result = await (0, generalUtils_js_1.spawnAsync)(command, genKeyAndCrtArgs, spawnArgs);
|
|
71
|
+
throwIfSpawnResultError(result);
|
|
72
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logTraceMessages, 'converting key and crt to pfx');
|
|
89
73
|
const convertToPfxArgs = `pkcs12 -certpbe AES-256-CBC -export -out ${pfxName} -aes256 -inkey ${keyName} -in ${crtName} -password pass:`.split(' ');
|
|
90
|
-
result = await
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
}
|
|
74
|
+
result = await (0, generalUtils_js_1.spawnAsync)(command, convertToPfxArgs, spawnArgs);
|
|
75
|
+
throwIfSpawnResultError(result);
|
|
76
|
+
const pfxPath = node_path_1.default.join(mergedOptions.outputDirectory, pfxName);
|
|
77
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logSuccess, `${generalUtils_js_1.Emoji.GreenCheck} Successfully generated cert: ${pfxPath}`);
|
|
78
|
+
return pfxPath;
|
|
94
79
|
}
|
|
95
80
|
exports.generateCertWithOpenSsl = generateCertWithOpenSsl;
|
|
96
81
|
/**
|
|
97
|
-
* Uses Powershell to install a cert to the local machine's trusted root store. Must have
|
|
98
|
-
*
|
|
99
|
-
*
|
|
100
|
-
* @param urlOrCertFilename The url or cert filename to install. The url + '.pfx' or the cert filename passed must match a file that exists in the certDirectory.
|
|
101
|
-
* @param certDirectory The directory to look for the cert file in. Defaults to './cert'.
|
|
82
|
+
* Uses Powershell to install a cert to the local machine's trusted root store. Must have elevated permissions.
|
|
83
|
+
* If the cert is already installed, this function will do nothing.
|
|
84
|
+
* @param pfxPath The path to the pfx file to install.
|
|
102
85
|
*/
|
|
103
|
-
async function winInstallCert(
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
(
|
|
111
|
-
|
|
112
|
-
(0, generalUtils_js_1.
|
|
86
|
+
async function winInstallCert(pfxPath, options) {
|
|
87
|
+
if (!(0, generalUtils_js_1.isPlatformWindows)()) {
|
|
88
|
+
throw Error('winInstallCert is only supported on Windows');
|
|
89
|
+
}
|
|
90
|
+
validatePfxPath(pfxPath);
|
|
91
|
+
const mergedOptions = { ...defaultCertLogOptions, ...options };
|
|
92
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logElevatedPermissionsMessage, getRequiresElevatedPermissionsMessage(true));
|
|
93
|
+
if (await winCertIsInstalled({ pfxPath }, mergedOptions)) {
|
|
94
|
+
const certInfo = await winGetPfxInfo(pfxPath);
|
|
95
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logTraceMessages, `${generalUtils_js_1.Emoji.Warning} certificate '${pfxPath}' with subject '${certInfo.subject}' is already installed - to install it again, first uninstall it manually or with the winUninstallCert function`);
|
|
113
96
|
return;
|
|
114
97
|
}
|
|
115
|
-
|
|
116
|
-
const
|
|
117
|
-
|
|
118
|
-
|
|
98
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logTraceMessages, `installing cert '${pfxPath}'`);
|
|
99
|
+
const psCommandArgs = (0, generalUtils_js_1.getPowershellHackArgs)(`Import-PfxCertificate -FilePath '${pfxPath}' -CertStoreLocation Cert:\\LocalMachine\\Root`);
|
|
100
|
+
const result = await (0, generalUtils_js_1.spawnAsync)('powershell', psCommandArgs, { stdio: mergedOptions.logSpawnOutput ? 'inherit' : 'pipe' });
|
|
101
|
+
throwIfSpawnResultError(result);
|
|
102
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logSuccess, `${generalUtils_js_1.Emoji.GreenCheck} Successfully installed cert: ${pfxPath}`);
|
|
103
|
+
}
|
|
104
|
+
exports.winInstallCert = winInstallCert;
|
|
105
|
+
/**
|
|
106
|
+
* Uses Powershell to check if a cert is already installed to the local machine's trusted root store.
|
|
107
|
+
* Uses the subject of the cert in order to avoid false negatives from regenerating the same self-signed cert
|
|
108
|
+
* with the same subject but different thumbprint. Note that this method is geared towards use with certs generated
|
|
109
|
+
* with the {@link generateCertWithOpenSsl} function, so this may not work using subject if your subject is not precisely "`CN=<url>`".
|
|
110
|
+
* @param identifier The subject or path to the pfx file of the cert to check.
|
|
111
|
+
* @returns `true` if the cert is already installed, `false` otherwise.
|
|
112
|
+
*/
|
|
113
|
+
async function winCertIsInstalled(identifier, options) {
|
|
114
|
+
if (!(0, generalUtils_js_1.isPlatformWindows)()) {
|
|
115
|
+
throw new Error('winCertIsInstalled is only supported on Windows');
|
|
116
|
+
}
|
|
117
|
+
const mergedOptions = { ...defaultCertLogOptions, ...options };
|
|
118
|
+
let psCommandArgs;
|
|
119
|
+
// Get the count of certs installed with the same subject as the one we're trying to install
|
|
120
|
+
if (typeof identifier === 'string') {
|
|
121
|
+
(0, generalUtils_js_1.requireString)('subject', identifier);
|
|
122
|
+
validateSubject(identifier);
|
|
123
|
+
const subject = identifier.startsWith('CN=') ? identifier : `CN=${identifier}`;
|
|
124
|
+
psCommandArgs = (0, generalUtils_js_1.getPowershellHackArgs)(`Write-Host (Get-ChildItem Cert:\\LocalMachine\\Root | Where-Object { $_.Subject -eq '${subject}' } | Measure-Object).Count`);
|
|
119
125
|
}
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
throw Error(`powershell command to install cert failed with exit code ${result.code}`);
|
|
126
|
+
else if ('pfxPath' in identifier) {
|
|
127
|
+
validatePfxPath(identifier.pfxPath);
|
|
128
|
+
psCommandArgs = (0, generalUtils_js_1.getPowershellHackArgs)(`Write-Host (Get-ChildItem Cert:\\LocalMachine\\Root | Where-Object { $_.Subject -eq (Get-PfxCertificate -FilePath '${identifier.pfxPath}').Subject } | Measure-Object).Count`);
|
|
124
129
|
}
|
|
130
|
+
const tracePart = (typeof identifier === 'string') ? `subject ${identifier}` : `pfxPath ${identifier.pfxPath}`;
|
|
131
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logTraceMessages, `checking if cert with ${tracePart} is already installed`);
|
|
132
|
+
const result = await (0, generalUtils_js_1.spawnAsync)('powershell', psCommandArgs, { stdio: 'pipe' });
|
|
133
|
+
throwIfSpawnResultError(result);
|
|
134
|
+
const lines = (0, generalUtils_js_1.stringToNonEmptyLines)(result.stdout);
|
|
135
|
+
if (lines.length !== 1) {
|
|
136
|
+
throw new Error(`Unexpected output from powershell command to check if the cert is already installed: ${result.stdout}`);
|
|
137
|
+
}
|
|
138
|
+
return lines[0].trim() !== '0';
|
|
125
139
|
}
|
|
126
|
-
exports.
|
|
140
|
+
exports.winCertIsInstalled = winCertIsInstalled;
|
|
127
141
|
/**
|
|
128
|
-
* Uses Powershell to uninstall a cert from the local machine's trusted root store. Must have
|
|
129
|
-
* @param
|
|
142
|
+
* Uses Powershell to uninstall a cert from the local machine's trusted root store. Must have elevated permissions.
|
|
143
|
+
* @param identifier The subject, thumbprint or path to the pfx file of the cert to uninstall.
|
|
144
|
+
* @param options Options for uninstalling the cert.
|
|
130
145
|
*/
|
|
131
|
-
async function winUninstallCert(
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
const
|
|
136
|
-
|
|
137
|
-
|
|
146
|
+
async function winUninstallCert(identifier, options) {
|
|
147
|
+
if (!(0, generalUtils_js_1.isPlatformWindows)()) {
|
|
148
|
+
throw new Error('winUninstallCert is only supported on Windows');
|
|
149
|
+
}
|
|
150
|
+
const mergedOptions = { ...defaultCertLogOptions, ...options };
|
|
151
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logElevatedPermissionsMessage, getRequiresElevatedPermissionsMessage(false));
|
|
152
|
+
let psCommandArgs;
|
|
153
|
+
if (typeof identifier === 'string') {
|
|
154
|
+
(0, generalUtils_js_1.requireString)('subject', identifier);
|
|
155
|
+
validateSubject(identifier);
|
|
156
|
+
psCommandArgs = (0, generalUtils_js_1.getPowershellHackArgs)(`Get-ChildItem Cert:\\LocalMachine\\Root | Where-Object { $_.Subject -match '${identifier}' } | Remove-Item`);
|
|
157
|
+
}
|
|
158
|
+
else if ('thumbprint' in identifier) {
|
|
159
|
+
validateNoQuotes('thumbprint', identifier.thumbprint);
|
|
160
|
+
psCommandArgs = (0, generalUtils_js_1.getPowershellHackArgs)(`Get-ChildItem Cert:\\LocalMachine\\Root | Where-Object { $_.Thumbprint -eq '${identifier.thumbprint}' } | Remove-Item`);
|
|
161
|
+
}
|
|
162
|
+
else if ('pfxPath' in identifier) {
|
|
163
|
+
validatePfxPath(identifier.pfxPath);
|
|
164
|
+
psCommandArgs = (0, generalUtils_js_1.getPowershellHackArgs)(`$thumbprint = (Get-PfxCertificate -FilePath '${identifier.pfxPath}').Thumbprint; Get-ChildItem Cert:\\LocalMachine\\Root | Where-Object { $_.Thumbprint -eq $thumbprint } | Remove-Item`);
|
|
138
165
|
}
|
|
166
|
+
const tracePart = typeof identifier === 'string' ? `'${identifier}'` : JSON.stringify(identifier);
|
|
167
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logTraceMessages, `uninstalling cert ${tracePart}`);
|
|
168
|
+
const result = await (0, generalUtils_js_1.spawnAsync)('powershell', psCommandArgs, { stdio: mergedOptions.logSpawnOutput ? 'inherit' : 'pipe' });
|
|
169
|
+
throwIfSpawnResultError(result);
|
|
170
|
+
(0, generalUtils_js_1.logIf)(mergedOptions.logSuccess, `${generalUtils_js_1.Emoji.GreenCheck} Successfully uninstalled cert`);
|
|
139
171
|
}
|
|
140
172
|
exports.winUninstallCert = winUninstallCert;
|
|
173
|
+
/**
|
|
174
|
+
* Uses Powershell to get info about a cert.
|
|
175
|
+
* @param pfxPath The path to the pfx file to get info for.
|
|
176
|
+
* @returns The subject, thumbprint and pfxPath of the cert.
|
|
177
|
+
*/
|
|
178
|
+
async function winGetPfxInfo(pfxPath) {
|
|
179
|
+
if (!(0, generalUtils_js_1.isPlatformWindows)()) {
|
|
180
|
+
throw new Error('winGetPfxInfo is only supported on Windows');
|
|
181
|
+
}
|
|
182
|
+
validatePfxPath(pfxPath);
|
|
183
|
+
const psCommandArgs = (0, generalUtils_js_1.getPowershellHackArgs)(`Get-PfxCertificate -FilePath '${pfxPath}' | Select-Object -Property Subject, Thumbprint, @{Name='PfxPath';Expression={'${pfxPath}'}} | ConvertTo-Json`);
|
|
184
|
+
const result = await (0, generalUtils_js_1.spawnAsync)('powershell', psCommandArgs, { stdio: 'pipe' });
|
|
185
|
+
throwIfSpawnResultError(result);
|
|
186
|
+
const json = result.stdout.trim();
|
|
187
|
+
const parsedJson = JSON.parse(json);
|
|
188
|
+
const certInfo = {
|
|
189
|
+
subject: parsedJson.Subject,
|
|
190
|
+
thumbprint: parsedJson.Thumbprint,
|
|
191
|
+
pfxPath: parsedJson.PfxPath
|
|
192
|
+
};
|
|
193
|
+
return certInfo;
|
|
194
|
+
}
|
|
195
|
+
exports.winGetPfxInfo = winGetPfxInfo;
|
|
141
196
|
/**
|
|
142
197
|
* Does not actually do anything - just outputs the manual instructions for installing a cert for use by chrome on linux.
|
|
143
198
|
*/
|
|
@@ -146,34 +201,13 @@ function linuxInstallCert() {
|
|
|
146
201
|
Manual Instructions:
|
|
147
202
|
- In Chrome, go to chrome://settings/certificates
|
|
148
203
|
- Select Authorities -> import
|
|
149
|
-
- Select your generated .crt file (in the ./cert/ directory by default - if you haven't generated it, see the generateCertWithOpenSsl
|
|
204
|
+
- Select your generated .crt file (in the ./cert/ directory by default - if you haven't generated it, see the generateCertWithOpenSsl function)
|
|
150
205
|
- Check box for "Trust certificate for identifying websites"
|
|
151
206
|
- Click OK
|
|
152
207
|
- Reload site`;
|
|
153
208
|
console.log(instructions);
|
|
154
209
|
}
|
|
155
210
|
exports.linuxInstallCert = linuxInstallCert;
|
|
156
|
-
/**
|
|
157
|
-
* Uses Powershell to check if a cert is already installed to the local machine's trusted root store.
|
|
158
|
-
* @param urlOrSubject The url or subject of the cert to check. If the cert was installed with the winInstallCert method, this will be the url passed to that method.
|
|
159
|
-
* @returns `true` if the cert is already installed, `false` otherwise.
|
|
160
|
-
*/
|
|
161
|
-
async function winCertAlreadyInstalled(urlOrSubject) {
|
|
162
|
-
const psCommand = `${powershellHackPrefix}Get-ChildItem Cert:\\LocalMachine\\Root | Where-Object { $_.Subject -match '${urlOrSubject}' }`;
|
|
163
|
-
// The stdio option of 'pipe' is important here - if left to default of spawnAsync ('inherit'), stdout will be empty
|
|
164
|
-
const result = await nodeCliUtils.spawnAsync('powershell', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command', psCommand], { stdio: ['inherit', 'pipe', 'pipe'] });
|
|
165
|
-
if (result.code !== 0) {
|
|
166
|
-
throw Error(`powershell command to find installed cert failed with exit code ${result.code}`);
|
|
167
|
-
}
|
|
168
|
-
const lines = nodeCliUtils.stringToNonEmptyLines(result.stdout);
|
|
169
|
-
for (const line of lines) {
|
|
170
|
-
if (line.includes(urlOrSubject)) {
|
|
171
|
-
return true;
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
return false;
|
|
175
|
-
}
|
|
176
|
-
exports.winCertAlreadyInstalled = winCertAlreadyInstalled;
|
|
177
211
|
function throwIfMaybeBadUrlChars(url, varName = 'url') {
|
|
178
212
|
if (url.includes(' ')) {
|
|
179
213
|
throw Error(`${varName} should not contain spaces`);
|
|
@@ -186,7 +220,7 @@ function throwIfMaybeBadUrlChars(url, varName = 'url') {
|
|
|
186
220
|
}
|
|
187
221
|
}
|
|
188
222
|
function getBrewOpensslPath() {
|
|
189
|
-
const brewResult =
|
|
223
|
+
const brewResult = (0, generalUtils_js_1.simpleSpawnSync)('brew', ['--prefix', 'openssl']);
|
|
190
224
|
if (brewResult.error) {
|
|
191
225
|
throw Error('error attempting to find openssl installed by brew');
|
|
192
226
|
}
|
|
@@ -198,6 +232,36 @@ function getBrewOpensslPath() {
|
|
|
198
232
|
function getSanCnfFileContents(url) {
|
|
199
233
|
return sanCnfTemplate.replace(/{{url}}/g, url);
|
|
200
234
|
}
|
|
235
|
+
function validateSubject(subject) {
|
|
236
|
+
if (subject.includes('\\') || subject.includes('/') || subject.endsWith('.pfx')) {
|
|
237
|
+
throw new Error(`The subject appears to be a file path, which is not allowed. Did you mean to pass something like this instead: { pfxPath: '${subject}' } ?`);
|
|
238
|
+
}
|
|
239
|
+
validateNoQuotes('subject', subject);
|
|
240
|
+
}
|
|
241
|
+
function validateNoQuotes(name, value) {
|
|
242
|
+
if (value.includes("'") || value.includes('"')) {
|
|
243
|
+
throw new Error(`The value passed for '${name}' contains a single or double quote, which is not allowed.`);
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
function throwIfSpawnResultError(result) {
|
|
247
|
+
if (result.code !== 0) {
|
|
248
|
+
// There won't be any stderr if stdio was set to 'inherit', so we're checking first
|
|
249
|
+
if (result.stderr) {
|
|
250
|
+
console.error((0, generalUtils_js_1.red)('Error:'), result.stderr);
|
|
251
|
+
}
|
|
252
|
+
throw Error(`Spawned command failed with exit code ${result.code}`);
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
function validatePfxPath(pfxPath) {
|
|
256
|
+
if (!pfxPath.endsWith('.pfx')) {
|
|
257
|
+
throw new Error('pfxPath must end with .pfx');
|
|
258
|
+
}
|
|
259
|
+
(0, generalUtils_js_1.requireValidPath)('pfxPath', pfxPath);
|
|
260
|
+
validateNoQuotes('pfxPath', pfxPath);
|
|
261
|
+
}
|
|
262
|
+
function getRequiresElevatedPermissionsMessage(isInstall = true) {
|
|
263
|
+
return `${generalUtils_js_1.Emoji.Info} Important: ${isInstall ? '' : 'un'}installing a certificate requires elevated permissions`;
|
|
264
|
+
}
|
|
201
265
|
// Newer cert requirements force the need for "extension info" with DNS and IP info, but openssl v1.x doesn't support that with the
|
|
202
266
|
// CLI option -addext, so we're using a san.cnf file instead and passing this into the CLI command with the -config option.
|
|
203
267
|
const sanCnfTemplate = `[req]
|
|
@@ -216,4 +280,4 @@ DNS.1 = {{url}}
|
|
|
216
280
|
IP.1 = 127.0.0.1
|
|
217
281
|
|
|
218
282
|
`;
|
|
219
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydFV0aWxzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NlcnRVdGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNEQUF3QjtBQUN4QixnRUFBa0M7QUFDbEMsMERBQTRCO0FBQzVCLGdFQUFpRDtBQUNqRCx1REFBdUM7QUFFdkMsTUFBTSxvQkFBb0IsR0FBRywwQ0FBMEMsQ0FBQTtBQUN2RSxNQUFNLG9CQUFvQixHQUFHLHdGQUF3RixDQUFBO0FBRXJIOzs7O0dBSUc7QUFDSSxLQUFLLFVBQVUsdUJBQXVCLENBQUMsR0FBVyxFQUFFLGtCQUEwQixRQUFRO0lBQzNGLFlBQVksQ0FBQyxhQUFhLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQ3RDLHVCQUF1QixDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzVCLE1BQU0sS0FBSyxHQUFHLFlBQVksQ0FBQyxhQUFhLEVBQUUsQ0FBQTtJQUMxQyxNQUFNLFNBQVMsR0FBRyxFQUFFLEdBQUcsRUFBRSxlQUFlLEVBQUUsQ0FBQTtJQUUxQyxJQUFBLHFCQUFHLEVBQUMsb0NBQW9DLENBQUMsQ0FBQTtJQUN6QyxJQUFJLGVBQWUsR0FBVyxFQUFFLENBQUE7SUFDaEMsSUFBSSxDQUFDLEtBQUssRUFBRTtRQUNWLE1BQU0sV0FBVyxHQUFHLFlBQVksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLENBQUMsUUFBUSxDQUFBO1FBQzlELElBQUksQ0FBQyxXQUFXLEVBQUU7WUFDaEIsTUFBTSxLQUFLLENBQUMsdUNBQXVDLENBQUMsQ0FBQTtTQUNyRDtRQUNELElBQUEscUJBQUcsRUFBQyx1QkFBdUIsV0FBVyxFQUFFLENBQUMsQ0FBQTtLQUMxQztTQUFNLElBQUksS0FBSyxFQUFFO1FBQ2hCLE1BQU0sb0JBQW9CLEdBQUcsa0JBQWtCLEVBQUUsQ0FBQTtRQUNqRCxJQUFJLENBQUMsb0JBQW9CLEVBQUU7WUFDekIsTUFB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
|
|
283
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"certUtils.js","sourceRoot":"","sources":["../../src/certUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,7 +92,7 @@ async function deleteScriptFileIfEmpty(scriptPath) {
|
|
|
92
92
|
await promises_1.default.unlink(scriptPath);
|
|
93
93
|
}
|
|
94
94
|
else {
|
|
95
|
-
(0, generalUtils_js_1.log)(
|
|
95
|
+
(0, generalUtils_js_1.log)(`${generalUtils_js_1.Emoji.Warning} Skipping deletion of non-empty script file: ${scriptPath}`);
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
}
|
|
@@ -110,7 +110,7 @@ async function getLastMigrationName(projectPath, dbContextName) {
|
|
|
110
110
|
});
|
|
111
111
|
(0, generalUtils_js_1.log)(`Found migrations: ${migrationNamesWithTimestamps.map(m => m.name).join(', ')}`);
|
|
112
112
|
(0, generalUtils_js_1.log)(`Found timestamps: ${migrationNamesWithTimestamps.map(m => m.timestamp).join(', ')}`);
|
|
113
|
-
const sortedMigrationNames = migrationNamesWithTimestamps.sort((a, b) => a.timestamp.localeCompare(b.timestamp));
|
|
113
|
+
const sortedMigrationNames = [...migrationNamesWithTimestamps].sort((a, b) => a.timestamp.localeCompare(b.timestamp));
|
|
114
114
|
const lastMigrationName = sortedMigrationNames[sortedMigrationNames.length - 1].name;
|
|
115
115
|
return lastMigrationName;
|
|
116
116
|
}
|
|
@@ -123,7 +123,7 @@ function getMigrationsDirectory(projectDirectory, dbContextName) {
|
|
|
123
123
|
function getScriptPath(projectDirectory, migrationName, isUp) {
|
|
124
124
|
return node_path_1.default.join(projectDirectory, `Scripts/${migrationName}${isUp ? '' : '_Down'}.sql`);
|
|
125
125
|
}
|
|
126
|
-
async function
|
|
126
|
+
async function getCSharpMigrationFilePath(projectDirectory, dbContextName, migrationName) {
|
|
127
127
|
const migrationsOutputDir = getMigrationsDirectory(projectDirectory, dbContextName);
|
|
128
128
|
if (!node_fs_1.default.existsSync(migrationsOutputDir)) {
|
|
129
129
|
throw new Error(`Unable to add migration C# boilerplate - could not find migrations output directory: ${migrationsOutputDir}`);
|
|
@@ -140,66 +140,56 @@ async function addDbMigrationBoilerplate(projectDirectory, dbContextName, migrat
|
|
|
140
140
|
const filename = filenames[0];
|
|
141
141
|
const filePath = node_path_1.default.join(migrationsOutputDir, filename);
|
|
142
142
|
if (!node_fs_1.default.existsSync(filePath)) {
|
|
143
|
-
throw new Error(`Issue generating file path for migration (
|
|
144
|
-
}
|
|
145
|
-
(0, generalUtils_js_1.log)(`Adding boilerplate to file 📄${filePath}`);
|
|
146
|
-
const usingLine = 'using MikeyT.DbMigrations;';
|
|
147
|
-
const upLine = `MigrationScriptRunner.RunScript(migrationBuilder, "${migrationName}.sql");`;
|
|
148
|
-
const downLine = `MigrationScriptRunner.RunScript(migrationBuilder, "${migrationName}_Down.sql");`;
|
|
149
|
-
const fileContents = await promises_1.default.readFile(filePath, { encoding: 'utf8' });
|
|
150
|
-
const lines = fileContents.replaceAll('\r', '').split('\n');
|
|
151
|
-
const newLines = [];
|
|
152
|
-
newLines.push(lines[0].trim());
|
|
153
|
-
newLines.push(usingLine);
|
|
154
|
-
let addUpLine = false;
|
|
155
|
-
let addDownLine = false;
|
|
156
|
-
let skipNextLineIfBlank = false;
|
|
157
|
-
for (let i = 1; i < lines.length; i++) {
|
|
158
|
-
if (skipNextLineIfBlank && lines[i].trim().length === 0) {
|
|
159
|
-
skipNextLineIfBlank = false;
|
|
160
|
-
continue;
|
|
161
|
-
}
|
|
162
|
-
if (addUpLine) {
|
|
163
|
-
const newLine = lines[i].replace('{', `{\n\t\t\t${upLine}`);
|
|
164
|
-
newLines.push(newLine);
|
|
165
|
-
addUpLine = false;
|
|
166
|
-
skipNextLineIfBlank = true;
|
|
167
|
-
continue;
|
|
168
|
-
}
|
|
169
|
-
if (addDownLine) {
|
|
170
|
-
const newLine = lines[i].replace('{', `{\n\t\t\t${downLine}`);
|
|
171
|
-
newLines.push(newLine);
|
|
172
|
-
addDownLine = false;
|
|
173
|
-
skipNextLineIfBlank = true;
|
|
174
|
-
continue;
|
|
175
|
-
}
|
|
176
|
-
newLines.push(lines[i]);
|
|
177
|
-
if (lines[i].includes('void Up')) {
|
|
178
|
-
addUpLine = true;
|
|
179
|
-
}
|
|
180
|
-
if (lines[i].includes('void Down')) {
|
|
181
|
-
addDownLine = true;
|
|
182
|
-
}
|
|
143
|
+
throw new Error(`Issue generating file path for migration (bad file path): ${filePath}`);
|
|
183
144
|
}
|
|
184
|
-
|
|
145
|
+
return filePath;
|
|
146
|
+
}
|
|
147
|
+
async function addDbMigrationBoilerplate(projectDirectory, dbContextName, migrationName) {
|
|
148
|
+
const filePath = await getCSharpMigrationFilePath(projectDirectory, dbContextName, migrationName);
|
|
149
|
+
(0, generalUtils_js_1.log)(`Replacing file contents with boilerplate for file 📄${filePath}`);
|
|
150
|
+
const newFileContents = cSharpMigrationFileTemplate
|
|
151
|
+
.replaceAll(contextNamePlaceholder, dbContextName)
|
|
152
|
+
.replaceAll(migrationNamePlaceholder, migrationName);
|
|
185
153
|
await promises_1.default.writeFile(filePath, newFileContents, { encoding: 'utf8' });
|
|
186
|
-
(0, generalUtils_js_1.log)(`Updated file with boilerplate - please ensure it is correct:
|
|
154
|
+
(0, generalUtils_js_1.log)(`Updated file with boilerplate - please ensure it is correct: 📄${filePath}`);
|
|
187
155
|
const upScriptPath = node_path_1.default.join(projectDirectory, `Scripts/${migrationName}.sql`);
|
|
188
156
|
const downScriptPath = node_path_1.default.join(projectDirectory, `Scripts/${migrationName}_Down.sql`);
|
|
189
157
|
(0, generalUtils_js_1.log)('\nCreating corresponding empty sql files (no action will be taken if they already exist):');
|
|
190
158
|
(0, generalUtils_js_1.log)(` - 📄${upScriptPath}`);
|
|
191
159
|
(0, generalUtils_js_1.log)(` - 📄${downScriptPath}\n`);
|
|
192
|
-
|
|
193
|
-
|
|
160
|
+
await writeEmptySqlFileIfNotExists(upScriptPath, 'Up');
|
|
161
|
+
await writeEmptySqlFileIfNotExists(downScriptPath, 'Down');
|
|
162
|
+
}
|
|
163
|
+
async function writeEmptySqlFileIfNotExists(scriptPath, scriptType) {
|
|
164
|
+
if (!node_fs_1.default.existsSync(scriptPath)) {
|
|
165
|
+
await promises_1.default.writeFile(scriptPath, '', { encoding: 'utf8' });
|
|
194
166
|
}
|
|
195
167
|
else {
|
|
196
|
-
(0, generalUtils_js_1.log)(
|
|
168
|
+
(0, generalUtils_js_1.log)(`Skipping ${scriptType} sql script (already exists)`);
|
|
197
169
|
}
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
170
|
+
}
|
|
171
|
+
const contextNamePlaceholder = '{{context_name}}';
|
|
172
|
+
const migrationNamePlaceholder = '{{migration_name}}';
|
|
173
|
+
const cSharpMigrationFileTemplate = `using Microsoft.EntityFrameworkCore.Migrations;
|
|
174
|
+
using MikeyT.DbMigrations;
|
|
175
|
+
|
|
176
|
+
#nullable disable
|
|
177
|
+
|
|
178
|
+
namespace DbMigrator.Migrations.${contextNamePlaceholder}Migrations
|
|
179
|
+
{
|
|
180
|
+
public partial class ${migrationNamePlaceholder} : Migration
|
|
181
|
+
{
|
|
182
|
+
protected override void Up(MigrationBuilder migrationBuilder)
|
|
183
|
+
{
|
|
184
|
+
MigrationScriptRunner.RunScript(migrationBuilder, "${migrationNamePlaceholder}.sql");
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
protected override void Down(MigrationBuilder migrationBuilder)
|
|
188
|
+
{
|
|
189
|
+
MigrationScriptRunner.RunScript(migrationBuilder, "${migrationNamePlaceholder}_Down.sql");
|
|
190
|
+
}
|
|
203
191
|
}
|
|
204
192
|
}
|
|
205
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dbMigrationUtils.js","sourceRoot":"","sources":["../../src/dbMigrationUtils.ts"],"names":[],"mappings":"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"}
|
|
193
|
+
|
|
194
|
+
`;
|
|
195
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dbMigrationUtils.js","sourceRoot":"","sources":["../../src/dbMigrationUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotnetUtils.d.ts","sourceRoot":"","sources":["../../src/dotnetUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dotnetUtils.d.ts","sourceRoot":"","sources":["../../src/dotnetUtils.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,WAAW,EAAE,MAAM,iBAGpD;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,WAAW,GAAE,MAAa,EAAE,aAAa,GAAE,MAAkB,EAAE,SAAS,GAAE,MAAkB,EAAE,GAAG,CAAC,EAAE,MAAM,iBAY7I;AAED;;GAEG;AACH,wBAAsB,2BAA2B,kBAShD;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,kBAG5C"}
|
package/dist/cjs/dotnetUtils.js
CHANGED
|
@@ -27,7 +27,9 @@ async function dotnetPublish(projectPath = './', configuration = 'Release', outp
|
|
|
27
27
|
(0, generalUtils_js_1.requireValidPath)('cwd', cwd);
|
|
28
28
|
}
|
|
29
29
|
const args = ['publish', projectPath, '-c', configuration, '-o', outputDir];
|
|
30
|
-
|
|
30
|
+
const traceMessage = `running dotnet ${args.join(' ')}`;
|
|
31
|
+
const traceAdditional = cwd ? ` in cwd ${cwd}` : '';
|
|
32
|
+
(0, generalUtils_js_1.trace)(`${traceMessage}${traceAdditional}`);
|
|
31
33
|
await (0, generalUtils_js_1.spawnAsync)('dotnet', args, { cwd: cwd });
|
|
32
34
|
}
|
|
33
35
|
exports.dotnetPublish = dotnetPublish;
|
|
@@ -56,4 +58,4 @@ async function configureDotnetDevCerts() {
|
|
|
56
58
|
await (0, generalUtils_js_1.spawnAsync)('dotnet', ['dev-certs', 'https', '-t']);
|
|
57
59
|
}
|
|
58
60
|
exports.configureDotnetDevCerts = configureDotnetDevCerts;
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG90bmV0VXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZG90bmV0VXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsdURBQXNHO0FBTXRHOzs7O0dBSUc7QUFDSSxLQUFLLFVBQVUsV0FBVyxDQUFDLFdBQW1CO0lBQ25ELElBQUEsa0NBQWdCLEVBQUMsYUFBYSxFQUFFLFdBQVcsQ0FBQyxDQUFBO0lBQzVDLE1BQU0sSUFBQSw0QkFBVSxFQUFDLFFBQVEsRUFBRSxDQUFDLE9BQU8sRUFBRSxXQUFXLENBQUMsRUFBRSxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO0FBQzlFLENBQUM7QUFIRCxrQ0FHQztBQUVEOzs7Ozs7R0FNRztBQUNJLEtBQUssVUFBVSxhQUFhLENBQUMsY0FBc0IsSUFBSSxFQUFFLGdCQUF3QixTQUFTLEVBQUUsWUFBb0IsU0FBUyxFQUFFLEdBQVk7SUFDNUksSUFBQSxrQ0FBZ0IsRUFBQyxhQUFhLEVBQUUsV0FBVyxDQUFDLENBQUE7SUFDNUMsSUFBQSwrQkFBYSxFQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUNyQyxJQUFBLCtCQUFhLEVBQUMsZUFBZSxFQUFFLGFBQWEsQ0FBQyxDQUFBO0lBQzdDLElBQUksR0FBRyxFQUFFO1FBQ1AsSUFBQSxrQ0FBZ0IsRUFBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUE7S0FDN0I7SUFDRCxNQUFNLElBQUksR0FBRyxDQUFDLFNBQVMsRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUE7SUFDM0UsTUFBTSxZQUFZLEdBQUcsa0JBQWtCLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQTtJQUN2RCxNQUFNLGVBQWUsR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLFdBQVcsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtJQUNuRCxJQUFBLHVCQUFLLEVBQUMsR0FBRyxZQUFZLEdBQUcsZUFBZSxFQUFFLENBQUMsQ0FBQTtJQUMxQyxNQUFNLElBQUEsNEJBQVUsRUFBQyxRQUFRLEVBQUUsSUFBSSxFQUFFLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUE7QUFDaEQsQ0FBQztBQVpELHNDQVlDO0FBRUQ7O0dBRUc7QUFDSSxLQUFLLFVBQVUsMkJBQTJCO0lBQy9DLE1BQU0sU0FBUyxHQUFHLElBQUEsMkJBQVMsRUFBQyxXQUFXLENBQUMsQ0FBQyxRQUFRLENBQUE7SUFDakQsSUFBSSxTQUFTLEVBQUU7UUFDYixJQUFBLHFCQUFHLEVBQUMsK0NBQStDLENBQUMsQ0FBQTtLQUNyRDtTQUFNO1FBQ0wsSUFBQSxxQkFBRyxFQUFDLDZDQUE2QyxDQUFDLENBQUE7S0FDbkQ7SUFDRCxNQUFNLElBQUksR0FBRyxDQUFDLE1BQU0sRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsU0FBUyxFQUFFLFVBQVUsRUFBRSxXQUFXLENBQUMsQ0FBQTtJQUNoRixNQUFNLElBQUEsNEJBQVUsRUFBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLENBQUE7QUFDbEMsQ0FBQztBQVRELGtFQVNDO0FBRUQ7Ozs7R0FJRztBQUNJLEtBQUssVUFBVSx1QkFBdUI7SUFDM0MsTUFBTSxJQUFBLDRCQUFVLEVBQUMsUUFBUSxFQUFFLENBQUMsV0FBVyxFQUFFLE9BQU8sRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFBO0lBQzdELE1BQU0sSUFBQSw0QkFBVSxFQUFDLFFBQVEsRUFBRSxDQUFDLFdBQVcsRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQTtBQUMxRCxDQUFDO0FBSEQsMERBR0MifQ==
|