X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-oper.c;h=49768bc7e8f2b7974b0dd9c0048155bfdf7432c5;hb=9230f2fff1d374ecef93dafeb14099f22c9ef787;hp=dd408a6fa8bd8c77869397ff8655efcee881bdf6;hpb=37609d6a4f036b175fdc304d0ee466bd8ad57bf9;p=ngircd-alex.git

diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index dd408a6f..49768bc7 100644
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -28,12 +28,14 @@
 #include "conf.h"
 #include "channel.h"
 #include "class.h"
+#include "parse.h"
+#include "irc.h"
 #include "irc-macros.h"
 #include "irc-write.h"
+#include "lists.h"
 #include "log.h"
 #include "match.h"
 #include "messages.h"
-#include "parse.h"
 #include "op.h"
 
 #include <exp.h>
@@ -48,7 +50,9 @@ Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg)
 {
 	Log(LOG_WARNING, "Got invalid OPER from \"%s\": \"%s\" -- %s",
 	    Client_Mask(Client), errtoken, errmsg);
-	return IRC_WriteErrClient(Client, ERR_PASSWDMISMATCH_MSG,
+	/* Increase penalty to slow down possible brute force attacks */
+	IRC_SetPenalty(Client, 10);
+	return IRC_WriteStrClient(Client, ERR_PASSWDMISMATCH_MSG,
 				  Client_ID(Client));
 } /* Bad_OperPass */
 
@@ -68,8 +72,6 @@ IRC_OPER( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	_IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2)
-
 	len = array_length(&Conf_Opers, sizeof(*op));
 	op = array_start(&Conf_Opers);
 	for (i = 0; i < len && strcmp(op[i].name, Req->argv[0]); i++)
@@ -92,12 +94,10 @@ IRC_OPER( CLIENT *Client, REQUEST *Req )
 					  Client_ID(Client));
 	}
 
-	if (!Client_OperByMe(Client))
-		Log(LOG_NOTICE|LOG_snotice,
-		    "Got valid OPER for \"%s\" from \"%s\", user is an IRC operator now.",
-		    Req->argv[0], Client_Mask(Client));
+	Log(LOG_NOTICE|LOG_snotice,
+	    "Got valid OPER for \"%s\" from \"%s\", user is an IRC operator now.",
+	    Req->argv[0], Client_Mask(Client));
 
-	Client_SetOperByMe(Client, true);
 	return IRC_WriteStrClient(Client, RPL_YOUREOPER_MSG, Client_ID(Client));
 } /* IRC_OPER */
 
@@ -119,12 +119,6 @@ IRC_DIE(CLIENT * Client, REQUEST * Req)
 	assert(Client != NULL);
 	assert(Req != NULL);
 
-#ifdef STRICT_RFC
-	_IRC_ARGC_EQ_OR_RETURN_(Client, Req, 0)
-#else
-	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
-#endif
-
 	if (!Op_Check(Client, Req))
 		return Op_NoPrivileges(Client, Req);
 
@@ -162,8 +156,6 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	_IRC_ARGC_EQ_OR_RETURN_(Client, Req, 0)
-
 	if (!Op_Check(Client, Req))
 		return Op_NoPrivileges(Client, Req);
 
@@ -191,11 +183,6 @@ IRC_RESTART( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Bad number of parameters? */
-	if (Req->argc != 0)
-		return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
-
 	if (!Op_Check(Client, Req))
 		return Op_NoPrivileges(Client, Req);
 
@@ -325,11 +312,6 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req)
 	assert(Client != NULL);
 	assert(Req != NULL);
 
-	/* Bad number of parameters? */
-	if (Req->argc != 1)
-		return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
-
 	if (!Op_Check(Client, Req))
 		return Op_NoPrivileges(Client, Req);
 
@@ -371,13 +353,10 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	_IRC_ARGC_EQ_OR_RETURN_(Client, Req, 1)
-
 	switch (Client_Type(Client)) {
 	case CLIENT_USER:
-		if (!Client_OperByMe(Client))
-			return IRC_WriteErrClient(Client, ERR_NOPRIVILEGES_MSG,
-						  Client_ID(Client));
+		if (!Op_Check(Client, Req))
+			return Op_NoPrivileges(Client, Req);
 		from = Client;
 		break;
 	case CLIENT_SERVER:
@@ -405,9 +384,11 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req )
 GLOBAL bool
 IRC_xLINE(CLIENT *Client, REQUEST *Req)
 {
-	CLIENT *from;
+	CLIENT *from, *c, *c_next;
+	char reason[COMMAND_LEN], class_c;
+	struct list_head *list;
+	time_t timeout;
 	int class;
-	char class_c;
 
 	assert(Client != NULL);
 	assert(Req != NULL);
@@ -451,8 +432,11 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req)
 		}
 	} else {
 		/* Add new mask to list */
+		timeout = atol(Req->argv[1]);
+		if (timeout > 0)
+			timeout += time(NULL);
 		if (Class_AddMask(class, Req->argv[0],
-				  time(NULL) + atol(Req->argv[1]),
+				  timeout,
 				  Req->argv[2])) {
 			Log(LOG_NOTICE|LOG_snotice,
 			    "\"%s\" added \"%s\" to %c-Line list: \"%s\" (%ld seconds).",
@@ -465,6 +449,20 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req)
 						Req->argv[0], Req->argv[1],
 						Req->argv[2]);
 			}
+
+			/* Check currently connected clients */
+			snprintf(reason, sizeof(reason), "%c-Line by \"%s\": \"%s\"",
+				 class_c, Client_ID(from), Req->argv[2]);
+			list = Class_GetList(class);
+			c = Client_First();
+			while (c) {
+				c_next = Client_Next(c);
+				if ((class == CLASS_GLINE || Client_Conn(c) > NONE)
+				    && Lists_Check(list, c))
+					IRC_KillClient(Client, NULL,
+						       Client_ID(c), reason);
+				c = c_next;
+			}
 		}
 	}