#include "request_block.h"
#include "lrequest.h"
#include "sqrequest.h"
+#include "user.h"
nick *rqnick;
CommandTree *rqcommands;
int rqcmd_stats(void *user, int cargc, char **cargv);
int rqcmd_legacyrequest(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 */
addcommandtotree(rqcommands, "showcommands", RQU_ANY, 1, &rqcmd_showcommands);
addcommandtotree(rqcommands, "requestbot", RQU_ANY, 1, &rqcmd_request);
addcommandtotree(rqcommands, "requestspamscan", RQU_ANY, 1, &rqcmd_requestspamscan);
- 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);
-
+ 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);
+
/* old legacy stuff */
addcommandtotree(rqcommands, "requestq", RQU_ANY, 1, &rqcmd_legacyrequest);
rq_initblocks();
qr_initrequest();
+ ru_load();
scheduleoneshot(time(NULL) + 1, (ScheduleCallback)&rq_registeruser, NULL);
}
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);
+
+
/* old legacy stuff */
deletecommandfromtree(rqcommands, "requestq", &rqcmd_legacyrequest);
rq_finiblocks();
qr_finirequest();
+ ru_persist();
deleteallschedules((ScheduleCallback)&rq_registeruser);
}
return;
}
- if (cmd->level & RQU_OPER && !IsOper(user)) {
+ if ((cmd->level & RQU_OPER) && !IsOper(user)) {
sendnoticetouser(rqnick, user, "Sorry, this command is not "
"available to you.");
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);
sendnoticetouser(rqnick, (nick*)user, "-------------------");
for (i = 0; i < n; i++) {
- if ((cmdlist[i]->level & RQU_OPER) == 0 || IsOper((nick*)user))
+ if (((cmdlist[i]->level & RQU_OPER) == 0 || IsOper((nick*)user)) &&
+ (((cmdlist[i]->level & RQU_ACCOUNT) == 0 || (IsOper((nick*)user) || (IsAccount((nick*)user)) && ru_getlevel((nick*)user) > 0))))
sendnoticetouser(rqnick, (nick*)user, "%s", cmdlist[i]->command->content);
}
nick *np = (nick*)user;
nick *lnick, *qnick;
unsigned long *lhand, *qhand;
- channel *cp;
+ channel *cp, *logcp;
int retval;
if (cargc < 1) {
/* user 'wants' L */
retval = lr_requestl(rqnick, np, cp, lnick);
+
+ logcp = findchannel(RQ_LOGCHANNEL);
+
+ if (logcp) {
+ sendmessagetochannel(rqnick, logcp, "request (%s) for %s from %s: Request was %s.", RQ_LNICK, cp->index->name->content, np->nick, (retval == RQ_OK) ? "accepted" : "denied");
+ }
} else {
/* user 'wants' Q */
rq_block *block;
time_t expires;
char *account;
+ int level = ru_getlevel(np);
+
+ if (level < 20) {
+ sendnoticetouser(rqnick, np, "You do not have access to this command.");
+ return RQ_ERROR;
+ }
+
if (cargc < 3) {
sendnoticetouser(rqnick, np, "Syntax: addblock <mask> <duration> <reason>");
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 "
int rqcmd_delblock(void *user, int cargc, char **cargv) {
nick *np = (nick*)user;
- int result;
+ int result, level;
+ rq_block *block;
+
+ level = ru_getlevel(np);
+
+ if (level < 20) {
+ sendnoticetouser(rqnick, np, "You do not have access to this command.");
+ return RQ_ERROR;
+ }
+
if (cargc < 1) {
- controlreply(np, "Syntax: delblock <mask>");
+ sendnoticetouser(rqnick, np, "Syntax: delblock <mask>");
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) {
int rqcmd_listblocks(void *user, int cargc, char **cargv) {
nick *np = (nick*)user;
rq_block block;
- int i;
+ int i, level;
+ level = ru_getlevel(np);
+
+ if (level < 10) {
+ sendnoticetouser(rqnick, np, "You do not have access to this command.");
+
+ return RQ_ERROR;
+ }
+
sendnoticetouser(rqnick, np, "Mask By Expires"
" Reason");
int rqcmd_stats(void *user, int cargc, char **cargv) {
nick *np = (nick*)user;
+ int level = ru_getlevel(np);
+ if (level < 10) {
+ sendnoticetouser(rqnick, np, "You do not have access to this command.");
+
+ return RQ_ERROR;
+ }
+
sendnoticetouser(rqnick, np, "Total requests: %d", rq_count);
sendnoticetouser(rqnick, np, "Successful requests: %d", rq_success);
sendnoticetouser(rqnick, np, "Failed requests: %d", rq_failed);
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;
+}
+
--- /dev/null
+#include <stdio.h>
+
+#include "../irc/irc_config.h"
+#include "../lib/irc_string.h"
+#include "../nick/nick.h"
+#include "request.h"
+#include "user.h"
+
+r_user_t *r_userlist = NULL;
+int ru_loading = 0;
+
+r_user_t *ru_find(char *name);
+
+int ru_create(char *name, unsigned int level) {
+ r_user_t *user, *trav;
+
+ if (ru_setlevel(name, level) != 0)
+ return 1;
+
+ user = (r_user_t*)malloc(sizeof(r_user_t));
+
+ if (user == NULL)
+ return 0;
+
+ user->next = NULL;
+ strlcpy(user->name, name, sizeof(user->name));
+ user->level = level;
+
+ if (r_userlist == NULL)
+ r_userlist = user;
+ else {
+ trav = r_userlist;
+
+ while (trav->next)
+ trav = trav->next;
+
+ trav->next = user;
+ }
+
+ ru_persist();
+
+ return 1;
+}
+
+void ru_destroy(char *name) {
+ r_user_t *user = r_userlist;
+
+ if (user && ircd_strcmp(user->name, name) == 0) {
+ free(r_userlist);
+
+ r_userlist = NULL;
+
+ ru_persist();
+
+ return;
+ }
+
+ if (user == NULL)
+ return;
+
+ while (user->next) {
+ if (ircd_strcmp(user->next->name, name) == 0) {
+ user->next = user->next->next;
+
+ free(user->next);
+ }
+
+ user = user->next;
+ }
+
+ ru_persist();
+}
+
+int ru_parseline(char *line) {
+ char name[ACCOUNTLEN];
+ unsigned int level;
+ int result;
+
+ if (sscanf(line, "%s %lu", name, &level) < 2)
+ return 0;
+
+ ru_loading = 1;
+ result = ru_create(name, level);
+ ru_loading = 0;
+
+ return result;
+}
+
+int ru_load(void) {
+ char line[4096];
+ FILE *rudata;
+ int count;
+
+ rudata = fopen(RQ_USERFILE, "r");
+
+ if (rudata == NULL)
+ return 0;
+
+ count = 0;
+
+ while (!feof(rudata)) {
+ if (fgets(line, sizeof(line), rudata) == NULL)
+ break;
+
+ if (line[strlen(line) - 1] == '\n')
+ line[strlen(line) - 1] = '\0';
+
+ if (line[strlen(line) - 1] == '\r')
+ line[strlen(line) - 1] = '\0';
+
+ if (line[0] != '\0') {
+ if (ru_parseline(line))
+ count++;
+ }
+ }
+
+ fclose(rudata);
+
+ return count;
+}
+
+int ru_persist(void) {
+ FILE *rudata;
+ int i, count = 0;
+ r_user_t *user = r_userlist;
+
+ if (ru_loading)
+ return 0;
+
+ rudata = fopen(RQ_USERFILE, "w");
+
+ if (rudata == NULL)
+ return 0;
+
+ while (user) {
+ fprintf(rudata, "%s %lu\n", user->name, user->level);
+
+ user = user->next;
+ }
+
+ fclose(rudata);
+
+ return count;
+}
+
+r_user_t *ru_find(char *name) {
+ r_user_t *user = r_userlist;
+
+ while (user) {
+ if (ircd_strcmp(user->name, name) == 0)
+ return user;
+
+ user = user->next;
+ }
+
+ return NULL;
+}
+
+unsigned int ru_getlevel(nick *np) {
+ if (IsOper(np))
+ return 999;
+ else if (!IsAccount(np))
+ return 0;
+
+ return ru_getlevel_str(np->authname);
+}
+
+unsigned int ru_getlevel_str(char *name) {
+ r_user_t *user = ru_find(name);
+
+ if (user)
+ return user->level;
+ else
+ return 0;
+}
+
+int ru_setlevel(char *name, unsigned int level) {
+ r_user_t *user = ru_find(name);
+
+ if (user) {
+ user->level = level;
+
+ ru_persist();
+
+ return 1;
+ } else
+ return 0;
+}
projects / irc / quakenet / newserv.git / commitdiff
