zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

initial attachment support for usenet

Browse Source 
- can read a few attachments posted by PCs
- can not yet attach from WebTV Plus
This commit is contained in:
zefie
2022-10-13 00:26:05 -04:00
parent b9c067af15
commit 0b56f02ec4
5 changed files with 216 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
zefie_wtvp_minisrv/includes/WTVNews.js
View File

@@ -147,9 +147,17 @@ class WTVNews {
}));
Promise.all(promises).then(() => {
var self = this;
if (data.article.headers) Object.keys(data.article.headers).forEach((k) => {
data.article.headers[k] = self.decodeCharset(data.article.headers[k])
});
resolve(data);
});
} else {
var self = this;
if (data.article.headers) Object.keys(data.article.headers).forEach((k) => {
data.article.headers[k] = self.decodeCharset(data.article.headers[k])
});
resolve(data);
}
}).catch((e) => {
@@ -159,9 +167,37 @@ class WTVNews {
});
}
decodeCharset(string) {
var regex = /=\?{1}(.+)\?{1}([B|Q])\?{1}(.+)\?{1}=/;
var decoded = null;
var check = string.match(regex);
if (check) {
var match = check[0];
var charset = check[1];
var encoding = check[2];
var encoded_text = check[3];
switch (encoding) {
case "B":
var buffer = new Buffer.from(encoded_text, 'base64')
decoded = buffer.toString(charset).replace(/[^\x00-\x7F]/g, "");;
break;
case "Q":
// unimplemented
return string;
}
if (decoded) return string.replace(match, decoded);
}
return string;
}
getHeader(articleID) {
return new Promise((resolve, reject) => {
this.client.head(articleID).then((data) => {
var self = this;
if (data.article.headers) Object.keys(data.article.headers).forEach((k) => {
data.article.headers[k] = self.decodeCharset(data.article.headers[k])
});
resolve(data);
}).catch((e) => {
reject(`Error getting header for article ID ${articleID}`);
@@ -170,6 +206,19 @@ class WTVNews {
});
}
getHeaderFromMessage(message, header) {
var response = null;
if (message.article.headers) {
Object.keys(message.article.headers).forEach((k) => {
if (k.toLowerCase() == header.toLowerCase()) {
response = message.article.headers[k];
return false;
}
})
}
return response;
}
quitUsenet() {
return new Promise((resolve, reject) => {
this.client.quit().then((response) => {
@@ -220,7 +269,10 @@ class WTVNews {
'Message-ID': "<" + this.wtvshared.generatePassword(16) + "@" + this.minisrv_config.config.domain_name + ">",
'Date': this.strftime('%A, %d-%b-%y %k:%M:%S %z', new Date())
}
if (messageid) articleData.headers.References = messageid;
if (messageid) {
articleData.headers.References = messageid;
articleData.headers['In-Reply-To'] = messageid;
}
if (msg_body) {
articleData.body = msg_body.split("\n");
@@ -290,6 +342,70 @@ class WTVNews {
});
}
parseAttachments(message) {
var contype = this.getHeaderFromMessage(message, 'Content-Type');
if (contype) {
var regex = /multipart\/mixed\; boundary=\"(.+)\"/i;
var match = contype.match(regex);
if (match) {
var boundary = "--" + match[1];
var body = message.article.body.join("\n").split(boundary);
var attachments = [];
var i = 0;
var message_body = '';
var message_type = 'text/plain';
body.forEach((element) => {
var section_type = null;
var section = element.split("\n");
attachments[i] = {};
section.forEach((line) => {
var section_header_match = line.match(/^Content\-/i)
if (section_header_match) {
var section_match = line.match(/^Content\-Type\: (.+)\;/i)
if (section_match) {
if (section_match[1].match(/text\/(html|plain)/)) {
section_type = section_match[1].match(/(text\/(html|plain))/)[1];
message_type = section_type;
} else {
section_type = section_match[1];
attachments[i].content_type = section_match[1]
}
}
section_match = line.match(/^Content\-Disposition\: (.+)\;/i)
if (section_match) {
section_match = line.match(/^Content\-Disposition\: (.+)\; filename=\"(.+)\"/i)
if (section_match) attachments[i].filename = section_match[2];
}
section_match = line.match(/^Content-Transfer-Encoding: (.+)/i)
if (section_match) attachments[i].content_encoding = section_match[1];
} else {
if (section_type != null) {
if (section_type.match(/(text\/[html|plain])/)) message_body += line;
else {
if (attachments[i].data) attachments[i].data += line;
else attachments[i].data = line;
}
}
}
})
if (attachments[i].content_type) i++;
})
attachments.pop();
return {
text: message_body,
text_type: message_type,
attachments: attachments
}
} else {
return { text: message.article.body.join("\n") }
}
} else {
return { text: message.article.body.join("\n") }
}
}
sortByResponse(messages) {
var sorted = [];
var message_id_roots = [];

15
zefie_wtvp_minisrv/includes/WTVNewsServer.js
View File

@@ -93,7 +93,6 @@ class WTVNewsServer {
},
_buildHeaderField: function (session, message, field) {
console.log(message,field);
if (field.indexOf(':') > 0) field = field.replace(/\:/g, '');
var search = self.getHeader(message, field);
if (search) return search;
@@ -148,13 +147,9 @@ class WTVNewsServer {
}
getHeader(message, header) {
try {
var search = Object.keys(message.headers).find(e => (e.toLowerCase() == header.toLowerCase()));
if (search) return message.headers[search];
return null;
} catch (e) {
console.log(e);
}
var search = Object.keys(message.headers).find(e => (e.toLowerCase() == header.toLowerCase()));
if (search) return message.headers[search];
return null;
}
createDataStore() {
@@ -172,6 +167,10 @@ class WTVNewsServer {
try {
post_data.articleNumber = articleNumber;
post_data.messageId = this.getHeader(post_data, "message-id");
if (!post_data.messageId) {
var messageId = "<" + this.wtvshared.generatePassword(16) + "@" + this.minisrv_config.config.domain_name + ">";
post_data.messageId = post_data.headers['Message-ID'] = messageId;
}
//Tue, 11 Oct 2022 17:25:16 -0400
post_data.headers.Date = this.strftime("%a, %-d %b %Y %H:%M:%S %z", Date.parse(post_data.headers.date))
post_data.headers['INJECTION-DATE'] = this.strftime("%a, %-d %b %Y %H:%M:%S %z", Date.parse(Date.now()))