]> jfr.im git - irc/rqf/shadowircd.git/blobdiff - src/s_user.c
Clarify connection setup.
[irc/rqf/shadowircd.git] / src / s_user.c
index e4caebe1c08b793ff1b8fa244dbb14f15a8fa344..7ba25c34a26d4b859e8737ac155d36a7e1bbce5e 100644 (file)
@@ -58,8 +58,6 @@
 static void report_and_set_user_flags(struct Client *, struct ConfItem *);
 void user_welcome(struct Client *source_p);
 
-extern char *crypt();
-
 char umodebuf[128];
 
 static int orphaned_umodes = 0;
@@ -316,6 +314,14 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                return (CLIENT_EXITED);
        }
 
+       if(IsConfSSLNeeded(aconf) && !IsSSL(source_p))
+       {
+               ServerStats.is_ref++;
+               sendto_one_notice(source_p, ":*** Notice -- You need to use SSL/TLS to use this server");
+               exit_client(client_p, source_p, &me, "Use SSL/TLS");
+               return (CLIENT_EXITED);
+       }
+
        if(!IsGotId(source_p))
        {
                const char *p;
@@ -364,7 +370,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                if(EmptyString(source_p->localClient->passwd))
                        encr = "";
                else if(IsConfEncrypted(aconf))
-                       encr = crypt(source_p->localClient->passwd, aconf->passwd);
+                       encr = rb_crypt(source_p->localClient->passwd, aconf->passwd);
                else
                        encr = source_p->localClient->passwd;
 
@@ -529,7 +535,6 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                Count.invisi++;
 
        s_assert(!IsClient(source_p));
-       del_unknown_ip(source_p);
        rb_dlinkMoveNode(&source_p->localClient->tnode, &unknown_list, &lclient_list);
        SetClient(source_p);
 
@@ -652,11 +657,21 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
                        else
                                identifyservice_p = NULL;
                        if (identifyservice_p != NULL)
-                               sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s",
-                                               get_id(source_p, identifyservice_p),
-                                               ConfigFileEntry.identifyservice,
-                                               ConfigFileEntry.identifycommand,
-                                               source_p->localClient->passwd);
+                       {
+                               if (!EmptyString(source_p->localClient->auth_user))
+                                       sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s %s",
+                                                       get_id(source_p, identifyservice_p),
+                                                       ConfigFileEntry.identifyservice,
+                                                       ConfigFileEntry.identifycommand,
+                                                       source_p->localClient->auth_user,
+                                                       source_p->localClient->passwd);
+                               else
+                                       sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s",
+                                                       get_id(source_p, identifyservice_p),
+                                                       ConfigFileEntry.identifyservice,
+                                                       ConfigFileEntry.identifycommand,
+                                                       source_p->localClient->passwd);
+                       }
                }
                memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd));
                rb_free(source_p->localClient->passwd);
