[srvx-commits] CVS: services/src nickserv.c,1.184,1.185 modcmd.h,1.4,1.5 modcmd.c,1.8,1.9 chanserv.c
Brought to you by:
entrope
Menu
▾
▴
[srvx-commits] CVS: services/src nickserv.c,1.184,1.185 modcmd.h,1.4,1.5 modcmd.c,1.8,1.9 chanserv.c,1.260,1.261
|
From: Entrope <en...@us...> - 2002-08-04 23:17:15
|
Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv16083/src
Modified Files:
nickserv.c modcmd.h modcmd.c chanserv.c
Log Message:
make the modcmd logging system support logging full ident@hostmask
enable that on appropriate commands by default
Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -C2 -r1.184 -r1.185
*** nickserv.c 3 Aug 2002 04:27:03 -0000 1.184
--- nickserv.c 4 Aug 2002 23:17:12 -0000 1.185
***************
*** 894,898 ****
{
struct handle_info *hi;
! const char *email_addr;
struct userNode *settee;
--- 894,898 ----
{
struct handle_info *hi;
! const char *email_addr, *password;
struct userNode *settee;
***************
*** 956,962 ****
}
! if ((hi = nickserv_register(user, settee, argv[1], argv[2]))) {
! log(NS_LOG, LOG_INFO, "Registered account '%s' to "IDENT_FORMAT".\n", argv[1], IDENT_DATA(user));
!
/* Add any masks they should get. */
if (nickserv_conf.default_hostmask) {
--- 956,962 ----
}
! password = argv[2];
! argv[2] = "****";
! if ((hi = nickserv_register(user, settee, argv[1], password))) {
/* Add any masks they should get. */
if (nickserv_conf.default_hostmask) {
***************
*** 1020,1028 ****
if ((hi = nickserv_register(user, settee, argv[1], argv[2]))) {
string_list_append(hi->masks, mask);
- if (settee) {
- log(NS_LOG, LOG_INFO, "%s registered account '%s' to "IDENT_FORMAT".\n", user->nick, argv[1], IDENT_DATA(settee));
- } else {
- log(NS_LOG, LOG_INFO, "%s registered account '%s' (no current user).\n", user->nick, argv[1]);
- }
return 1;
} else {
--- 1020,1023 ----
***************
*** 1047,1051 ****
}
- log(NS_LOG, LOG_OTHER, "Responded to inquiry about account '%s' from nick %s.\n", hi->handle, user->nick);
nickserv_notice(user, NSMSG_HANDLEINFO_ON, hi->handle);
nickserv_notice(user, NSMSG_HANDLEINFO_REGGED, ctime(&hi->registered));
--- 1042,1045 ----
***************
*** 1267,1270 ****
--- 1261,1265 ----
hi = dict_find(nickserv_handle_dict, argv[1], NULL);
passwd = argv[2];
+ argv[2] = "****";
} else if (argc == 2) {
if (nickserv_conf.disable_nicks) {
***************
*** 1284,1287 ****
--- 1279,1283 ----
}
passwd = argv[1];
+ argv[1] = "****";
} else {
nickserv_notice(user, MSG_MISSING_PARAMS, argv[0]);
***************
*** 1334,1338 ****
set_user_handle_info(user, hi);
nickserv_notice(user, NSMSG_AUTH_SUCCESS);
- log(NS_LOG, LOG_INFO, IDENT_FORMAT" was authenticated to account '%s'.\n", IDENT_DATA(user), hi->handle);
return 1;
}
--- 1330,1333 ----
***************
*** 1362,1370 ****
nickserv_notice(target, NSMSG_AUTH_ALLOWED_MSG, hi->handle, hi->handle);
if (nickserv_conf.email_enabled) nickserv_notice(target, NSMSG_AUTH_ALLOWED_EMAIL);
- log(NS_LOG, LOG_INFO, "%s allowed "IDENT_FORMAT" to authenticate to account '%s'.\n", user->handle_info->handle, IDENT_DATA(target), hi->handle);
} else {
if (dict_remove(nickserv_allow_auth_dict, target->nick)) {
nickserv_notice(user, NSMSG_AUTH_NORMAL_ONLY, target->nick);
- log(NS_LOG, LOG_INFO, "%s removed "IDENT_FORMAT"'s authorization to auth without hostmask.\n", user->handle_info->handle, IDENT_DATA(target));
} else {
nickserv_notice(user, NSMSG_AUTH_UNSPECIAL, target->nick);
--- 1357,1363 ----
***************
*** 1439,1442 ****
--- 1432,1436 ----
}
cryptpass(argv[2], crypted);
+ argv[2] = "****";
nickserv_make_cookie(user, hi, PASSWORD_CHANGE, crypted);
return 1;
***************
*** 1511,1515 ****
if (n >= nickserv_conf.nicks_per_handle) {
nickserv_notice(user, NSMSG_TOO_MANY_NICKS);
- log(NS_LOG, LOG_OTHER, "Account '%s' had too many nicks registered to it.\n", user->handle_info->handle);
return 0;
}
--- 1505,1508 ----
***************
*** 1527,1531 ****
if (target && target != user) {
nickserv_notice(user, NSMSG_NICK_IN_USE, nick);
- log(NS_LOG, LOG_OTHER, "Account '%s' tried to register someone else's nick.\n", user->handle_info->handle);
return 0;
}
--- 1520,1523 ----
***************
*** 1541,1545 ****
return 0;
}
- log(NS_LOG, LOG_OTHER, "Account '%s' tried to register someone else's nick.\n", user->handle_info->handle);
}
ni = dict_find(nickserv_nick_dict, nick, NULL);
--- 1533,1536 ----
***************
*** 1550,1554 ****
register_nick(nick, user->handle_info);
nickserv_notice(user, NSMSG_REGNICK_SUCCESS, nick);
- log(NS_LOG, LOG_OTHER, "Account '%s' registered nick '%s'.\n", user->handle_info->handle, nick);
return 1;
}
--- 1541,1544 ----
***************
*** 1563,1566 ****
--- 1553,1558 ----
old_pass = argv[1];
new_pass = argv[2];
+ argv[1] = "*OLDPASS*";
+ argv[2] = "*NEWPASS*";
if (!is_secure_password(hi->handle, new_pass, user)) return 0;
if (!checkpass(old_pass, hi->passwd)) {
***************
*** 1570,1574 ****
cryptpass(new_pass, hi->passwd);
nickserv_notice(user, NSMSG_PASS_SUCCESS);
- log(NS_LOG, LOG_OTHER, IDENT_FORMAT" changed passwords for their account '%s'.\n", IDENT_DATA(user), hi->handle);
return 1;
}
--- 1562,1565 ----
***************
*** 1588,1592 ****
string_list_append(hi->masks, new_mask);
nickserv_notice(user, NSMSG_ADDMASK_SUCCESS, new_mask);
- log(NS_LOG, LOG_OTHER, "'%s' added new mask '%s' to account '%s'.\n", user->nick, new_mask, hi->handle);
return 1;
}
--- 1579,1582 ----
***************
*** 1630,1634 ****
hi->masks->list[i] = hi->masks->list[--hi->masks->used];
nickserv_notice(user, NSMSG_DELMASK_SUCCESS, old_mask);
- log(NS_LOG, LOG_OTHER, "'%s' deleted mask '%s' from account '%s'.\n", user->nick, old_mask, hi->handle);
free(old_mask);
return 1;
--- 1620,1623 ----
***************
*** 2017,2022 ****
nickserv_notice(user, NSMSG_OPSERV_LEVEL_BAD);
} else {
- log(NS_LOG, LOG_INFO, "Account %s setting oper level for account %s to %d (from %d)\n",
- user->handle_info->handle, hi->handle, new_level, hi->opserv_level);
hi->opserv_level = new_level;
}
--- 2006,2009 ----
***************
*** 2037,2042 ****
if ((argc > 1) && is_valid_oper(user, nickserv_conf.set_epithet_level, 0)) {
unsplit_string(argv+1, argc-1);
- log(NS_LOG, LOG_INFO, "%s (%s) setting epithet for account %s to `%s'\n",
- user->nick, user->handle_info->handle, hi->handle, argv[1]);
if (hi->epithet) free(hi->epithet);
if ((argv[1][0] == '*') && !argv[1][1]) {
--- 2024,2027 ----
***************
*** 2066,2070 ****
if (!victim || (victim == user)) continue;
DelUser(victim, nickserv, true, NSMSG_KILL_MESSAGE);
- log(NS_LOG, LOG_OTHER, "Account '%s' requested a kill for %s.\n", hi->handle, victim->nick);
count++;
}
--- 2051,2054 ----
***************
*** 2093,2097 ****
DelUser(victim, nickserv, true, NSMSG_KILL_MESSAGE);
nickserv_notice(user, NSMSG_SINGLE_KILL, argv[i]);
- log(NS_LOG, LOG_OTHER, "Account '%s' requested a kill for %s.\n", hi->handle, victim->nick);
}
}
--- 2077,2080 ----
***************
*** 2114,2122 ****
if (hi != ni->owner) {
nickserv_notice(user, NSMSG_NOT_YOUR_NICK, nick);
- log(NS_LOG, LOG_OTHER, "User '%s' tried to unregister nick '%s' belonging to account '%s'.\n", user->nick, ni->nick, ni->owner->handle);
return 0;
}
nickserv_notice(user, NSMSG_UNREGNICK_SUCCESS, ni->nick);
- log(NS_LOG, LOG_INFO, "User '%s' (account '%s') unregistered nick %s.\n", user->nick, hi->handle, ni->nick);
delete_nick(ni);
return 1;
--- 2097,2103 ----
***************
*** 2137,2141 ****
}
nickserv_notice(user, NSMSG_UNREGNICK_SUCCESS, ni->nick);
- log(NS_LOG, LOG_INFO, "User '%s' unregistered nick '%s' belonging to account '%s'.\n", user->nick, ni->nick, ni->owner->handle);
delete_nick(ni);
return 1;
--- 2118,2121 ----
***************
*** 2145,2159 ****
{
struct handle_info *hi;
NICKSERV_MIN_PARMS(2);
hi = user->handle_info;
! if (checkpass(argv[1], hi->passwd)) {
! log(NS_LOG, LOG_INFO, "%s unregistered their account %s.\n", user->nick, hi->handle);
nickserv_unregister_handle(hi, user);
} else {
log(NS_LOG, LOG_INFO, "Account '%s' tried to unregister with the wrong password.\n", hi->handle);
nickserv_notice(user, NSMSG_PASSWORD_INVALID);
}
- return 0;
}
--- 2125,2142 ----
{
struct handle_info *hi;
+ char *passwd;
NICKSERV_MIN_PARMS(2);
hi = user->handle_info;
! passwd = argv[1];
! argv[1] = "****";
! if (checkpass(passwd, hi->passwd)) {
nickserv_unregister_handle(hi, user);
+ return 1;
} else {
log(NS_LOG, LOG_INFO, "Account '%s' tried to unregister with the wrong password.\n", hi->handle);
nickserv_notice(user, NSMSG_PASSWORD_INVALID);
+ return 0;
}
}
***************
*** 2895,2900 ****
}
nickserv_notice(user, NSMSG_DB_MERGED, argv[1], stop.tv_sec, stop.tv_usec/1000);
! log(NS_LOG, LOG_INFO, "%s merged %s into the database.\n", user->nick, argv[1]);
! return 0;
}
--- 2878,2882 ----
}
nickserv_notice(user, NSMSG_DB_MERGED, argv[1], stop.tv_sec, stop.tv_usec/1000);
! return 1;
}
***************
*** 3110,3114 ****
sprintf(buf, "%u", min_level);
if (must_be_qualified) {
! return modcmd_register(nickserv_module, name, func, 1, (must_auth ? MODCMD_REQUIRE_AUTHED : 0), "access", buf, "flags", "+qualified", NULL);
} else {
return modcmd_register(nickserv_module, name, func, 1, (must_auth ? MODCMD_REQUIRE_AUTHED : 0), "access", buf, NULL);
--- 3092,3096 ----
sprintf(buf, "%u", min_level);
if (must_be_qualified) {
! return modcmd_register(nickserv_module, name, func, 1, (must_auth ? MODCMD_REQUIRE_AUTHED : 0), "access", buf, "flags", "+qualified,+loghostmask", NULL);
} else {
return modcmd_register(nickserv_module, name, func, 1, (must_auth ? MODCMD_REQUIRE_AUTHED : 0), "access", buf, NULL);
***************
*** 3116,3120 ****
} else {
if (must_be_qualified) {
! return modcmd_register(nickserv_module, name, func, 1, (must_auth ? MODCMD_REQUIRE_AUTHED : 0), "flags", "+qualified", NULL);
} else {
return modcmd_register(nickserv_module, name, func, 1, (must_auth ? MODCMD_REQUIRE_AUTHED : 0), NULL);
--- 3098,3102 ----
} else {
if (must_be_qualified) {
! return modcmd_register(nickserv_module, name, func, 1, (must_auth ? MODCMD_REQUIRE_AUTHED : 0), "flags", "+qualified,+loghostmask", NULL);
} else {
return modcmd_register(nickserv_module, name, func, 1, (must_auth ? MODCMD_REQUIRE_AUTHED : 0), NULL);
***************
*** 3165,3169 ****
nickserv_module = module_register("NickServ", NS_LOG, "nickserv.help", nickserv_help_expand);
! modcmd_register(nickserv_module, "AUTH", cmd_auth, 2, MODCMD_KEEP_BOUND, "flags", "+qualified", NULL);
nickserv_define_func("ALLOWAUTH", cmd_allowauth, 0, 1, 0);
nickserv_define_func("REGISTER", cmd_register, -1, 0, 1);
--- 3147,3151 ----
nickserv_module = module_register("NickServ", NS_LOG, "nickserv.help", nickserv_help_expand);
! modcmd_register(nickserv_module, "AUTH", cmd_auth, 2, MODCMD_KEEP_BOUND, "flags", "+qualified,+loghostmask", NULL);
nickserv_define_func("ALLOWAUTH", cmd_allowauth, 0, 1, 0);
nickserv_define_func("REGISTER", cmd_register, -1, 0, 1);
Index: modcmd.h
===================================================================
RCS file: /cvsroot/srvx/services/src/modcmd.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** modcmd.h 3 Aug 2002 04:27:03 -0000 1.4
--- modcmd.h 4 Aug 2002 23:17:12 -0000 1.5
***************
*** 32,36 ****
#if __GNUC__ >= 2
! #define MODCMD_FUNC(NAME) int NAME(struct userNode *user, struct chanNode *channel __attribute__((unused)), unsigned int argc, unsigned char *argv[], struct svccmd *cmd __attribute__((unused)))
#else
#define MODCMD_FUNC(NAME) int NAME(struct userNode *user, struct chanNode *channel, unsigned int argc, unsigned char *argv[], struct svccmd *cmd)
--- 32,36 ----
#if __GNUC__ >= 2
! #define MODCMD_FUNC(NAME) int NAME(struct userNode *user, struct chanNode *channel __attribute__((unused)), unsigned int argc __attribute__((unused)), unsigned char *argv[], struct svccmd *cmd __attribute__((unused)))
#else
#define MODCMD_FUNC(NAME) int NAME(struct userNode *user, struct chanNode *channel, unsigned int argc, unsigned char *argv[], struct svccmd *cmd)
***************
*** 45,48 ****
--- 45,49 ----
#define MODCMD_ACCEPT_PCHANNEL 0x0010
#define MODCMD_NO_DEFAULT_BIND 0x0020
+ #define MODCMD_LOG_HOSTMASK 0x0040
/* Requirement (access control) flags */
#define MODCMD_REQUIRE_AUTHED 0x001000
Index: modcmd.c
===================================================================
RCS file: /cvsroot/srvx/services/src/modcmd.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** modcmd.c 4 Aug 2002 21:11:36 -0000 1.8
--- modcmd.c 4 Aug 2002 23:17:12 -0000 1.9
***************
*** 99,102 ****
--- 99,103 ----
{ "joinable", MODCMD_REQUIRE_JOINABLE },
{ "keepbound", MODCMD_KEEP_BOUND },
+ { "loghostmask", MODCMD_LOG_HOSTMASK },
{ "nolog", MODCMD_NO_LOG },
{ "networkhelper", MODCMD_REQUIRE_NETWORK_HELPER },
***************
*** 602,606 ****
pos = 0;
if (channel) pos += sprintf(logbuf+pos, "(%s) ", channel->name);
! pos += sprintf(logbuf+pos, "[%s:%s]: ", user->nick, (user->handle_info ? user->handle_info->handle : ""));
for (ii=0; ii<argc; ii++) {
for (jj=0; argv[ii][jj]; ) {
--- 603,611 ----
pos = 0;
if (channel) pos += sprintf(logbuf+pos, "(%s) ", channel->name);
! pos += sprintf(logbuf+pos, "[%s", user->nick);
! if (cmd.flags & MODCMD_LOG_HOSTMASK) {
! pos += sprintf(logbuf+pos, "/%s@%s/%ld.%ld.%ld.%ld", user->ident, user->hostname, (user->ip >> 24) & 255, (user->ip >> 16) & 255, (user->ip >> 8) & 255, user->ip & 255);
! }
! pos += sprintf(logbuf+pos, ":%s]: ", (user->handle_info ? user->handle_info->handle : ""));
for (ii=0; ii<argc; ii++) {
for (jj=0; argv[ii][jj]; ) {
Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.260
retrieving revision 1.261
diff -C2 -r1.260 -r1.261
*** chanserv.c 4 Aug 2002 21:10:03 -0000 1.260
--- chanserv.c 4 Aug 2002 23:17:12 -0000 1.261
***************
*** 6986,6990 ****
DEFINE_COMMAND(cunsuspend, 2, MODCMD_REQUIRE_AUTHED, "template", "csuspend", NULL);
! DEFINE_COMMAND(unregister, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "access", "owner", NULL);
DEFINE_COMMAND(merge, 2, MODCMD_REQUIRE_AUTHED, "access", "owner", NULL);
--- 6986,6990 ----
DEFINE_COMMAND(cunsuspend, 2, MODCMD_REQUIRE_AUTHED, "template", "csuspend", NULL);
! DEFINE_COMMAND(unregister, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "access", "owner", "flags", "+loghostmask", NULL);
DEFINE_COMMAND(merge, 2, MODCMD_REQUIRE_AUTHED, "access", "owner", NULL);
***************
*** 7001,7005 ****
DEFINE_COMMAND(opchan, 1, MODCMD_REQUIRE_REGCHAN, "access", "peon", NULL);
DEFINE_COMMAND(clvl, 3, MODCMD_REQUIRE_CHANUSER, "access", "master", NULL);
! DEFINE_COMMAND(giveownership, 2, MODCMD_REQUIRE_CHANUSER, "access", "owner", NULL);
DEFINE_COMMAND(up, 1, MODCMD_REQUIRE_CHANUSER, NULL);
--- 7001,7005 ----
DEFINE_COMMAND(opchan, 1, MODCMD_REQUIRE_REGCHAN, "access", "peon", NULL);
DEFINE_COMMAND(clvl, 3, MODCMD_REQUIRE_CHANUSER, "access", "master", NULL);
! DEFINE_COMMAND(giveownership, 2, MODCMD_REQUIRE_CHANUSER, "access", "owner", "flags", "+loghostmask", NULL);
DEFINE_COMMAND(up, 1, MODCMD_REQUIRE_CHANUSER, NULL);
|
