@social-mail/social-mail-web-server 1.7.63 → 1.7.65
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/server/seed/ui/seed-ui.js +1 -1
- package/dist/server/storage/volume/av/AVService.d.ts.map +1 -1
- package/dist/server/storage/volume/av/AVService.js +15 -28
- package/dist/server/storage/volume/av/AVService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/server/seed/ui/seed-ui.ts +1 -1
- package/src/server/storage/volume/av/AVService.ts +10 -12
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { UIPackageConfig } from "../../services/DBConfig.js";
|
|
2
2
|
import semver from "semver";
|
|
3
3
|
export default async function seedUI(config) {
|
|
4
|
-
const version = "1.4.
|
|
4
|
+
const version = "1.4.79";
|
|
5
5
|
const existing = await config.getValue(UIPackageConfig, false);
|
|
6
6
|
if (existing) {
|
|
7
7
|
if (semver.gte(existing.version, version)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AVService.d.ts","sourceRoot":"","sources":["../../../../../src/server/storage/volume/av/AVService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,aAAa,MAAM,UAAU,CAAC;AAM1C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;
|
|
1
|
+
{"version":3,"file":"AVService.d.ts","sourceRoot":"","sources":["../../../../../src/server/storage/volume/av/AVService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,aAAa,MAAM,UAAU,CAAC;AAM1C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAqD/E,MAAM,CAAC,OAAO,OAAO,SAAS;IAE1B,MAAM,CAAC,OAAO;WAQD,IAAI,CAAC,IAAI,EAAE,SAAS;CAmBpC"}
|
|
@@ -47,7 +47,6 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
|
|
|
47
47
|
});
|
|
48
48
|
import FileInfectedError from "../../FileInfectedError.js";
|
|
49
49
|
import sleep from "../../../../common/sleep.js";
|
|
50
|
-
import SocketClient from "../../../../protocols/socket/client/SocketClient.js";
|
|
51
50
|
import LockFile from "../../LockFile.js";
|
|
52
51
|
import { globalEnv } from "../../../../common/globalEnv.js";
|
|
53
52
|
const debugMode = (globalEnv.av.debug ?? "false") === "true";
|
|
@@ -70,18 +69,15 @@ const loadScanner = async () => {
|
|
|
70
69
|
// socket exists... try to connect...
|
|
71
70
|
// console.log(`Waiting for clamd to start... at port ${socket}`);
|
|
72
71
|
try {
|
|
73
|
-
const
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
}
|
|
82
|
-
finally {
|
|
83
|
-
__disposeResources(env_1);
|
|
84
|
-
}
|
|
72
|
+
const { default: NodeClam } = await import("clamscan");
|
|
73
|
+
const nc = new NodeClam();
|
|
74
|
+
return await nc.init({
|
|
75
|
+
debugMode,
|
|
76
|
+
clamdscan: {
|
|
77
|
+
socket,
|
|
78
|
+
host
|
|
79
|
+
}
|
|
80
|
+
});
|
|
85
81
|
}
|
|
86
82
|
catch (error) {
|
|
87
83
|
console.error(error);
|
|
@@ -91,15 +87,6 @@ const loadScanner = async () => {
|
|
|
91
87
|
throw new Error(`could not connect to socket at ${socket}.`);
|
|
92
88
|
}
|
|
93
89
|
}
|
|
94
|
-
const { default: NodeClam } = await import("clamscan");
|
|
95
|
-
const nc = new NodeClam();
|
|
96
|
-
return await nc.init({
|
|
97
|
-
debugMode,
|
|
98
|
-
clamdscan: {
|
|
99
|
-
socket,
|
|
100
|
-
host
|
|
101
|
-
}
|
|
102
|
-
});
|
|
103
90
|
};
|
|
104
91
|
export default class AVService {
|
|
105
92
|
static scanner() {
|
|
@@ -110,7 +97,7 @@ export default class AVService {
|
|
|
110
97
|
return scanner;
|
|
111
98
|
}
|
|
112
99
|
static async scan(file) {
|
|
113
|
-
const
|
|
100
|
+
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
114
101
|
try {
|
|
115
102
|
const s = await this.scanner();
|
|
116
103
|
if (!s) {
|
|
@@ -120,18 +107,18 @@ export default class AVService {
|
|
|
120
107
|
return;
|
|
121
108
|
}
|
|
122
109
|
// lets try file lock...
|
|
123
|
-
const fl = __addDisposableResource(
|
|
110
|
+
const fl = __addDisposableResource(env_1, await LockFile.lock("av-lock"), false);
|
|
124
111
|
const results = await s.scanStream(file.openReadStream());
|
|
125
112
|
if (results.isInfected) {
|
|
126
113
|
throw new FileInfectedError(`File ${file.path} seem to be infected`);
|
|
127
114
|
}
|
|
128
115
|
}
|
|
129
|
-
catch (
|
|
130
|
-
|
|
131
|
-
|
|
116
|
+
catch (e_1) {
|
|
117
|
+
env_1.error = e_1;
|
|
118
|
+
env_1.hasError = true;
|
|
132
119
|
}
|
|
133
120
|
finally {
|
|
134
|
-
__disposeResources(
|
|
121
|
+
__disposeResources(env_1);
|
|
135
122
|
}
|
|
136
123
|
}
|
|
137
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AVService.js","sourceRoot":"","sources":["../../../../../src/server/storage/volume/av/AVService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,OAAO,iBAAiB,MAAM,4BAA4B,CAAC;AAE3D,OAAO,KAAK,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"AVService.js","sourceRoot":"","sources":["../../../../../src/server/storage/volume/av/AVService.ts"],"names":[],"mappings":"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"}
|