X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnntp%2Fnntpconnection.cpp;h=b3eeecc583734ef824dcc2c111a0a01a58546768;hb=0574a75431d98ed64c5cc6291600bb3759b399a6;hp=cc5cffe6fb99dc31b412e9eeb030c0b790fcd44e;hpb=4430e7762844c66428b6f822288beb71b7f82b95;p=fms.git

diff --git a/src/nntp/nntpconnection.cpp b/src/nntp/nntpconnection.cpp
index cc5cffe..b3eeecc 100644
--- a/src/nntp/nntpconnection.cpp
+++ b/src/nntp/nntpconnection.cpp
@@ -28,6 +28,7 @@ NNTPConnection::NNTPConnection(SOCKET sock)
 	m_status.m_boardid=-1;
 	m_status.m_messageid=-1;
 	m_status.m_mode=MODE_NONE;
+	m_status.m_authenticated=false;
 
 	Option::Instance()->Get("NNTPAllowPost",tempval);
 	if(tempval=="true")
@@ -68,6 +69,58 @@ const bool NNTPConnection::HandleArticleCommand(const NNTPCommand &command)
 	return true;
 }
 
+const bool NNTPConnection::HandleAuthInfoCommand(const NNTPCommand &command)
+{
+	if(command.m_arguments.size()<2)
+	{
+		SendBufferedLine("501 Syntax error");
+	}
+	else if(m_status.m_authenticated==true)
+	{
+		SendBufferedLine("502 Command unavailable");		// not available when already authenticated
+	}
+	else
+	{
+		std::string arg=command.m_arguments[0];
+		StringFunctions::UpperCase(arg,arg);
+		std::string name="";
+		// get remaining args as part of the name since a name might have a space and the args are split on spaces
+		for(std::vector<std::string>::const_iterator i=command.m_arguments.begin()+1; i!=command.m_arguments.end(); i++)
+		{
+			// we split on the space, so add it back
+			if(i!=command.m_arguments.begin()+1)
+			{
+				name+=" ";
+			}	
+			name+=(*i);
+		}
+		if(arg=="USER")
+		{
+			LocalIdentity localid;
+			if(localid.Load(name))
+			{
+				m_status.m_authuser=localid;
+				m_status.m_authenticated=true;
+				SendBufferedLine("281 Authentication accepted");
+			}
+			else
+			{
+				SendBufferedLine("481 Authentication failed");
+			}
+		}
+		else if(arg=="PASS")
+		{
+			SendBufferedLine("482 Authentication commands issued out of sequence");	// only require username
+		}
+		else
+		{
+			SendBufferedLine("501 Syntax error");
+		}
+	}
+
+	return true;
+}
+
 const bool NNTPConnection::HandleBodyCommand(const NNTPCommand &command)
 {
 	SendArticleParts(command);
@@ -80,7 +133,10 @@ const bool NNTPConnection::HandleCapabilitiesCommand(const NNTPCommand &command)
 	
 	SendBufferedLine("101 Capability list :");
 	SendBufferedLine("VERSION 2");
-	SendBufferedLine("MODE-READER");
+	if(m_status.m_authenticated==false)		// RFC 4643 2.2 0 - don't advertise MODE-READER after authentication
+	{
+		SendBufferedLine("MODE-READER");
+	}
 	SendBufferedLine("READER");
 	SendBufferedLine("LIST OVERVIEW.FMT");
 	SendBufferedLine("OVER MSGID");
@@ -88,6 +144,10 @@ const bool NNTPConnection::HandleCapabilitiesCommand(const NNTPCommand &command)
 	{
 		SendBufferedLine("POST");
 	}
+	if(m_status.m_authenticated==false)
+	{
+		SendBufferedLine("AUTHINFO USER");
+	}
 	SendBufferedLine(".");
 	
 	return true;
@@ -163,6 +223,10 @@ const bool NNTPConnection::HandleCommand(const NNTPCommand &command)
 	{
 		return HandleOverCommand(command);
 	}
+	if(command.m_command=="AUTHINFO")
+	{
+		return HandleAuthInfoCommand(command);
+	}
 
 	return false;
 }
@@ -783,6 +847,12 @@ void NNTPConnection::HandlePostedMessage(const std::string &message)
 
 	if(mess.ParseNNTPMessage(message))
 	{
+		// if we authenticated, set the username to the authenticated user
+		if(m_status.m_authenticated)
+		{
+			mess.SetFromName(m_status.m_authuser.GetName());
+		}
+		// handle a messages posted to an adminboard
 		if(mess.PostedToAdministrationBoard()==true)
 		{
 			mess.HandleAdministrationMessage();