xan/xenu_nntp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement checking for active newsgroup flag

Browse source
This commit is contained in:
XANTRONIX Development 2024-12-02 15:14:55 -05:00
parent 888d25394a
commit ea16a989f6
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/nntp/tiny/session.py
View file

@ -233,7 +233,7 @@ class Session():
'min': row[1], 'min': row[1],
'max': row[2], 'max': row[2],
'name': newsgroup.name, 'name': newsgroup.name,
'perms': 'n' 'perms': 'y' if newsgroup.active else 'n'
} }
def _cmd_listgroup(self, *args): def _cmd_listgroup(self, *args):
@ -697,28 +697,30 @@ class Session():
RE_NEWSGROUPS_SPLIT = re.compile(r'\s*,\s*') RE_NEWSGROUPS_SPLIT = re.compile(r'\s*,\s*')
def _save_message(self, message: Message): def _save_message(self, message: Message, success: ResponseCode):
value = message.header('Newsgroups') value = message.header('Newsgroups')
if value is None or value == '': if value is None or value == '':
return False return ResponseCode.NNTP_POST_FAILED
names = map(lambda s: s.lower(), self.RE_NEWSGROUPS_SPLIT.split(value)) names = map(lambda s: s.lower(), self.RE_NEWSGROUPS_SPLIT.split(value))
newsgroups = list() newsgroups = list()
for name in names: for name in names:
if name not in self.server.newsgroups: newsgroup = self.server.newsgroups.get(name)
return False
if newsgroup is None or not newsgroup.active:
return ResponseCode.NNTP_POST_PROHIBITED
newsgroups.append(self.server.newsgroups[name]) newsgroups.append(self.server.newsgroups[name])
if len(newsgroups) == 0: if len(newsgroups) == 0:
return False return ResponseCode.NNTP_POST_FAILED
message.message_id_assign() message.message_id_assign()
if not message.validate(): if not message.validate():
return False return ResponseCode.NNTP_POST_FAILED
self.db.add(message) self.db.add(message)
@ -733,7 +735,7 @@ class Session():
self.db.commit() self.db.commit()
return True return success
def _post_impl(self, message_id=None): def _post_impl(self, message_id=None):
if self.perms is None or not self.perms & UserPermission.POST: if self.perms is None or not self.perms & UserPermission.POST:
@ -777,10 +779,9 @@ class Session():
if stripped == '.': if stripped == '.':
message.finish() message.finish()
if self._save_message(message): code = self._save_message(message, code_received)
return self.respond(code_received)
else: return self.respond(code)
return self.respond(ResponseCode.NNTP_POST_FAILED)
elif stripped == '..': elif stripped == '..':
line = line[1:] line = line[1:]