@@ -787,63 +802,86 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
        /* If this user is being spoofed, tell them so */
        if(IsConfDoSpoofIp(aconf))
        {
-               sendto_one_notice(source_p, ":*** Spoofing your IP. congrats.");
+               sendto_one_notice(source_p, ":*** Spoofing your IP");
        }
 
        /* If this user is in the exception class, Set it "E lined" */
        if(IsConfExemptKline(aconf))
        {
                SetExemptKline(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from K/X lines. congrats.");
+               sendto_one_notice(source_p, ":*** You are exempt from K/X lines");
        }
 
        if(IsConfExemptDNSBL(aconf))
                /* kline exempt implies this, don't send both */
                if(!IsConfExemptKline(aconf))
-                       sendto_one_notice(source_p, ":*** You are exempt from DNS blacklists.");
+                       sendto_one_notice(source_p, ":*** You are exempt from DNS blacklists");
 
        /* If this user is exempt from user limits set it F lined" */
        if(IsConfExemptLimits(aconf))
        {
-               sendto_one_notice(source_p, ":*** You are exempt from user limits. congrats.");
+               sendto_one_notice(source_p, ":*** You are exempt from user limits");
        }
 
        if(IsConfExemptFlood(aconf))
        {
                SetExemptFlood(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from flood limits.");
+               sendto_one_notice(source_p, ":*** You are exempt from flood limits");
        }
 
        if(IsConfExemptSpambot(aconf))
        {
                SetExemptSpambot(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from spambot checks.");
+               sendto_one_notice(source_p, ":*** You are exempt from spambot checks");
        }
 
        if(IsConfExemptJupe(aconf))
        {
                SetExemptJupe(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from juped channel warnings.");
+               sendto_one_notice(source_p, ":*** You are exempt from juped channel warnings");
        }
 
        if(IsConfExemptResv(aconf))
        {
                SetExemptResv(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from resvs.");
+               sendto_one_notice(source_p, ":*** You are exempt from resvs");
        }
 
        if(IsConfExemptShide(aconf))
        {
                SetExemptShide(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from serverhiding.");
+               sendto_one_notice(source_p, ":*** You are exempt from serverhiding");
        }
 }
 
+static void
+show_other_user_mode(struct Client *source_p, struct Client *target_p)
+{
+       int i;
+       char buf[BUFSIZE];
+       char *m;
+
+       m = buf;
+       *m++ = '+';
+
+       for (i = 0; i < 128; i++) /* >= 127 is extended ascii */
+               if (target_p->umodes & user_modes[i])
+                       *m++ = (char) i;
+       *m = '\0';
+
+       if (MyConnect(target_p) && target_p->snomask != 0)
+               sendto_one_notice(source_p, ":Modes for %s are %s %s",
+                               target_p->name, buf,
+                               construct_snobuf(target_p->snomask));
+       else
+               sendto_one_notice(source_p, ":Modes for %s are %s",
+                               target_p->name, buf);
+}
+
 /*
  * user_mode - set get current users mode
  *
  * m_umode() added 15/10/91 By Darren Reed.
- * parv[0] - sender
  * parv[1] - username to change mode for
  * parv[2] - modes to change
  */
@@ -889,9 +927,12 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
                return 0;
        }
 
-       if(source_p != target_p || target_p->from != source_p->from)
+       if(source_p != target_p)
        {
-               sendto_one(source_p, form_str(ERR_USERSDONTMATCH), me.name, source_p->name);
+               if (MyOper(source_p) && parc < 3)
+                       show_other_user_mode(source_p, target_p);
+               else
+                       sendto_one(source_p, form_str(ERR_USERSDONTMATCH), me.name, source_p->name);
                return 0;
        }
 
@@ -968,6 +1009,8 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
                                        source_p->localClient->opername = NULL;
 
                                        rb_dlinkFindDestroy(source_p, &local_oper_list);
+                                       privilegeset_unref(source_p->localClient->privset);
+                                       source_p->localClient->privset = NULL;
                                }
 
                                rb_dlinkFindDestroy(source_p, &oper_list);
@@ -1253,6 +1296,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
 
        source_p->flags2 |= oper_p->flags;
        source_p->localClient->opername = rb_strdup(oper_p->name);
+       source_p->localClient->privset = privilegeset_ref(oper_p->privset);
 
        rb_dlinkAddAlloc(source_p, &local_oper_list);
        rb_dlinkAddAlloc(source_p, &oper_list);
@@ -1279,7 +1323,8 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
        sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
                   construct_snobuf(source_p->snomask));
        sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
-       sendto_one_notice(source_p, ":*** Oper privs are %s", get_oper_privs(oper_p->flags));
+       sendto_one_notice(source_p, ":*** Oper privilege set is %s", oper_p->privset->name);
+       sendto_one_notice(source_p, ":*** Oper privs are %s", oper_p->privset->privs);
        send_oper_motd(source_p);
 
        return (1);