X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/blobdiff_plain/26cbd0999d84e80dc93d01bc7cc432b00c1b3f06..2af7cf5058dcf0f326292e32c52e04ff52bc1252:/request/request.c

diff --git a/request/request.c b/request/request.c
index 3ba954ea..7c192909 100644
--- a/request/request.c
+++ b/request/request.c
@@ -7,13 +7,16 @@
 #include "../core/schedule.h"
 #include "../lib/irc_string.h"
 #include "../lib/splitline.h"
+#include "../lib/version.h"
 #include "../control/control.h"
 #include "../splitlist/splitlist.h"
 #include "request.h"
 #include "request_block.h"
+#include "request_fasttrack.h"
 #include "lrequest.h"
 #include "sqrequest.h"
-#include "user.h"
+
+MODULE_VERSION("");
 
 nick *rqnick;
 CommandTree *rqcommands;
@@ -30,11 +33,6 @@ int rqcmd_listblocks(void *user, int cargc, char **cargv);
 int rqcmd_stats(void *user, int cargc, char **cargv);
 int rqcmd_requestop(void *user, int cargc, char **cargv);
 
-int rqcmd_adduser(void *user, int cargc, char **cargv);
-int rqcmd_deluser(void *user, int cargc, char **cargv);
-int rqcmd_changelev(void *user, int cargc, char **cargv);
-int rqcmd_userlist(void *user, int cargc, char **cargv);
-
 #define min(a,b) ((a > b) ? b : a)
 
 /* stats counters */
@@ -46,7 +44,17 @@ int rq_blocked = 0;
 /* log fd */
 FILE *rq_logfd;
 
