Upgrading to GPL v3

[irc/evilnet/x3.git] / src / nickserv.c

diff --git a/src/nickserv.c b/src/nickserv.c
index b878cd29adcede4e91f7427c1effa711d1ea615a..1b9ad5a0cb2d83e4cdfe3b8b4416e8027be23c2b 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -5,7 +5,7 @@
  *
  * x3 is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -172,6 +172,7 @@ static const struct message_entry msgtab[] = {
     { "NSMSG_PASSWORD_DICTIONARY", "Your password is too simple. You must choose a password that is not just a word or name." },
     { "NSMSG_PASSWORD_READABLE", "Your password must have at least %lu digit(s), %lu capital letter(s), and %lu lower-case letter(s)." },
     { "NSMSG_LDAP_FAIL", "There was a problem in contacting the account server (ldap): %s. Please try again later." },
+    { "NSMSG_LDAP_FAIL_ADD", "There was a problem in adding account %s to ldap: %s." },
     { "NSMSG_LDAP_FAIL_SEND_EMAIL", "There was a problem in storing your email address in the account server (ldap): %s. Please try again later." },
     { "NSMSG_LDAP_FAIL_GET_EMAIL", "There was a problem in retrieving your email address from the account server (ldap): %s. Please try again later." },
     { "NSMSG_PARTIAL_REGISTER", "Account has been registered to you; nick was already registered to someone else." },
@@ -2088,6 +2089,7 @@ static NICKSERV_FUNC(cmd_auth)
 #endif
         hi = dict_find(nickserv_handle_dict, argv[1], NULL);
         pw_arg = 2;
+#ifdef notdef
     } else if (argc == 2) {
         if (nickserv_conf.disable_nicks) {
             if (!(hi = get_handle_info(user->nick))) {
@@ -2106,6 +2108,7 @@ static NICKSERV_FUNC(cmd_auth)
             hi = ni->owner;
         }
         pw_arg = 1;
+#endif
     } else {
         reply("MSG_MISSING_PARAMS", argv[0]);
         svccmd_send_help_brief(user, nickserv, cmd);
@@ -2163,7 +2166,7 @@ static NICKSERV_FUNC(cmd_auth)
     }
 #ifdef WITH_LDAP
     if( ( nickserv_conf.ldap_enable && ldap_result == LDAP_INVALID_CREDENTIALS )  ||
-        ( !nickserv_conf.ldap_enable && !checkpass(passwd, hi->passwd) ) ) {
+        ( (!nickserv_conf.ldap_enable) && (!checkpass(passwd, hi->passwd)) ) ) {
 #else
     if (!checkpass(passwd, hi->passwd)) {
 #endif
@@ -3218,7 +3221,7 @@ oper_try_set_access(struct userNode *user, struct userNode *bot, struct handle_i
           rc = ldap_add2group(target->handle, nickserv_conf.ldap_oper_group_dn);
         else
           rc = ldap_delfromgroup(target->handle, nickserv_conf.ldap_oper_group_dn);
-        if(rc != LDAP_SUCCESS) {
+        if(rc != LDAP_SUCCESS && rc != LDAP_TYPE_OR_VALUE_EXISTS && rc != LDAP_NO_SUCH_ATTRIBUTE) {
            send_message(user, bot, "NSMSG_LDAP_FAIL", ldap_err2string(rc));
            return 0;
         }
@@ -3901,6 +3904,9 @@ struct nickserv_discrim {
     const char *hostmask;
     const char *handlemask;
     const char *emailmask;
+#ifdef WITH_LDAP
+    unsigned int inldap;
+#endif
 };
 
 typedef void (*discrim_search_func)(struct userNode *source, struct handle_info *hi);
@@ -3926,6 +3932,9 @@ nickserv_discrim_create(struct svccmd *cmd, struct userNode *user, unsigned int
     discrim->min_registered = 0;
     discrim->max_registered = INT_MAX;
     discrim->lastseen = now;
+#ifdef WITH_LDAP
+    discrim->inldap = 2;
+#endif
 
     for (i=0; i<argc; i++) {
         if (i == argc - 1) {
@@ -3990,7 +3999,7 @@ nickserv_discrim_create(struct svccmd *cmd, struct userNode *user, unsigned int
                 discrim->hostmask_type = SUPERSET;
             }
             discrim->hostmask = argv[++i];
-        } else if (!irccasecmp(argv[i], "handlemask") || !irccasecmp(argv[i], "accountmask")) {
+        } else if (!irccasecmp(argv[i], "handlemask") || !irccasecmp(argv[i], "accountmask") || !irccasecmp(argv[i], "account")) {
             if (!irccasecmp(argv[++i], "*")) {
                 discrim->handlemask = 0;
             } else {
@@ -4025,7 +4034,20 @@ nickserv_discrim_create(struct svccmd *cmd, struct userNode *user, unsigned int
             } else {
                 reply("MSG_INVALID_CRITERIA", cmp);
             }
-        } else {
+#ifdef WITH_LDAP
+        } else if (nickserv_conf.ldap_enable && !irccasecmp(argv[i], "inldap")) {
+          i++;
+          if(true_string(argv[i])) {
+             discrim->inldap = 1;
+          }
+          else if (false_string(argv[i])) {
+             discrim->inldap = 0;
+          }
+          else {
+            reply("MSG_INVALID_BINARY", argv[i]);
+          }
+#endif
+        } else { 
             reply("MSG_INVALID_CRITERIA", argv[i]);
             goto fail;
         }
@@ -4073,6 +4095,17 @@ nickserv_discrim_match(struct nickserv_discrim *discrim, struct handle_info *hi)
         }
         if (!nick) return 0;
     }
+#ifdef WITH_LDAP
+    if(nickserv_conf.ldap_enable && discrim->inldap != 2) {
+        int rc;
+        rc = ldap_get_user_info(hi->handle, NULL);
+        if(discrim->inldap == 1 && rc != LDAP_SUCCESS)
+           return 0;
+        if(discrim->inldap == 0 && rc == LDAP_SUCCESS)
+           return 0;
+    }
+
+#endif
     return 1;
 }
 
@@ -4112,6 +4145,20 @@ search_unregister_func (struct userNode *source, struct handle_info *match)
         nickserv_unregister_handle(match, source, nickserv); // XXX nickserv hard coded
 }
 
+static void
+search_add2ldap_func (struct userNode *source, struct handle_info *match)
+{
+#ifdef WITH_LDAP
+    int rc;
+    if(match->email_addr && match->passwd && match->handle) {
+           rc  = ldap_do_add(match->handle, match->passwd, match->email_addr);
+           if(rc != LDAP_SUCCESS) {
+              send_message(source, nickserv, "NSMSG_LDAP_FAIL_ADD", match->handle, ldap_err2string(rc));
+           }
+    }
+#endif
+}
+
 static int
 nickserv_sort_accounts_by_access(const void *a, const void *b)
 {
@@ -4176,6 +4223,10 @@ static NICKSERV_FUNC(cmd_search)
         action = search_count_func;
     else if (!irccasecmp(argv[1], "unregister"))
         action = search_unregister_func;
+#ifdef WITH_LDAP
+    else if (nickserv_conf.ldap_enable && !irccasecmp(argv[1], "add2ldap"))
+        action = search_add2ldap_func;
+#endif
     else {
         reply("NSMSG_INVALID_ACTION", argv[1]);
         return 0;