+static int extloaded = 0;
+
 void _init(void) {
+  if(!rq_initblocks())
+    return;
+
+  if(!rq_initfasttrack())
+    return;
+
+  extloaded = 1;
+
   rqcommands = newcommandtree();
 
   addcommandtotree(rqcommands, "showcommands", RQU_ANY, 1, &rqcmd_showcommands);
@@ -54,19 +62,12 @@ void _init(void) {
   addcommandtotree(rqcommands, "requestspamscan", RQU_ANY, 1, &rqcmd_requestspamscan);
   addcommandtotree(rqcommands, "requestop", RQU_ANY, 2, &rqcmd_requestop);
 
-  addcommandtotree(rqcommands, "addblock", RQU_ACCOUNT, 3, &rqcmd_addblock);
-  addcommandtotree(rqcommands, "delblock", RQU_ACCOUNT, 1, &rqcmd_delblock);
-  addcommandtotree(rqcommands, "listblocks", RQU_ACCOUNT, 1, &rqcmd_listblocks);
-  addcommandtotree(rqcommands, "stats", RQU_ACCOUNT, 1, &rqcmd_stats);
-
-  addcommandtotree(rqcommands, "adduser", RQU_OPER, 2, &rqcmd_adduser);
-  addcommandtotree(rqcommands, "deluser", RQU_OPER, 1, &rqcmd_deluser);
-  addcommandtotree(rqcommands, "changelev", RQU_OPER, 2, &rqcmd_changelev);
-  addcommandtotree(rqcommands, "userlist", RQU_OPER, 1, &rqcmd_userlist);
+  addcommandtotree(rqcommands, "addblock", RQU_OPER, 3, &rqcmd_addblock);
+  addcommandtotree(rqcommands, "delblock", RQU_OPER, 1, &rqcmd_delblock);
+  addcommandtotree(rqcommands, "listblocks", RQU_OPER, 1, &rqcmd_listblocks);
+  addcommandtotree(rqcommands, "stats", RQU_OPER, 1, &rqcmd_stats);
   
-  rq_initblocks();
   qr_initrequest();
-  ru_load();
 
   rq_logfd = fopen(RQ_LOGFILE, "a");
   
@@ -74,6 +75,9 @@ void _init(void) {
 }
 
 void _fini(void) {
+  if(!extloaded)
+    return;
+
   deregisterlocaluser(rqnick, NULL);
 
   deletecommandfromtree(rqcommands, "showcommands", &rqcmd_showcommands);
@@ -86,16 +90,11 @@ void _fini(void) {
   deletecommandfromtree(rqcommands, "listblocks", &rqcmd_listblocks);
   deletecommandfromtree(rqcommands, "stats", &rqcmd_stats);
 
-  deletecommandfromtree(rqcommands, "adduser", &rqcmd_adduser);
-  deletecommandfromtree(rqcommands, "deluser", &rqcmd_deluser);
-  deletecommandfromtree(rqcommands, "changelev", &rqcmd_changelev);
-  deletecommandfromtree(rqcommands, "userlist", &rqcmd_userlist);
-
   destroycommandtree(rqcommands);
 
   rq_finiblocks();
+  rq_finifasttrack();
   qr_finirequest();
-  ru_persist();
 
   if (rq_logfd != NULL)
     fclose(rq_logfd);
@@ -106,8 +105,8 @@ void _fini(void) {
 void rq_registeruser(void) {
   channel *cp;
 
-  rqnick = registerlocaluser(RQ_REQUEST_NICK, RQ_REQUEST_USER, RQ_REQUEST_HOST,
-                             RQ_REQUEST_REAL, RQ_REQUEST_AUTH,
+  rqnick = registerlocaluserflags(RQ_REQUEST_NICK, RQ_REQUEST_USER, RQ_REQUEST_HOST,
+                             RQ_REQUEST_REAL, RQ_REQUEST_AUTH, RQ_REQUEST_AUTHID, 0,
                              UMODE_ACCOUNT | UMODE_SERVICE | UMODE_OPER,
                              rq_handler);
 
@@ -163,13 +162,6 @@ void rq_handler(nick *target, int type, void **params) {
         return;
       }
 
-      if ((cmd->level & RQU_ACCOUNT) && (!IsAccount(user) || ru_getlevel(user) == 0) && !IsOper(user)) {
-        sendnoticetouser(rqnick, user, "Sorry, this command is not "
-              "available to you.");
-
-	return;
-      }
-
       if (cargc - 1 > cmd->maxparams)
         rejoinline(cargv[cmd->maxparams], cargc - cmd->maxparams);
 
@@ -182,7 +174,7 @@ void rq_handler(nick *target, int type, void **params) {
 
       break;
     case LU_PRIVNOTICE:
-      qr_handlenotice(params[0], params[1]);
+      qr_handle_notice(params[0], params[1]);
 
       break;
   }
@@ -202,9 +194,6 @@ int rqcmd_showcommands(void *user, int cargc, char **cargv) {
     if ((cmdlist[i]->level & RQU_OPER) && !IsOper(np))
       continue;
  
-    if ((cmdlist[i]->level & RQU_ACCOUNT) && !(IsOper(np) || (IsAccount(np) && ru_getlevel(np) > 0)))
-      continue;
-
     sendnoticetouser(rqnick, np, "%s", cmdlist[i]->command->content);
   }
 
@@ -213,12 +202,12 @@ int rqcmd_showcommands(void *user, int cargc, char **cargv) {
   return 0;
 }
 
-int rq_genericrequestcheck(nick *np, char *channelname, channel **cp, nick **lnick, nick **qnick) {
+int rq_genericrequestcheck(nick *np, char *channelname, channel **cp, nick **qnick) {
   unsigned long *userhand;
   rq_block *block;
 
   if (!IsAccount(np)) {
-    sendnoticetouser(rqnick, np, "Error: You must be authed.");
+    sendnoticetouser(rqnick, np, "Error: You must be authed to perform a service request.");
 
     return RQ_ERROR;
   }
@@ -226,26 +215,17 @@ int rq_genericrequestcheck(nick *np, char *channelname, channel **cp, nick **lni
   *cp = findchannel(channelname);
 
   if (*cp == NULL) {
-    sendnoticetouser(rqnick, np, "Error: Channel %s does not exist.",
+    sendnoticetouser(rqnick, np, "Error: Channel '%s' does not exist on the network.",
           channelname);
 
     return RQ_ERROR;
   }
 
-  *lnick = getnickbynick(RQ_LNICK);
-
-  if (*lnick == NULL || findserver(RQ_LSERVER) < 0) {
-    sendnoticetouser(rqnick, np, "Error: %s does not seem to be online. "
-          "Try again later.", RQ_LNICK);
-
-    return RQ_ERROR;
-  }
-
   *qnick = getnickbynick(RQ_QNICK);
 
   if (*qnick == NULL || findserver(RQ_QSERVER) < 0) {
     sendnoticetouser(rqnick, np, "Error: %s does not seem to be online. "
-          "Try again later.", RQ_QNICK);
+          "Please try again later.", RQ_QNICK);
 
     return RQ_ERROR;
   }
@@ -268,8 +248,18 @@ int rq_genericrequestcheck(nick *np, char *channelname, channel **cp, nick **lni
   block = rq_findblock(channelname);
 
   if (block != NULL) {
-    sendnoticetouser(rqnick, np, "Error: You are not allowed to request a "
-          "service to this channel.");
+     /* only say when block expires if <7 days */
+     if ( block->expires < getnettime() + 3600 * 24 * 7) {
+       sendnoticetouser(rqnick, np, "Error: You are not allowed to request a "
+            "service to '%s'. Keep waiting for at least %s before you try again.",
+            channelname, rq_longtoduration(block->expires - getnettime()));
+       /* give them another 5 minutes to think about it */
+       block->expires += 300;
+       rq_saveblocks();
+     } else {
+       sendnoticetouser(rqnick, np, "Error: You are not allowed to request a "
+          "service to '%s'.", channelname);
+     }
     sendnoticetouser(rqnick, np, "Reason: %s", block->reason->content);
 
     rq_blocked++;
@@ -303,8 +293,8 @@ int rq_genericrequestcheck(nick *np, char *channelname, channel **cp, nick **lni
 
 int rqcmd_request(void *user, int cargc, char **cargv) {
   nick *np = (nick*)user;
-  nick *lnick, *qnick;
-  unsigned long *lhand, *qhand;
+  nick *qnick;
+  unsigned long *qhand;
   channel *cp;
   int retval;
   time_t now_ts;
@@ -318,14 +308,12 @@ int rqcmd_request(void *user, int cargc, char **cargv) {
 
   rq_count++;
 
-  if (rq_genericrequestcheck(np, cargv[0], &cp, &lnick, &qnick) == RQ_ERROR) {
+  if (rq_genericrequestcheck(np, cargv[0], &cp, &qnick) == RQ_ERROR) {
     rq_failed++;
 
     return RQ_ERROR;
   }
 
-  lhand = getnumerichandlefromchanhash(cp->users, lnick->numeric);
-
   qhand = getnumerichandlefromchanhash(cp->users, qnick->numeric);
 
   if (qhand != NULL) {
@@ -336,32 +324,18 @@ int rqcmd_request(void *user, int cargc, char **cargv) {
     return RQ_ERROR;
   }
 
-  retval = RQ_ERROR;
-
-  if (lhand == NULL && qhand == NULL) {
-    /* try 'instant' Q request */
-    retval = qr_instantrequestq(np, cp);
-  }
+  retval = lr_requestl(rqnick, np, cp, qnick);
 
-  if (retval == RQ_ERROR) {
-    if (lhand == NULL) {
-      /* user 'wants' L */
+  if (rq_logfd != NULL) {
+    now[0] = '\0';
+    now_ts = time(NULL);
+    strftime(now, sizeof(now), "%c", localtime(&now_ts));
 
-      retval = lr_requestl(rqnick, np, cp, lnick);
-
-      if (rq_logfd != NULL) {
-        now[0] = '\0';
-        now_ts = time(NULL);
-        strftime(now, sizeof(now), "%c", localtime(&now_ts));
-
-        fprintf(rq_logfd, "%s: request (%s) for %s from %s: Request was %s.\n", now, RQ_LNICK, cp->index->name->content, np->nick, (retval == RQ_OK) ? "accepted" : "denied");
-        fflush(rq_logfd);
-      }
-    } else {
-      /* user 'wants' Q */
-
-      retval = qr_requestq(rqnick, np, cp, lnick, qnick);
-    }
+    fprintf(rq_logfd, "%s: request (%s) for %s from %s!%s@%s%s%s: Request was %s.\n",
+      now, RQ_QNICK, cp->index->name->content,
+      np->nick, np->ident, np->host->name->content, IsAccount(np)?"/":"", IsAccount(np)?np->authname:"",
+      (retval == RQ_OK) ? "accepted" : "denied");
+    fflush(rq_logfd);
   }
 
   if (retval == RQ_ERROR)
@@ -375,8 +349,8 @@ int rqcmd_request(void *user, int cargc, char **cargv) {
 int rqcmd_requestspamscan(void *user, int cargc, char **cargv) {
   nick *np = (nick*)user;
   channel *cp;
-  nick *lnick, *qnick, *snick;
-  unsigned long *lhand, *qhand, *shand;
+  nick *qnick, *snick;
+  unsigned long *qhand, *shand;
   int retval;
 
   if (cargc < 1) {
@@ -387,7 +361,7 @@ int rqcmd_requestspamscan(void *user, int cargc, char **cargv) {
 
   rq_count++;
 
-  if (rq_genericrequestcheck(np, cargv[0], &cp, &lnick, &qnick) == RQ_ERROR) {
+  if (rq_genericrequestcheck(np, cargv[0], &cp, &qnick) == RQ_ERROR) {
     rq_failed++;
 
     return RQ_ERROR;
@@ -397,7 +371,7 @@ int rqcmd_requestspamscan(void *user, int cargc, char **cargv) {
 
   if (snick == NULL || findserver(RQ_SSERVER) < 0) {
     sendnoticetouser(rqnick, np, "Error: %s does not seem to be online. "
-            "Try again later.", RQ_SNICK);
+            "Please try again later.", RQ_SNICK);
 
     rq_failed++;
 
@@ -415,13 +389,12 @@ int rqcmd_requestspamscan(void *user, int cargc, char **cargv) {
     return RQ_ERROR;
   }
 
-  /* we need either L or Q */
-  lhand = getnumerichandlefromchanhash(cp->users, lnick->numeric);
+  /* we need Q */
   qhand = getnumerichandlefromchanhash(cp->users, qnick->numeric);
 
-  if (lhand || qhand) {
+  if (qhand) {
     /* great, now try to request */
-    retval = qr_requests(rqnick, np, cp, lnick, qnick);
+    retval = qr_requests(rqnick, np, cp, qnick);
     
     if (retval == RQ_OK)
       rq_success++;
@@ -430,10 +403,10 @@ int rqcmd_requestspamscan(void *user, int cargc, char **cargv) {
       
       return retval;
   } else {
-    /* channel apparently doesn't have L or Q */
+    /* channel apparently doesn't have Q */
     
-   sendnoticetouser(rqnick, np, "Error: You need %s or %s in order to be "
-        "able to request %s.", RQ_LNICK, RQ_QNICK, RQ_SNICK);
+   sendnoticetouser(rqnick, np, "Error: You need %s in order to be "
+        "able to request %s.", RQ_QNICK, RQ_SNICK);
 
     rq_failed++;
 
@@ -458,7 +431,8 @@ int rqcmd_requestop(void *source, int cargc, char **cargv) {
   cp = findchannel(cargv[0]);
 
   if (cp == NULL) {
-    sendnoticetouser(rqnick, np, "Error: No such channel.");
+    sendnoticetouser(rqnick, np, "Error: Channel '%s' does not exist on the network.",
+      cargv[0]);
 
     return CMD_ERROR;
   }
@@ -494,7 +468,7 @@ int rqcmd_requestop(void *source, int cargc, char **cargv) {
   hand = getnumerichandlefromchanhash(cp->users, user->numeric);
 
   if (!hand) {
-    sendnoticetouser(rqnick, np, "Error: User %s is not on channel %s.", user->nick, cargv[0]);
+    sendnoticetouser(rqnick, np, "Error: User %s is not on channel '%s'.", user->nick, cargv[0]);
 
     return CMD_ERROR;
   }
@@ -509,7 +483,7 @@ int rqcmd_requestop(void *source, int cargc, char **cargv) {
     if(cp->users->content[a] != nouser) {
       np2 = getnickbynumeric(cp->users->content[a]);
 
-      if (IsService(np2) && !(cp->users->content[a] & CUMODE_OP)) {
+      if (IsService(np2) && (np2->nick[1] == '\0') && !(cp->users->content[a] & CUMODE_OP)) {
         localdosetmode_nick(&changes, np2, MC_OP);
         count++;
       }
@@ -529,14 +503,14 @@ int rqcmd_requestop(void *source, int cargc, char **cargv) {
 
   for (a=0;a<cp->users->hashsize;a++) {
     if ((cp->users->content[a] != nouser) && (cp->users->content[a] & CUMODE_OP)) {
-      sendnoticetouser(rqnick, np, "There are ops on channel %s. This command can only be"
+      sendnoticetouser(rqnick, np, "There are ops on channel '%s'. This command can only be"
 		      " used if there are no ops.", cargv[0]);
 
       return CMD_ERROR;
     }
   }
 
-  if (sp_countsplitservers() > 0) {
+  if (sp_countsplitservers(SERVERTYPEFLAG_USER_STATE) > 0) {
     sendnoticetouser(rqnick, np, "One or more servers are currently split. Wait until the"
 		    " netsplit is over and try again.");
 
@@ -568,9 +542,8 @@ int rqcmd_addblock(void *user, int cargc, char **cargv) {
   rq_block *block;
   time_t expires;
   char *account;
-  int level = ru_getlevel(np);
 
-  if (level < 20) {
+  if (!IsOper(np)) {
     sendnoticetouser(rqnick, np, "You do not have access to this command.");
 
     return RQ_ERROR;
@@ -598,12 +571,6 @@ int rqcmd_addblock(void *user, int cargc, char **cargv) {
 
   expires = getnettime() + durationtolong(cargv[1]);
 
-  if (expires > getnettime() + RQU_HELPER_MAXEXPIRE && level < 30) {
-    sendnoticetouser(rqnick, np, "Maximum expiry time is %s.", rq_longtoduration(RQU_HELPER_MAXEXPIRE));
-
-    return RQ_ERROR;
-  }
-  
   rq_addblock(cargv[0], cargv[2], account, 0, expires);
 
   sendnoticetouser(rqnick, np, "Blocked channels/accounts matching '%s' from "
@@ -614,12 +581,9 @@ int rqcmd_addblock(void *user, int cargc, char **cargv) {
 
 int rqcmd_delblock(void *user, int cargc, char **cargv) {
   nick *np = (nick*)user;
-  int result, level;
-  rq_block *block;
+  int result;
 
-  level = ru_getlevel(np);
-  
-  if (level < 20) {
+  if (!IsOper(np)) {
     sendnoticetouser(rqnick, np, "You do not have access to this command.");
 
     return RQ_ERROR;
@@ -631,16 +595,6 @@ int rqcmd_delblock(void *user, int cargc, char **cargv) {
     return RQ_ERROR;
   }
 
-  block = rq_findblock(cargv[0]);
-
-  if (block != NULL && level < 50) {
-    if (ircd_strcmp(block->creator->content, np->authname) != 0) {
-      sendnoticetouser(rqnick, np, "This block was created by someone else. You cannot remove it.");
-      
-      return RQ_ERROR;
-    }
-  }
-
   result = rq_removeblock(cargv[0]);
 
   if (result > 0) {
@@ -657,11 +611,9 @@ int rqcmd_delblock(void *user, int cargc, char **cargv) {
 int rqcmd_listblocks(void *user, int cargc, char **cargv) {
   nick *np = (nick*)user;
   rq_block block;
-  int i, level;
+  int i;
 
-  level = ru_getlevel(np);
-  
-  if (level < 10) {
+  if (!IsOper(np)) {
     sendnoticetouser(rqnick, np, "You do not have access to this command.");
 
     return RQ_ERROR;
@@ -691,9 +643,8 @@ int rqcmd_listblocks(void *user, int cargc, char **cargv) {
 
 int rqcmd_stats(void *user, int cargc, char **cargv) {
   nick *np = (nick*)user;
-  int level = ru_getlevel(np);
 
-  if (level < 10) {
+  if (!IsOper(np)) {
     sendnoticetouser(rqnick, np, "You do not have access to this command.");
 
     return RQ_ERROR;
@@ -710,112 +661,3 @@ int rqcmd_stats(void *user, int cargc, char **cargv) {
   return RQ_OK;
 }
 
-int rqcmd_adduser(void *user, int cargc, char **cargv) {
-  nick *np = (nick*)user;
-  int result, level;
-
-  if (cargc < 2) {
-    sendnoticetouser(rqnick, np, "Syntax: adduser <account> <level>");
-
-    return RQ_ERROR;
-  }
-
-  level = atoi(cargv[1]);
-
-  if (level <= 0) {
-    sendnoticetouser(rqnick, np, "Level must be a positive integer.");
-
-    return RQ_ERROR;
-  }
-
-  result = ru_create(cargv[0], level);
-
-  if (result) {
-    sendnoticetouser(rqnick, np, "User '%s' was added with level '%d'.", cargv[0], level);
-
-    return RQ_OK;
-  } else {
-    sendnoticetouser(rqnick, np, "Something strange happened. Contact shroud.");
-
-    return RQ_ERROR;
-  }
-}
-
-int rqcmd_deluser(void *user, int cargc, char **cargv) {
-  nick *np = (nick*)user;
-  int level;
-
-  if (cargc < 1) {
-    sendnoticetouser(rqnick, np, "Syntax: deluser <account>");
-
-    return RQ_ERROR;
-  }
-
-  level = ru_getlevel_str(cargv[0]);
-
-  if (level <= 0) {
-    sendnoticetouser(rqnick, np, "There is no such user.");
-
-    return RQ_ERROR;
-  }
-
-  ru_destroy(cargv[0]);
-
-  sendnoticetouser(rqnick, np, "Done.");
-
-  return RQ_OK;
-}
-
-int rqcmd_changelev(void *user, int cargc, char **cargv) {
-  nick *np = (nick*)user;
-  int result, level;
-
-  if (cargc < 2) {
-    sendnoticetouser(rqnick, np, "Syntax: changelev <account> <level>");
-
-    return RQ_ERROR;
-  }
-
-  level = atoi(cargv[1]);
-
-  if (level <= 0) {
-    sendnoticetouser(rqnick, np, "Level must be a positive integer.");
-
-    return RQ_ERROR;
-  }
-
-  if (ru_getlevel_str(cargv[0]) <= 0) {
-    sendnoticetouser(rqnick, np, "Unknown user.");
-
-    return RQ_ERROR;
-  }
-  
-  result = ru_setlevel(cargv[0], level);
-  
-  if (result != 0) {
-    sendnoticetouser(rqnick, np, "Done.");
-
-    return RQ_OK;
-  } else {
-    sendnoticetouser(rqnick, np, "Something strange happened. Contact shroud.");
-
-    return RQ_ERROR;
-  }
-}
-
-int rqcmd_userlist(void *user, int cargc, char **cargv) {
-  nick *np = (nick*)user;
-  r_user_t *userp = r_userlist;
-
-  sendnoticetouser(rqnick, np, "User Level");
-
-  while (userp) {
-    sendnoticetouser(rqnick, np, "%s %d", userp->name, userp->level);
-    userp = userp->next;
-  }
-
-  sendnoticetouser(rqnick, np, "--- End of USERS.");
-
-  return RQ_OK;
-}
-