* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * $Id$
*/
+#include "config.h"
+#include "s_conf.h"
+#include "IPcheck.h"
+#include "class.h"
+#include "client.h"
+#include "crule.h"
+#include "ircd_features.h"
+#include "fileio.h"
+#include "gline.h"
+#include "hash.h"
+#include "ircd.h"
+#include "ircd_alloc.h"
+#include "ircd_chattr.h"
+#include "ircd_log.h"
+#include "ircd_reply.h"
+#include "ircd_snprintf.h"
+#include "ircd_string.h"
+#include "list.h"
+#include "listener.h"
+#include "match.h"
+#include "motd.h"
+#include "numeric.h"
+#include "numnicks.h"
+#include "opercmds.h"
+#include "parse.h"
+#include "res.h"
+#include "s_bsd.h"
+#include "s_debug.h"
+#include "s_misc.h"
+#include "send.h"
+#include "struct.h"
+#include "support.h"
#include "sys.h"
-#include <sys/socket.h>
-#if HAVE_FCNTL_H
+
+#include <assert.h>
+#include <arpa/inet.h>
+#include <errno.h>
#include <fcntl.h>
-#endif
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
-#if HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
#endif
-#include <sys/stat.h>
-#ifdef R_LINES
-#include <signal.h>
-#endif
-#if HAVE_UNISTD_H
-#include <unistd.h>
+struct ConfItem *GlobalConfList = 0;
+int GlobalConfCount = 0;
+struct s_map *GlobalServiceMapList = 0;
+struct qline *GlobalQuarantineList = 0;
+
+void yyparse(void);
+int conf_fd, lineno;
+
+struct LocalConf localConf;
+struct CRuleConf* cruleConfList;
+/* struct ServerConf* serverConfList; */
+struct DenyConf* denyConfList;
+
+/*
+ * output the reason for being k lined from a file - Mmmm
+ * sptr is client being dumped
+ * filename is the file that is to be output to the K lined client
+ */
+static void killcomment(struct Client* sptr, const char* filename)
+{
+ FBFILE* file = 0;
+ char line[80];
+ struct stat sb;
+ struct tm* tm;
+
+ if (NULL == (file = fbopen(filename, "r"))) {
+ send_reply(sptr, ERR_NOMOTD);
+ send_reply(sptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP,
+ ":Connection from your host is refused on this server.");
+ return;
+ }
+ fbstat(&sb, file);
+ tm = localtime((time_t*) &sb.st_mtime); /* NetBSD needs cast */
+ while (fbgets(line, sizeof(line) - 1, file)) {
+ char* end = line + strlen(line);
+ while (end > line) {
+ --end;
+ if ('\n' == *end || '\r' == *end)
+ *end = '\0';
+ else
+ break;
+ }
+ send_reply(sptr, RPL_MOTD, line);
+ }
+ send_reply(sptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP,
+ ":Connection from your host is refused on this server.");
+ fbclose(file);
+}
+
+struct ConfItem* make_conf(void)
+{
+ struct ConfItem* aconf;
+
+ aconf = (struct ConfItem*) MyMalloc(sizeof(struct ConfItem));
+ assert(0 != aconf);
+#ifdef DEBUGMODE
+ ++GlobalConfCount;
#endif
-#include <stdlib.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#ifdef USE_SYSLOG
-#include <syslog.h>
+ memset(aconf, 0, sizeof(struct ConfItem));
+ aconf->status = CONF_ILLEGAL;
+ aconf->ipnum.s_addr = INADDR_NONE;
+ return aconf;
+}
+
+void delist_conf(struct ConfItem *aconf)
+{
+ if (aconf == GlobalConfList)
+ GlobalConfList = GlobalConfList->next;
+ else {
+ struct ConfItem *bconf;
+
+ for (bconf = GlobalConfList; aconf != bconf->next; bconf = bconf->next)
+ ;
+ bconf->next = aconf->next;
+ }
+ aconf->next = 0;
+}
+
+void free_conf(struct ConfItem *aconf)
+{
+ Debug((DEBUG_DEBUG, "free_conf: %s %s %d",
+ aconf->host ? aconf->host : "*",
+ aconf->name ? aconf->name : "*",
+ aconf->port));
+ if (aconf->dns_pending)
+ delete_resolver_queries(aconf);
+ MyFree(aconf->host);
+ if (aconf->passwd)
+ memset(aconf->passwd, 0, strlen(aconf->passwd));
+ MyFree(aconf->passwd);
+ MyFree(aconf->name);
+ MyFree(aconf);
+#ifdef DEBUGMODE
+ --GlobalConfCount;
#endif
-#include "h.h"
-#include "struct.h"
-#include "s_serv.h"
-#include "opercmds.h"
-#include "numeric.h"
-#include "send.h"
-#include "s_conf.h"
-#include "class.h"
-#include "s_misc.h"
-#include "match.h"
-#include "common.h"
-#include "s_err.h"
-#include "s_bsd.h"
-#include "ircd.h"
-#include "crule.h"
-#include "res.h"
-#include "support.h"
-#include "parse.h"
-#include "numnicks.h"
-#include "sprintf_irc.h"
-#include "IPcheck.h"
-#include "hash.h"
-#include "fileio.h"
+}
+
+/*
+ * detach_conf - Disassociate configuration from the client.
+ */
+static void detach_conf(struct Client* cptr, struct ConfItem* aconf)
+{
+ struct SLink** lp;
+ struct SLink* tmp;
+
+ assert(0 != aconf);
+ assert(0 != cptr);
+ assert(0 < aconf->clients);
-RCSTAG_CC("$Id$");
+ lp = &(cli_confs(cptr));
-static int check_time_interval(char *, char *);
-static int lookup_confhost(aConfItem *);
-static int is_comment(char *);
-static void killcomment(aClient *sptr, char *parv, char *filename);
+ while (*lp) {
+ if ((*lp)->value.aconf == aconf) {
+ if (aconf->conn_class && (aconf->status & CONF_CLIENT_MASK) && ConfLinks(aconf) > 0)
+ --ConfLinks(aconf);
-aConfItem *conf = NULL;
-aGline *gline = NULL;
-aGline *badchan = NULL;
-aMotdItem *motd = NULL;
-aMotdItem *rmotd = NULL;
-atrecord *tdata = NULL;
-struct tm motd_tm;
+ assert(0 < aconf->clients);
+ if (0 == --aconf->clients && IsIllegal(aconf))
+ free_conf(aconf);
+ tmp = *lp;
+ *lp = tmp->next;
+ free_link(tmp);
+ return;
+ }
+ lp = &((*lp)->next);
+ }
+}
/*
- * field breakup for ircd.conf file.
+ * conf_dns_callback - called when resolver query finishes
+ * if the query resulted in a successful search, hp will contain
+ * a non-null pointer, otherwise hp will be null.
+ * if successful save hp in the conf item it was called with
*/
-static char *gfline = NULL;
-char *getfield(char *newline, char fs)
+static void conf_dns_callback(void* vptr, struct hostent* hp)
{
- char *end, *field;
-
- if (newline)
- gfline = newline;
+ struct ConfItem* aconf = (struct ConfItem*) vptr;
+ assert(aconf);
+ aconf->dns_pending = 0;
+ if (hp) {
+ memcpy(&aconf->ipnum, hp->h_addr, sizeof(struct in_addr));
+ MyFree(hp);
+ }
+}
- if (gfline == NULL)
- return NULL;
+/*
+ * conf_dns_lookup - do a nameserver lookup of the conf host
+ * if the conf entry is currently doing a ns lookup do nothing, otherwise
+ * if the lookup returns a null pointer, set the conf dns_pending flag
+ */
+static void conf_dns_lookup(struct ConfItem* aconf)
+{
+ if (!aconf->dns_pending) {
+ char buf[HOSTLEN + 1];
+ struct DNSQuery query;
+ query.vptr = aconf;
+ query.callback = conf_dns_callback;
+ host_from_uh(buf, aconf->host, HOSTLEN);
+ buf[HOSTLEN] = '\0';
+
+ gethost_byname(buf, &query);
+ aconf->dns_pending = 1;
+ }
+}
- end = field = gfline;
- if (fs != ':')
- {
- if (*end == fs)
- ++end;
- else
- fs = ':';
+/*
+ * lookup_confhost
+ *
+ * Do (start) DNS lookups of all hostnames in the conf line and convert
+ * an IP addresses in a.b.c.d number for to IP#s.
+ */
+void
+lookup_confhost(struct ConfItem *aconf)
+{
+ if (EmptyString(aconf->host) || EmptyString(aconf->name)) {
+ Debug((DEBUG_ERROR, "Host/server name error: (%s) (%s)",
+ aconf->host, aconf->name));
+ return;
}
- do
- {
- while (*end != fs)
- {
- if (!*end)
- {
- end = NULL;
- break;
- }
- ++end;
+ /*
+ * Do name lookup now on hostnames given and store the
+ * ip numbers in conf structure.
+ */
+ if (IsDigit(*aconf->host)) {
+ /*
+ * rfc 1035 sez host names may not start with a digit
+ * XXX - this has changed code needs to be updated
+ */
+ aconf->ipnum.s_addr = inet_addr(aconf->host);
+ if (INADDR_NONE == aconf->ipnum.s_addr) {
+ Debug((DEBUG_ERROR, "Host/server name error: (%s) (%s)",
+ aconf->host, aconf->name));
}
}
- while (end && fs != ':' && *++end != ':' && *end != '\n');
+ else
+ conf_dns_lookup(aconf);
+}
- if (end == NULL)
- {
- gfline = NULL;
- if ((end = strchr(field, '\n')) == NULL)
- end = field + strlen(field);
+/*
+ * conf_find_server - find a server by name or hostname
+ * returns a server conf item pointer if found, 0 otherwise
+ *
+ * NOTE: at some point when we don't have to scan the entire
+ * list it may be cheaper to look for server names and host
+ * names in separate loops (original code did it that way)
+ */
+struct ConfItem* conf_find_server(const char* name)
+{
+ struct ConfItem* conf;
+ assert(0 != name);
+
+ for (conf = GlobalConfList; conf; conf = conf->next) {
+ if (CONF_SERVER == conf->status) {
+ /*
+ * Check first servernames, then try hostnames.
+ * XXX - match returns 0 if there _is_ a match... guess they
+ * haven't decided what true is yet
+ */
+ if (0 == match(name, conf->name))
+ return conf;
+ }
}
- else
- gfline = end + 1;
+ return 0;
+}
- *end = '\0';
+/*
+ * conf_eval_crule - evaluate connection rules
+ * returns the name of the rule triggered if found, 0 otherwise
+ *
+ * Evaluate connection rules... If no rules found, allow the
+ * connect. Otherwise stop with the first true rule (ie: rules
+ * are ored together. Oper connects are effected only by D
+ * lines (CRULE_ALL) not d lines (CRULE_AUTO).
+ */
+const char* conf_eval_crule(const char* name, int mask)
+{
+ struct CRuleConf* p = cruleConfList;
+ assert(0 != name);
- return field;
+ for ( ; p; p = p->next) {
+ if (0 != (p->type & mask) && 0 == match(p->hostmask, name)) {
+ if (crule_eval(p->node))
+ return p->rule;
+ }
+ }
+ return 0;
}
/*
* Remove all conf entries from the client except those which match
* the status field mask.
*/
-void det_confs_butmask(aClient *cptr, int mask)
+void det_confs_butmask(struct Client* cptr, int mask)
{
- Reg1 Link *tmp, *tmp2;
+ struct SLink* link;
+ struct SLink* next;
+ assert(0 != cptr);
+
+ for (link = cli_confs(cptr); link; link = next) {
+ next = link->next;
+ if ((link->value.aconf->status & mask) == 0)
+ detach_conf(cptr, link->value.aconf);
+ }
+}
- for (tmp = cptr->confs; tmp; tmp = tmp2)
- {
- tmp2 = tmp->next;
- if ((tmp->value.aconf->status & mask) == 0)
- detach_conf(cptr, tmp->value.aconf);
+/*
+ * check_limit_and_attach - check client limits and attach I:line
+ *
+ * Made it accept 1 charactor, and 2 charactor limits (0->99 now),
+ * and dislallow more than 255 people here as well as in ipcheck.
+ * removed the old "ONE" scheme too.
+ * -- Isomer 2000-06-22
+ */
+static enum AuthorizationCheckResult
+check_limit_and_attach(struct Client* cptr, struct ConfItem* aconf)
+{
+ int number = 255;
+
+ if (aconf->passwd) {
+ if (IsDigit(*aconf->passwd) && !aconf->passwd[1])
+ number = *aconf->passwd-'0';
+ else if (IsDigit(*aconf->passwd) && IsDigit(aconf->passwd[1]) &&
+ !aconf->passwd[2])
+ number = (*aconf->passwd-'0')*10+(aconf->passwd[1]-'0');
}
+ if (IPcheck_nr(cptr) > number)
+ return ACR_TOO_MANY_FROM_IP;
+ return attach_conf(cptr, aconf);
}
/*
* Find the first (best) I line to attach.
*/
-enum AuthorizationCheckResult attach_Iline(aClient *cptr, struct hostent *hp,
- char *sockhost)
+enum AuthorizationCheckResult attach_iline(struct Client* cptr)
{
- Reg1 aConfItem *aconf;
- Reg3 const char *hname;
- Reg4 int i;
- static char uhost[HOSTLEN + USERLEN + 3];
- static char fullname[HOSTLEN + 1];
+ struct ConfItem* aconf;
+ const char* hname;
+ int i;
+ static char uhost[HOSTLEN + USERLEN + 3];
+ static char fullname[HOSTLEN + 1];
+ struct hostent* hp = 0;
- for (aconf = conf; aconf; aconf = aconf->next)
- {
+ assert(0 != cptr);
+
+ if (cli_dns_reply(cptr))
+ hp = cli_dns_reply(cptr);
+
+ for (aconf = GlobalConfList; aconf; aconf = aconf->next) {
if (aconf->status != CONF_CLIENT)
continue;
- if (aconf->port && aconf->port != cptr->acpt->port)
+ if (aconf->port && aconf->port != cli_listener(cptr)->port)
continue;
if (!aconf->host || !aconf->name)
continue;
- if (hp)
- for (i = 0, hname = hp->h_name; hname; hname = hp->h_aliases[i++])
- {
- size_t fullnamelen = 0;
- size_t label_count = 0;
- int error;
-
- strncpy(fullname, hname, HOSTLEN);
- fullname[HOSTLEN] = 0;
-
- /*
- * Disallow a hostname label to contain anything but a [-a-zA-Z0-9].
- * It may not start or end on a '.'.
- * A label may not end on a '-', the maximum length of a label is
- * 63 characters.
- * On top of that (which seems to be the RFC) we demand that the
- * top domain does not contain any digits.
- */
- error = (*hname == '.') ? 1 : 0; /* May not start with a '.' */
- if (!error)
- {
- char *p;
- for (p = fullname; *p; ++p, ++fullnamelen)
- {
- if (*p == '.')
- {
- if (p[-1] == '-' /* Label may not end on '-' */
- || p[1] == 0) /* May not end on a '.' */
- {
- error = 1;
- break;
- }
- label_count = 0;
- error = 0; /* Was not top domain */
- continue;
- }
- if (++label_count > 63) /* Label not longer then 63 */
- {
- error = 1;
- break;
- }
- if (*p >= '0' && *p <= '9')
- {
- error = 1; /* In case this is top domain */
- continue;
- }
- if (!(*p >= 'a' && *p <= 'z')
- && !(*p >= 'A' && *p <= 'Z') && *p != '-')
- {
- error = 1;
- break;
- }
- }
- }
- if (error)
- {
- hp = NULL;
- break;
- }
-
- add_local_domain(fullname, HOSTLEN - fullnamelen);
- Debug((DEBUG_DNS, "a_il: %s->%s", sockhost, fullname));
- if (strchr(aconf->name, '@'))
- {
- strcpy(uhost, cptr->username);
- strcat(uhost, "@");
- }
- else
- *uhost = '\0';
- strncat(uhost, fullname, sizeof(uhost) - 1 - strlen(uhost));
- uhost[sizeof(uhost) - 1] = 0;
- if (!match(aconf->name, uhost))
- {
- if (strchr(uhost, '@'))
- cptr->flags |= FLAGS_DOID;
- goto attach_iline;
- }
+ if (hp) {
+ for (i = 0, hname = hp->h_name; hname; hname = hp->h_aliases[i++]) {
+ ircd_strncpy(fullname, hname, HOSTLEN);
+ fullname[HOSTLEN] = '\0';
+
+ Debug((DEBUG_DNS, "a_il: %s->%s", cli_sockhost(cptr), fullname));
+
+ if (strchr(aconf->name, '@')) {
+ strcpy(uhost, cli_username(cptr));
+ strcat(uhost, "@");
+ }
+ else
+ *uhost = '\0';
+ strncat(uhost, fullname, sizeof(uhost) - 1 - strlen(uhost));
+ uhost[sizeof(uhost) - 1] = 0;
+ if (0 == match(aconf->name, uhost)) {
+ if (strchr(uhost, '@'))
+ SetFlag(cptr, FLAG_DOID);
+ return check_limit_and_attach(cptr, aconf);
+ }
}
-
- if (strchr(aconf->host, '@'))
- {
- strncpy(uhost, cptr->username, sizeof(uhost) - 2);
+ }
+ if (strchr(aconf->host, '@')) {
+ ircd_strncpy(uhost, cli_username(cptr), sizeof(uhost) - 2);
uhost[sizeof(uhost) - 2] = 0;
strcat(uhost, "@");
}
else
*uhost = '\0';
- strncat(uhost, sockhost, sizeof(uhost) - 1 - strlen(uhost));
+ strncat(uhost, cli_sock_ip(cptr), sizeof(uhost) - 1 - strlen(uhost));
uhost[sizeof(uhost) - 1] = 0;
if (match(aconf->host, uhost))
continue;
if (strchr(uhost, '@'))
- cptr->flags |= FLAGS_DOID;
- if (hp && hp->h_name)
- {
- strncpy(uhost, hp->h_name, HOSTLEN);
- uhost[HOSTLEN] = 0;
- add_local_domain(uhost, HOSTLEN - strlen(uhost));
- }
- attach_iline:
- get_sockhost(cptr, uhost);
-
- if (aconf->passwd)
- {
- if (isDigit(*aconf->passwd) && !aconf->passwd[1]) /* Special case: exactly one digit */
- {
- /* Refuse connections when there are already <digit> clients connected with the same IP number */
- unsigned short nr = *aconf->passwd - '0';
- if (IPcheck_nr(cptr) > nr)
- return ACR_TOO_MANY_FROM_IP; /* Already got nr with that ip# */
- }
-#ifdef USEONE
- else if (!strcmp(aconf->passwd, "ONE"))
- {
- for (i = highest_fd; i >= 0; i--)
- if (loc_clients[i] && MyUser(loc_clients[i]) &&
- loc_clients[i]->ip.s_addr == cptr->ip.s_addr)
- return ACR_TOO_MANY_FROM_IP; /* Already got one with that ip# */
- }
-#endif
- }
- return attach_conf(cptr, aconf);
- }
- return ACR_NO_AUTHORIZATION;
-}
-
-/*
- * Find the single N line and return pointer to it (from list).
- * If more than one then return NULL pointer.
- */
-aConfItem *count_cnlines(Link *lp)
-{
- Reg1 aConfItem *aconf, *cline = NULL, *nline = NULL;
-
- for (; lp; lp = lp->next)
- {
- aconf = lp->value.aconf;
- if (!(aconf->status & CONF_SERVER_MASK))
- continue;
- if (aconf->status == CONF_CONNECT_SERVER && !cline)
- cline = aconf;
- else if (aconf->status == CONF_NOCONNECT_SERVER && !nline)
- nline = aconf;
- }
- return nline;
-}
+ SetFlag(cptr, FLAG_DOID);
-/*
- * detach_conf
- *
- * Disassociate configuration from the client.
- */
-int detach_conf(aClient *cptr, aConfItem *aconf)
-{
- Reg1 Link **lp, *tmp;
-
- lp = &(cptr->confs);
-
- while (*lp)
- {
- if ((*lp)->value.aconf == aconf)
- {
- if (aconf && (aconf->confClass)
- && (aconf->status & CONF_CLIENT_MASK) && ConfLinks(aconf) > 0)
- --ConfLinks(aconf);
- if (aconf && !--aconf->clients && IsIllegal(aconf))
- free_conf(aconf);
- tmp = *lp;
- *lp = tmp->next;
- free_link(tmp);
- return 0;
- }
- else
- lp = &((*lp)->next);
+ return check_limit_and_attach(cptr, aconf);
}
- return -1;
+ return ACR_NO_AUTHORIZATION;
}
-static int is_attached(aConfItem *aconf, aClient *cptr)
+static int is_attached(struct ConfItem *aconf, struct Client *cptr)
{
- Reg1 Link *lp;
+ struct SLink *lp;
- for (lp = cptr->confs; lp; lp = lp->next)
+ for (lp = cli_confs(cptr); lp; lp = lp->next) {
if (lp->value.aconf == aconf)
- break;
-
- return (lp) ? 1 : 0;
+ return 1;
+ }
+ return 0;
}
/*
* connection). Note, that this automaticly changes the
* attachment if there was an old one...
*/
-enum AuthorizationCheckResult attach_conf(aClient *cptr, aConfItem *aconf)
+enum AuthorizationCheckResult attach_conf(struct Client *cptr, struct ConfItem *aconf)
{
- Reg1 Link *lp;
+ struct SLink *lp;
if (is_attached(aconf, cptr))
return ACR_ALREADY_AUTHORIZED;
return ACR_NO_AUTHORIZATION;
if ((aconf->status & (CONF_LOCOP | CONF_OPERATOR | CONF_CLIENT)) &&
ConfLinks(aconf) >= ConfMaxLinks(aconf) && ConfMaxLinks(aconf) > 0)
- return ACR_TOO_MANY_IN_CLASS; /* Use this for printing error message */
+ return ACR_TOO_MANY_IN_CLASS; /* Use this for printing error message */
lp = make_link();
- lp->next = cptr->confs;
+ lp->next = cli_confs(cptr);
lp->value.aconf = aconf;
- cptr->confs = lp;
- aconf->clients++;
+ cli_confs(cptr) = lp;
+ ++aconf->clients;
if (aconf->status & CONF_CLIENT_MASK)
ConfLinks(aconf)++;
return ACR_OK;
}
-aConfItem *find_admin(void)
-{
- Reg1 aConfItem *aconf;
-
- for (aconf = conf; aconf; aconf = aconf->next)
- if (aconf->status & CONF_ADMIN)
- break;
-
- return (aconf);
-}
-
-aConfItem *find_me(void)
+const struct LocalConf* conf_get_local(void)
{
- Reg1 aConfItem *aconf;
- for (aconf = conf; aconf; aconf = aconf->next)
- if (aconf->status & CONF_ME)
- break;
-
- return (aconf);
+ return &localConf;
}
/*
- * attach_confs
+ * attach_confs_byname
*
* Attach a CONF line to a client if the name passed matches that for
* the conf file (for non-C/N lines) or is an exact match (C/N lines
* only). The difference in behaviour is to stop C:*::* and N:*::*.
*/
-aConfItem *attach_confs(aClient *cptr, const char *name, int statmask)
+struct ConfItem* attach_confs_byname(struct Client* cptr, const char* name,
+ int statmask)
{
- Reg1 aConfItem *tmp;
- aConfItem *first = NULL;
- int len = strlen(name);
+ struct ConfItem* tmp;
+ struct ConfItem* first = NULL;
- if (!name || len > HOSTLEN)
- return NULL;
- for (tmp = conf; tmp; tmp = tmp->next)
- {
- if ((tmp->status & statmask) && !IsIllegal(tmp) &&
- ((tmp->status & (CONF_SERVER_MASK | CONF_HUB)) == 0) &&
- tmp->name && !match(tmp->name, name))
- {
- if (attach_conf(cptr, tmp) == ACR_OK && !first)
- first = tmp;
- }
- else if ((tmp->status & statmask) && !IsIllegal(tmp) &&
- (tmp->status & (CONF_SERVER_MASK | CONF_HUB)) &&
- tmp->name && !strCasediff(tmp->name, name))
- {
- if (attach_conf(cptr, tmp) == ACR_OK && !first)
- first = tmp;
+ assert(0 != name);
+
+ if (HOSTLEN < strlen(name))
+ return 0;
+
+ for (tmp = GlobalConfList; tmp; tmp = tmp->next) {
+ if (0 != (tmp->status & statmask) && !IsIllegal(tmp)) {
+ assert(0 != tmp->name);
+ if (0 == match(tmp->name, name) || 0 == ircd_strcmp(tmp->name, name)) {
+ if (ACR_OK == attach_conf(cptr, tmp) && !first)
+ first = tmp;
+ }
}
}
- return (first);
+ return first;
}
/*
* Added for new access check meLazy
*/
-aConfItem *attach_confs_host(aClient *cptr, char *host, int statmask)
+struct ConfItem* attach_confs_byhost(struct Client* cptr, const char* host,
+ int statmask)
{
- Reg1 aConfItem *tmp;
- aConfItem *first = NULL;
- int len = strlen(host);
+ struct ConfItem* tmp;
+ struct ConfItem* first = 0;
- if (!host || len > HOSTLEN)
- return NULL;
+ assert(0 != host);
+ if (HOSTLEN < strlen(host))
+ return 0;
- for (tmp = conf; tmp; tmp = tmp->next)
- {
- if ((tmp->status & statmask) && !IsIllegal(tmp) &&
- (tmp->status & CONF_SERVER_MASK) == 0 &&
- (!tmp->host || match(tmp->host, host) == 0))
- {
- if (attach_conf(cptr, tmp) == ACR_OK && !first)
- first = tmp;
- }
- else if ((tmp->status & statmask) && !IsIllegal(tmp) &&
- (tmp->status & CONF_SERVER_MASK) &&
- (tmp->host && strCasediff(tmp->host, host) == 0))
- {
- if (attach_conf(cptr, tmp) == ACR_OK && !first)
- first = tmp;
+ for (tmp = GlobalConfList; tmp; tmp = tmp->next) {
+ if (0 != (tmp->status & statmask) && !IsIllegal(tmp)) {
+ assert(0 != tmp->host);
+ if (0 == match(tmp->host, host) || 0 == ircd_strcmp(tmp->host, host)) {
+ if (ACR_OK == attach_conf(cptr, tmp) && !first)
+ first = tmp;
+ }
}
}
- return (first);
+ return first;
}
/*
* find a conf entry which matches the hostname and has the same name.
*/
-aConfItem *find_conf_exact(char *name, char *user, char *host, int statmask)
+struct ConfItem* find_conf_exact(const char* name, const char* user,
+ const char* host, int statmask)
{
- Reg1 aConfItem *tmp;
+ struct ConfItem *tmp;
char userhost[USERLEN + HOSTLEN + 3];
- sprintf_irc(userhost, "%s@%s", user, host);
+ if (user)
+ ircd_snprintf(0, userhost, sizeof(userhost), "%s@%s", user, host);
+ else
+ ircd_strncpy(userhost, host, sizeof(userhost) - 1);
- for (tmp = conf; tmp; tmp = tmp->next)
- {
+ for (tmp = GlobalConfList; tmp; tmp = tmp->next) {
if (!(tmp->status & statmask) || !tmp->name || !tmp->host ||
- strCasediff(tmp->name, name))
+ 0 != ircd_strcmp(tmp->name, name))
continue;
/*
* Accept if the *real* hostname (usually sockecthost)
*/
if (match(tmp->host, userhost))
continue;
- if (tmp->status & (CONF_OPERATOR | CONF_LOCOP))
- {
- if (tmp->clients < MaxLinks(tmp->confClass))
- return tmp;
+ if (tmp->status & (CONF_OPERATOR | CONF_LOCOP)) {
+ if (tmp->clients < MaxLinks(tmp->conn_class))
+ return tmp;
else
- continue;
+ continue;
}
else
return tmp;
}
- return NULL;
+ return 0;
}
-aConfItem *find_conf(Link *lp, const char *name, int statmask)
+struct ConfItem* find_conf_byname(struct SLink* lp, const char* name,
+ int statmask)
{
- Reg1 aConfItem *tmp;
- int namelen = name ? strlen(name) : 0;
+ struct ConfItem* tmp;
+ assert(0 != name);
- if (namelen > HOSTLEN)
- return (aConfItem *)0;
+ if (HOSTLEN < strlen(name))
+ return 0;
- for (; lp; lp = lp->next)
- {
+ for (; lp; lp = lp->next) {
tmp = lp->value.aconf;
- if ((tmp->status & statmask) &&
- (((tmp->status & (CONF_SERVER_MASK | CONF_HUB)) &&
- tmp->name && !strCasediff(tmp->name, name)) ||
- ((tmp->status & (CONF_SERVER_MASK | CONF_HUB)) == 0 &&
- tmp->name && !match(tmp->name, name))))
- return tmp;
+ if (0 != (tmp->status & statmask)) {
+ assert(0 != tmp->name);
+ if (0 == ircd_strcmp(tmp->name, name) || 0 == match(tmp->name, name))
+ return tmp;
+ }
}
- return NULL;
+ return 0;
}
/*
* Added for new access check meLazy
*/
-aConfItem *find_conf_host(Link *lp, char *host, int statmask)
+struct ConfItem* find_conf_byhost(struct SLink* lp, const char* host,
+ int statmask)
{
- Reg1 aConfItem *tmp;
- int hostlen = host ? strlen(host) : 0;
+ struct ConfItem* tmp = NULL;
+ assert(0 != host);
- if (hostlen > HOSTLEN || BadPtr(host))
- return (aConfItem *)NULL;
- for (; lp; lp = lp->next)
- {
+ if (HOSTLEN < strlen(host))
+ return 0;
+
+ for (; lp; lp = lp->next) {
tmp = lp->value.aconf;
- if (tmp->status & statmask &&
- (!(tmp->status & CONF_SERVER_MASK || tmp->host) ||
- (tmp->host && !match(tmp->host, host))))
- return tmp;
+ if (0 != (tmp->status & statmask)) {
+ assert(0 != tmp->host);
+ if (0 == match(tmp->host, host))
+ return tmp;
+ }
}
- return NULL;
+ return 0;
}
/*
* Find a conf line using the IP# stored in it to search upon.
* Added 1/8/92 by Avalon.
*/
-aConfItem *find_conf_ip(Link *lp, char *ip, char *user, int statmask)
+struct ConfItem* find_conf_byip(struct SLink* lp, const char* ip,
+ int statmask)
{
- Reg1 aConfItem *tmp;
- Reg2 char *s;
+ struct ConfItem* tmp;
- for (; lp; lp = lp->next)
- {
+ for (; lp; lp = lp->next) {
tmp = lp->value.aconf;
- if (!(tmp->status & statmask))
- continue;
- s = strchr(tmp->host, '@');
- *s = '\0';
- if (match(tmp->host, user))
- {
- *s = '@';
- continue;
+ if (0 != (tmp->status & statmask)) {
+ if (0 == memcmp(&tmp->ipnum, ip, sizeof(struct in_addr)))
+ return tmp;
}
- *s = '@';
- if (!memcmp(&tmp->ipnum, ip, sizeof(struct in_addr)))
- return tmp;
}
- return NULL;
+ return 0;
}
/*
*
* - looks for a match on all given fields.
*/
-static aConfItem *find_conf_entry(aConfItem *aconf, unsigned int mask)
+#if 0
+static struct ConfItem *find_conf_entry(struct ConfItem *aconf,
+ unsigned int mask)
{
- Reg1 aConfItem *bconf;
+ struct ConfItem *bconf;
+ assert(0 != aconf);
- for (bconf = conf, mask &= ~CONF_ILLEGAL; bconf; bconf = bconf->next)
- {
+ mask &= ~CONF_ILLEGAL;
+
+ for (bconf = GlobalConfList; bconf; bconf = bconf->next) {
if (!(bconf->status & mask) || (bconf->port != aconf->port))
continue;
- if ((BadPtr(bconf->host) && !BadPtr(aconf->host)) ||
- (BadPtr(aconf->host) && !BadPtr(bconf->host)))
+ if ((EmptyString(bconf->host) && !EmptyString(aconf->host)) ||
+ (EmptyString(aconf->host) && !EmptyString(bconf->host)))
continue;
- if (!BadPtr(bconf->host) && strCasediff(bconf->host, aconf->host))
+ if (!EmptyString(bconf->host) && 0 != ircd_strcmp(bconf->host, aconf->host))
continue;
- if ((BadPtr(bconf->passwd) && !BadPtr(aconf->passwd)) ||
- (BadPtr(aconf->passwd) && !BadPtr(bconf->passwd)))
+ if ((EmptyString(bconf->passwd) && !EmptyString(aconf->passwd)) ||
+ (EmptyString(aconf->passwd) && !EmptyString(bconf->passwd)))
continue;
- if (!BadPtr(bconf->passwd) && (!isDigit(*bconf->passwd) || bconf->passwd[1])
-#ifdef USEONE
- && strCasediff(bconf->passwd, "ONE")
-#endif
- && strCasediff(bconf->passwd, aconf->passwd))
+ if (!EmptyString(bconf->passwd) && (!IsDigit(*bconf->passwd) || bconf->passwd[1])
+ && 0 != ircd_strcmp(bconf->passwd, aconf->passwd))
continue;
- if ((BadPtr(bconf->name) && !BadPtr(aconf->name)) ||
- (BadPtr(aconf->name) && !BadPtr(bconf->name)))
+ if ((EmptyString(bconf->name) && !EmptyString(aconf->name)) ||
+ (EmptyString(aconf->name) && !EmptyString(bconf->name)))
continue;
- if (!BadPtr(bconf->name) && strCasediff(bconf->name, aconf->name))
+ if (!EmptyString(bconf->name) && 0 != ircd_strcmp(bconf->name, aconf->name))
continue;
break;
}
}
/*
- * rehash
- *
- * Actual REHASH service routine. Called with sig == 0 if it has been called
- * as a result of an operator issuing this command, else assume it has been
- * called as a result of the server receiving a HUP signal.
+ * If conf line is a class definition, create a class entry
+ * for it and make the conf_line illegal and delete it.
*/
-int rehash(aClient *cptr, int sig)
+void conf_add_class(const char* const* fields, int count)
{
- Reg1 aConfItem **tmp = &conf, *tmp2;
- Reg2 aConfClass *cltmp;
- Reg1 aClient *acptr;
- Reg2 aMotdItem *temp;
- Reg2 int i;
- int ret = 0, found_g;
-
- if (sig == 1)
- sendto_ops("Got signal SIGHUP, reloading ircd conf. file");
-
- for (i = 0; i <= highest_fd; i++)
- if ((acptr = loc_clients[i]) && !IsMe(acptr))
- {
- /*
- * Nullify any references from client structures to
- * this host structure which is about to be freed.
- * Could always keep reference counts instead of
- * this....-avalon
- */
- acptr->hostp = NULL;
- }
+ if (count < 6)
+ return;
+ add_class(atoi(fields[1]), atoi(fields[2]), atoi(fields[3]),
+ atoi(fields[4]), atoi(fields[5]));
+}
- while ((tmp2 = *tmp))
- if (tmp2->clients || tmp2->status & CONF_LISTEN_PORT)
- {
- /*
- * Configuration entry is still in use by some
- * local clients, cannot delete it--mark it so
- * that it will be deleted when the last client
- * exits...
- */
- if (!(tmp2->status & (CONF_LISTEN_PORT | CONF_CLIENT)))
- {
- *tmp = tmp2->next;
- tmp2->next = NULL;
- }
- else
- tmp = &tmp2->next;
- tmp2->status |= CONF_ILLEGAL;
- }
- else
- {
- *tmp = tmp2->next;
- /* free expression trees of connect rules */
- if ((tmp2->status & (CONF_CRULEALL | CONF_CRULEAUTO)) &&
- (tmp2->passwd != NULL))
- crule_free(&(tmp2->passwd));
- free_conf(tmp2);
- }
+void conf_add_listener(const char* const* fields, int count)
+{
+ int is_server = 0;
+ int is_hidden = 0;
/*
- * We don't delete the class table, rather mark all entries
- * for deletion. The table is cleaned up by check_class(). - avalon
+ * need a port
*/
- for (cltmp = NextClass(FirstClass()); cltmp; cltmp = NextClass(cltmp))
- MarkDelete(cltmp);
+ if (count < 5 || EmptyString(fields[4]))
+ return;
+ if (!EmptyString(fields[3])) {
+ const char* x = fields[3];
+ if ('S' == ToUpper(*x))
+ is_server = 1;
+ ++x;
+ if ('H' == ToUpper(*x))
+ is_hidden = 1;
+ }
+ /* port vhost mask */
+ add_listener(atoi(fields[4]), fields[2], fields[1], is_server, is_hidden);
+}
+
+void conf_add_local(const char* const* fields, int count)
+{
+ if (count < 6 || EmptyString(fields[1]) || EmptyString(fields[5])) {
+ log_write(LS_CONFIG, L_CRIT, 0, "Your M: line must have 6 fields!");
+ return;
+ }
/*
- * delete the juped nicks list
+ * these two can only be set the first time
*/
- clearNickJupes();
-
- if (sig != 2)
- flush_cache();
- if (initconf(0) == -1) /* This calls check_class(), */
- check_class(); /* unless it fails */
- close_listeners();
-
+ if (0 == localConf.name) {
+ if (string_is_hostname(fields[1]))
+ DupString(localConf.name, fields[1]);
+ }
+ if (0 == localConf.numeric) {
+ localConf.numeric = atoi(fields[5]);
+ if (0 == localConf.numeric)
+ log_write(LS_CONFIG, L_WARNING, 0,
+ "Your M: line must have a Numeric value greater than 0");
+ }
/*
- * Flush out deleted I and P lines although still in use.
+ * these two can be changed while the server is running
*/
- for (tmp = &conf; (tmp2 = *tmp);)
- if (!(tmp2->status & CONF_ILLEGAL))
- tmp = &tmp2->next;
- else
- {
- *tmp = tmp2->next;
- tmp2->next = NULL;
- if (!tmp2->clients)
- free_conf(tmp2);
- }
-
- for (i = 0; i <= highest_fd; i++) {
- if ((acptr = loc_clients[i]) && !IsMe(acptr)) {
- if (IsServer(acptr)) {
- det_confs_butmask(acptr,
- ~(CONF_HUB | CONF_LEAF | CONF_UWORLD | CONF_ILLEGAL));
- attach_confs(acptr, acptr->name, CONF_HUB | CONF_LEAF | CONF_UWORLD);
- }
- if ((found_g = find_kill(acptr))) {
- sendto_op_mask(found_g == -2 ? SNO_GLINE : SNO_OPERKILL,
- found_g == -2 ? "G-line active for %s" : "K-line active for %s",
- get_client_name(acptr, FALSE));
- if (exit_client(cptr, acptr, &me, found_g == -2 ? "G-lined" :
- "K-lined") == CPTR_KILLED)
- ret = CPTR_KILLED;
- }
-#if defined(R_LINES) && defined(R_LINES_REHASH) && !defined(R_LINES_OFTEN)
- if (find_restrict(acptr)) {
- sendto_ops("Restricting %s, closing lp", get_client_name(acptr, FALSE));
- if (exit_client(cptr, acptr, &me, "R-lined") == CPTR_KILLED)
- ret = CPTR_KILLED;
- }
-#endif
- }
+ if (string_is_address(fields[2])) {
+ if (INADDR_NONE == (localConf.vhost_address.s_addr = inet_addr(fields[2])))
+ localConf.vhost_address.s_addr = INADDR_ANY;
}
+ MyFree(localConf.description);
+ DupString(localConf.description, fields[3]);
+ /*
+ * XXX - shouldn't be setting these directly here
+ */
+ ircd_strncpy(cli_info(&me), fields[3], REALLEN);
+ set_virtual_host(localConf.vhost_address);
+}
- /* free old motd structs */
- while (motd) {
- temp = motd->next;
- RunFree(motd);
- motd = temp;
- }
- while (rmotd) {
- temp = rmotd->next;
- RunFree(rmotd);
- rmotd = temp;
+void conf_add_admin(const char* const* fields, int count)
+{
+ /*
+ * if you have one, it MUST have 3 lines
+ */
+ if (count < 4) {
+ log_write(LS_CONFIG, L_CRIT, 0, "Your A: line must have 4 fields!");
+ return;
}
- /* reload motd files */
- read_tlines();
- rmotd = read_motd(RPATH);
- motd = read_motd(MPATH);
+ MyFree(localConf.location1);
+ DupString(localConf.location1, fields[1]);
- return ret;
+ MyFree(localConf.location2);
+ DupString(localConf.location2, fields[2]);
+
+ MyFree(localConf.contact);
+ DupString(localConf.contact, fields[3]);
}
/*
- * initconf
- *
- * Read configuration file.
- *
- * returns -1, if file cannot be opened
- * 0, if file opened
+ * conf_add_crule - Create expression tree from connect rule and add it
+ * to the crule list
*/
+void conf_add_crule(const char* const* fields, int count, int type)
+{
+ struct CRuleNode* node;
+ assert(0 != fields);
+
+ if (count < 4 || EmptyString(fields[1]) || EmptyString(fields[3]))
+ return;
+
+ if ((node = crule_parse(fields[3]))) {
+ struct CRuleConf* p = (struct CRuleConf*) MyMalloc(sizeof(struct CRuleConf));
+ assert(0 != p);
-#define MAXCONFLINKS 150
+ DupString(p->hostmask, fields[1]);
+ collapse(p->hostmask);
-int initconf(int opt)
+ DupString(p->rule, fields[3]);
+
+ p->type = type;
+ p->node = node;
+ p->next = cruleConfList;
+ cruleConfList = p;
+ }
+}
+#endif
+
+void conf_erase_crule_list(void)
{
- static char quotes[9][2] = {
- {'b', '\b'},
- {'f', '\f'},
- {'n', '\n'},
- {'r', '\r'},
- {'t', '\t'},
- {'v', '\v'},
- {'\\', '\\'},
- {0, 0}
- };
- Reg1 char *tmp, *s;
- FBFILE *file;
- int i;
- char line[512];
- int ccount = 0, ncount = 0;
- aConfItem *aconf = NULL;
-
- Debug((DEBUG_DEBUG, "initconf(): ircd.conf = %s", configfile));
- if (NULL == (file = fbopen(configfile, "r")))
- {
- return -1;
+ struct CRuleConf* next;
+ struct CRuleConf* p = cruleConfList;
+
+ for ( ; p; p = next) {
+ next = p->next;
+ crule_free(&p->node);
+ MyFree(p->hostmask);
+ MyFree(p->rule);
+ MyFree(p);
}
- while (fbgets(line, sizeof(line) - 1, file))
- {
- if ((tmp = strchr(line, '\n')))
- *tmp = '\0';
- /*
- * Do quoting of characters and # detection.
- */
- for (tmp = line; *tmp; tmp++)
- {
- if (*tmp == '\\')
- {
- for (i = 0; quotes[i][0]; i++)
- if (quotes[i][0] == *(tmp + 1))
- {
- *tmp = quotes[i][1];
- break;
- }
- if (!quotes[i][0])
- *tmp = *(tmp + 1);
- if (!*(tmp + 1))
- break;
- else
- for (s = tmp; (*s = *(s + 1)); s++)
- ;
- }
- else if (*tmp == '#')
- *tmp = '\0';
- }
- if (!*line || line[0] == '#' || line[0] == '\n' ||
- line[0] == ' ' || line[0] == '\t')
- continue;
- /* Could we test if it's conf line at all? -Vesa */
- if (line[1] != ':')
- {
- Debug((DEBUG_ERROR, "Bad config line: %s", line));
- continue;
- }
- if (aconf)
- free_conf(aconf);
- aconf = make_conf();
+ cruleConfList = 0;
+}
- tmp = getfield(line, ':');
- if (!tmp)
- continue;
- switch (*tmp)
- {
- case 'A': /* Name, e-mail address of administrator */
- case 'a': /* of this server. */
- aconf->status = CONF_ADMIN;
- break;
- case 'C': /* Server where I should try to connect */
- case 'c': /* in case of lp failures */
- ccount++;
- aconf->status = CONF_CONNECT_SERVER;
- break;
- /* Connect rule */
- case 'D':
- aconf->status = CONF_CRULEALL;
- break;
- /* Connect rule - autos only */
- case 'd':
- aconf->status = CONF_CRULEAUTO;
- break;
- case 'H': /* Hub server line */
- case 'h':
- aconf->status = CONF_HUB;
- break;
- case 'I': /* Just plain normal irc client trying */
- case 'i': /* to connect me */
- aconf->status = CONF_CLIENT;
- break;
- case 'K': /* Kill user line on irc.conf */
- aconf->status = CONF_KILL;
- break;
- case 'k': /* Kill user line based on IP in ircd.conf */
- aconf->status = CONF_IPKILL;
- break;
- /* Operator. Line should contain at least */
- /* password and host where connection is */
- case 'L': /* guaranteed leaf server */
- case 'l':
- aconf->status = CONF_LEAF;
- break;
- /* Me. Host field is name used for this host */
- /* and port number is the number of the port */
- case 'M':
- case 'm':
- aconf->status = CONF_ME;
- break;
- case 'N': /* Server where I should NOT try to */
- case 'n': /* connect in case of lp failures */
- /* but which tries to connect ME */
- ++ncount;
- aconf->status = CONF_NOCONNECT_SERVER;
- break;
- case 'O':
- aconf->status = CONF_OPERATOR;
- break;
- /* Local Operator, (limited privs --SRB) */
- case 'o':
- aconf->status = CONF_LOCOP;
- break;
- case 'P': /* listen port line */
- case 'p':
- aconf->status = CONF_LISTEN_PORT;
- break;
-#ifdef R_LINES
- case 'R': /* extended K line */
- case 'r': /* Offers more options of how to restrict */
- aconf->status = CONF_RESTRICT;
- break;
-#endif
- case 'T': /* print out different motd's */
- case 't': /* based on hostmask */
- aconf->status = CONF_TLINES;
- break;
- case 'U': /* Underworld server, allowed to hack modes */
- case 'u': /* *Every* server on the net must define the same !!! */
- aconf->status = CONF_UWORLD;
- break;
- case 'Y':
- case 'y':
- aconf->status = CONF_CLASS;
- break;
- default:
- Debug((DEBUG_ERROR, "Error in config file: %s", line));
- break;
- }
- if (IsIllegal(aconf))
- continue;
+const struct CRuleConf* conf_get_crule_list(void)
+{
+ return cruleConfList;
+}
- for (;;) /* Fake loop, that I can use break here --msa */
- {
- if ((tmp = getfield(NULL, ':')) == NULL)
- break;
- DupString(aconf->host, tmp);
- if ((tmp = getfield(NULL, (aconf->status == CONF_KILL
- || aconf->status == CONF_IPKILL) ? '"' : ':')) == NULL)
- break;
- DupString(aconf->passwd, tmp);
- if ((tmp = getfield(NULL, ':')) == NULL)
- break;
- DupString(aconf->name, tmp);
- if ((tmp = getfield(NULL, ':')) == NULL)
- break;
- aconf->port = atoi(tmp);
- tmp = getfield(NULL, ':');
- if (aconf->status & CONF_ME)
- {
- portnum = aconf->port;
- if (portnum == 0)
- portnum = PORTNUM;
- me.port = portnum;
- vserv.sin_port = htons(portnum);
- if (!tmp)
- {
- Debug((DEBUG_FATAL, "Your M: line must have the Numeric, "
- "assigned to you by routing-com, behind the port number!\n"));
-#ifdef USE_SYSLOG
- syslog(LOG_WARNING, "Your M: line must have the Numeric, "
- "assigned to you by routing-com, behind the port number!\n");
-#endif
- exit(-1);
- }
- SetYXXServerName(&me, atoi(tmp)); /* Our Numeric Nick */
- }
- else if (tmp)
- aconf->confClass = find_class(atoi(tmp));
- break;
+#if 0
+void conf_add_server(const char* const* fields, int count)
+{
+ struct ServerConf* server;
+ struct in_addr addr;
+ assert(0 != fields);
+ /*
+ * missing host, password, or alias?
+ */
+ if (count < 6 || EmptyString(fields[1]) || EmptyString(fields[2]) || EmptyString(fields[3]))
+ return;
+ /*
+ * check the host
+ */
+ if (string_is_hostname(fields[1]))
+ addr.s_addr = INADDR_NONE;
+ else if (INADDR_NONE == (addr.s_addr = inet_addr(fields[1])))
+ return;
+
+ server = (struct ServerConf*) MyMalloc(sizeof(struct ServerConf));
+ assert(0 != server);
+ DupString(server->hostname, fields[1]);
+ DupString(server->passwd, fields[2]);
+ DupString(server->alias, fields[3]);
+ server->address.s_addr = addr.s_addr;
+ server->port = atoi(fields[4]);
+ server->dns_pending = 0;
+ server->connected = 0;
+ server->hold = 0;
+ server->conn_class = find_class(atoi(fields[5]));
+
+ server->next = serverConfList;
+ serverConfList = server;
+
+ /* if (INADDR_NONE == server->address.s_addr) */
+ /* lookup_confhost(server); */
+}
+
+void conf_add_deny(const char* const* fields, int count, int ip_kill)
+{
+ struct DenyConf* conf;
+
+ if (count < 4 || EmptyString(fields[1]) || EmptyString(fields[3]))
+ return;
+
+ conf = (struct DenyConf*) MyMalloc(sizeof(struct DenyConf));
+ assert(0 != conf);
+ memset(conf, 0, sizeof(struct DenyConf));
+
+ if (fields[1][0] == '$' && fields[1][1] == 'R')
+ conf->flags |= DENY_FLAGS_REALNAME;
+
+ DupString(conf->hostmask, fields[1]);
+ collapse(conf->hostmask);
+
+ if (!EmptyString(fields[2])) {
+ const char* p = fields[2];
+ if ('!' == *p) {
+ conf->flags |= DENY_FLAGS_FILE;
+ ++p;
}
- /*
- * If conf line is a class definition, create a class entry
- * for it and make the conf_line illegal and delete it.
+ DupString(conf->message, p);
+ }
+ DupString(conf->usermask, fields[3]);
+ collapse(conf->usermask);
+
+ if (ip_kill) {
+ /*
+ * Here we use the same kludge as in listener.c to parse
+ * a.b.c.d, or a.b.c.*, or a.b.c.d/e.
*/
- if (aconf->status & CONF_CLASS)
- {
- add_class(atoi(aconf->host), atoi(aconf->passwd),
- atoi(aconf->name), aconf->port, tmp ? atoi(tmp) : 0);
- continue;
+ int c_class;
+ char ipname[16];
+ int ad[4] = { 0 };
+ int bits2 = 0;
+ c_class = sscanf(conf->hostmask, "%d.%d.%d.%d/%d",
+ &ad[0], &ad[1], &ad[2], &ad[3], &bits2);
+ if (c_class != 5) {
+ conf->bits = c_class * 8;
}
+ else {
+ conf->bits = bits2;
+ }
+ ircd_snprintf(0, ipname, sizeof(ipname), "%d.%d.%d.%d", ad[0], ad[1],
+ ad[2], ad[3]);
+
/*
- * Associate each conf line with a class by using a pointer
- * to the correct class record. -avalon
+ * This ensures endian correctness
*/
- if (aconf->status & (CONF_CLIENT_MASK | CONF_LISTEN_PORT))
- {
- if (aconf->confClass == 0)
- aconf->confClass = find_class(0);
- }
- if (aconf->status & (CONF_LISTEN_PORT | CONF_CLIENT))
- {
- aConfItem *bconf;
-
- if ((bconf = find_conf_entry(aconf, aconf->status)))
- {
- delist_conf(bconf);
- bconf->status &= ~CONF_ILLEGAL;
- if (aconf->status == CONF_CLIENT)
- {
- char *passwd = bconf->passwd;
- bconf->passwd = aconf->passwd;
- aconf->passwd = passwd;
- ConfLinks(bconf) -= bconf->clients;
- bconf->confClass = aconf->confClass;
- if (bconf->confClass)
- ConfLinks(bconf) += bconf->clients;
- }
- free_conf(aconf);
- aconf = bconf;
- }
- else if (aconf->host && aconf->status == CONF_LISTEN_PORT)
- add_listener(aconf);
- }
- if (aconf->status & CONF_SERVER_MASK)
- if (ncount > MAXCONFLINKS || ccount > MAXCONFLINKS ||
- !aconf->host || strchr(aconf->host, '*') ||
- strchr(aconf->host, '?') || !aconf->name)
- continue;
-
- if (aconf->status & (CONF_SERVER_MASK | CONF_LOCOP | CONF_OPERATOR))
- if (!strchr(aconf->host, '@') && *aconf->host != '/')
- {
- char *newhost;
- int len = 3; /* *@\0 = 3 */
-
- len += strlen(aconf->host);
- newhost = (char *)RunMalloc(len);
- sprintf_irc(newhost, "*@%s", aconf->host);
- RunFree(aconf->host);
- aconf->host = newhost;
- }
- if (aconf->status & CONF_SERVER_MASK)
- {
- if (BadPtr(aconf->passwd))
- continue;
- else if (!(opt & BOOT_QUICK))
- lookup_confhost(aconf);
- }
+ conf->address = inet_addr(ipname);
+ Debug((DEBUG_DEBUG, "IPkill: %s = %08x/%i (%08x)", ipname,
+ conf->address, conf->bits, NETMASK(conf->bits)));
+ conf->flags |= DENY_FLAGS_IP;
+ }
+ conf->next = denyConfList;
+ denyConfList = conf;
+}
+#endif
- /* Create expression tree from connect rule...
- * If there's a parsing error, nuke the conf structure */
- if (aconf->status & (CONF_CRULEALL | CONF_CRULEAUTO))
- {
- RunFree(aconf->passwd);
- if ((aconf->passwd = (char *)crule_parse(aconf->name)) == NULL)
- {
- free_conf(aconf);
- aconf = NULL;
- continue;
- }
- }
- /*
- * Own port and name cannot be changed after the startup.
- * (or could be allowed, but only if all links are closed first).
- * Configuration info does not override the name and port
- * if previously defined. Note, that "info"-field can be
- * changed by "/rehash".
- */
- if (aconf->status == CONF_ME)
- {
- strncpy(me.info, aconf->name, sizeof(me.info) - 1);
- if (me.name[0] == '\0' && aconf->host[0])
- {
- strncpy(me.name, aconf->host, sizeof(me.name) - 1);
- if (vserv.sin_addr.s_addr == htonl(INADDR_ANY)) /* Not already initialised on commandline with -w ? */
- {
- struct hostent *hep;
- hep = gethostbyname(me.name);
- if (hep && hep->h_addrtype == AF_INET && hep->h_addr_list[0] && !hep->h_addr_list[1])
- {
- memcpy(&vserv.sin_addr, hep->h_addr_list[0], sizeof(struct in_addr));
- memcpy(&cserv.sin_addr, hep->h_addr_list[0], sizeof(struct in_addr));
- }
- }
- }
- if (portnum == 0)
- portnum = aconf->port;
- have_server_port = 0;
- }
+void conf_erase_deny_list(void)
+{
+ struct DenyConf* next;
+ struct DenyConf* p = denyConfList;
+ for ( ; p; p = next) {
+ next = p->next;
+ MyFree(p->hostmask);
+ MyFree(p->usermask);
+ MyFree(p->message);
+ MyFree(p);
+ }
+ denyConfList = 0;
+}
+
+const struct DenyConf* conf_get_deny_list(void)
+{
+ return denyConfList;
+}
- /*
- * Juped nicks are listed in the 'password' field of U:lines,
- * the list is comma separated and might be empty and/or contain
- * empty elements... the only limit is that it MUST be shorter
- * than 512 chars, or they will be cutted out :)
- */
- if ((aconf->status == CONF_UWORLD) && (aconf->passwd) && (*aconf->passwd))
- addNickJupes(aconf->passwd);
-
- if (aconf->status & CONF_ADMIN)
- if (!aconf->host || !aconf->passwd || !aconf->name)
- {
- Debug((DEBUG_FATAL, "Your A: line must have 4 fields!\n"));
-#ifdef USE_SYSLOG
- syslog(LOG_WARNING, "Your A: line must have 4 fields!\n");
+#if 0
+void conf_add_quarantine(const char *chname, const char *reason)
+{
+ struct qline *qline;
+
+ qline = (struct qline *) MyMalloc(sizeof(struct qline));
+ DupString(qline->chname, chname);
+ DupString(qline->reason, reason);
+ qline->next = GlobalQuarantineList;
+ GlobalQuarantineList = qline;
+}
#endif
- exit(-1);
- }
- collapse(aconf->host);
- collapse(aconf->name);
- Debug((DEBUG_NOTICE,
- "Read Init: (%d) (%s) (%s) (%s) (%u) (%p)",
- aconf->status, aconf->host, aconf->passwd,
- aconf->name, aconf->port, aconf->confClass));
- aconf->next = conf;
- conf = aconf;
- aconf = NULL;
+const char*
+find_quarantine(const char *chname)
+{
+ struct qline *qline;
+
+ for (qline = GlobalQuarantineList; qline; qline = qline->next)
+ if (!ircd_strcmp(qline->chname, chname))
+ return qline->reason;
+ return NULL;
+}
+
+void clear_quarantines(void)
+{
+ struct qline *qline;
+ while ((qline = GlobalQuarantineList))
+ {
+ GlobalQuarantineList = qline->next;
+ MyFree(qline->reason);
+ MyFree(qline->chname);
+ MyFree(qline);
}
- if (aconf)
- free_conf(aconf);
- fbclose(file);
- check_class();
- nextping = nextconnect = now;
- return 0;
}
+
/*
- * lookup_confhost
+ * read_configuration_file
*
- * Do (start) DNS lookups of all hostnames in the conf line and convert
- * an IP addresses in a.b.c.d number for to IP#s.
+ * Read configuration file.
+ *
+ * returns 0, if file cannot be opened
+ * 1, if file read
*/
-static int lookup_confhost(aConfItem *aconf)
-{
- Reg2 char *s;
- Reg3 struct hostent *hp;
- Link ln;
-
- if (BadPtr(aconf->host) || BadPtr(aconf->name))
- goto badlookup;
- if ((s = strchr(aconf->host, '@')))
- s++;
- else
- s = aconf->host;
- /*
- * Do name lookup now on hostnames given and store the
- * ip numbers in conf structure.
- */
- if (!isAlpha(*s) && !isDigit(*s))
- goto badlookup;
- /*
- * Prepare structure in case we have to wait for a
- * reply which we get later and store away.
- */
- ln.value.aconf = aconf;
- ln.flags = ASYNC_CONF;
+#define MAXCONFLINKS 150
- if (isDigit(*s))
- aconf->ipnum.s_addr = inet_addr(s);
- else if ((hp = gethost_byname(s, &ln)))
- memcpy(&(aconf->ipnum), hp->h_addr, sizeof(struct in_addr));
+static int conf_error;
+static int conf_already_read;
+extern FILE *yyin;
+void init_lexer(void);
- if (aconf->ipnum.s_addr == INADDR_NONE)
- goto badlookup;
- return 0;
-badlookup:
- if (aconf->ipnum.s_addr == INADDR_NONE)
- memset(&aconf->ipnum, 0, sizeof(struct in_addr));
- Debug((DEBUG_ERROR, "Host/server name error: (%s) (%s)",
- aconf->host, aconf->name));
- return -1;
+int read_configuration_file(void)
+{
+ conf_error = 0;
+ feature_unmark(); /* unmark all features for resetting later */
+ /* Now just open an fd. The buffering isn't really needed... */
+ init_lexer();
+ yyparse();
+ fclose(yyin);
+ yyin = NULL;
+ feature_mark(); /* reset unmarked features */
+ conf_already_read = 1;
+ return 1;
}
-/* read_tlines
- * Read info from T:lines into trecords which include the file
- * timestamp, the hostmask, and the contents of the motd file
- * -Ghostwolf 7sep97
- */
-void read_tlines()
+void
+yyerror(const char *msg)
{
- aConfItem *tmp;
- atrecord *temp, *last = NULL; /* Init. to avoid compiler warning */
- aMotdItem *amotd;
+ sendto_opmask_butone(0, SNO_ALL, "Config file parse error line %d: %s",
+ lineno, msg);
+ log_write(LS_CONFIG, L_ERROR, 0, "Config file parse error line %d: %s",
+ lineno, msg);
+ if (!conf_already_read)
+ fprintf(stderr, "Config file parse error line %d: %s\n", lineno, msg);
+ conf_error = 1;
+}
- /* Free the old trecords and the associated motd contents first */
- while (tdata)
- {
- last = tdata->next;
- while (tdata->tmotd)
- {
- amotd = tdata->tmotd->next;
- RunFree(tdata->tmotd);
- tdata->tmotd = amotd;
+/*
+ * rehash
+ *
+ * Actual REHASH service routine. Called with sig == 0 if it has been called
+ * as a result of an operator issuing this command, else assume it has been
+ * called as a result of the server receiving a HUP signal.
+ */
+int rehash(struct Client *cptr, int sig)
+{
+ struct ConfItem** tmp = &GlobalConfList;
+ struct ConfItem* tmp2;
+ struct Client* acptr;
+ int i;
+ int ret = 0;
+ int found_g = 0;
+
+ if (1 == sig)
+ sendto_opmask_butone(0, SNO_OLDSNO,
+ "Got signal SIGHUP, reloading ircd conf. file");
+
+ while ((tmp2 = *tmp)) {
+ if (tmp2->clients) {
+ /*
+ * Configuration entry is still in use by some
+ * local clients, cannot delete it--mark it so
+ * that it will be deleted when the last client
+ * exits...
+ */
+ if (CONF_CLIENT == (tmp2->status & CONF_CLIENT))
+ tmp = &tmp2->next;
+ else {
+ *tmp = tmp2->next;
+ tmp2->next = 0;
+ }
+ tmp2->status |= CONF_ILLEGAL;
+ }
+ else {
+ *tmp = tmp2->next;
+ free_conf(tmp2);
}
- RunFree(tdata);
- tdata = last;
}
+ conf_erase_crule_list();
+ conf_erase_deny_list();
+ motd_clear();
- for (tmp = conf; tmp; tmp = tmp->next)
- if (tmp->status == CONF_TLINES && tmp->host && tmp->passwd)
- {
- temp = (atrecord *) RunMalloc(sizeof(atrecord));
- if (!temp)
- outofmemory();
- temp->hostmask = tmp->host;
- temp->tmotd = read_motd(tmp->passwd);
- temp->tmotd_tm = motd_tm;
- temp->next = NULL;
- if (!tdata)
- tdata = temp;
- else
- last->next = temp;
- last = temp;
- }
-}
+ /*
+ * delete the juped nicks list
+ */
+ clearNickJupes();
-int find_kill(aClient *cptr)
-{
- char reply[256], *host, *name;
- aConfItem *tmp;
- aGline *agline = NULL;
+ if (sig != 2)
+ restart_resolver();
- if (!cptr->user)
- return 0;
+ class_mark_delete();
+ mark_listeners_closing();
- host = cptr->sockhost;
- name = cptr->user->username;
+ read_configuration_file();
- if (strlen(host) > (size_t)HOSTLEN ||
- (name ? strlen(name) : 0) > (size_t)HOSTLEN)
- return (0);
+ log_reopen(); /* reopen log files */
- reply[0] = '\0';
+ close_listeners();
+ class_delete_marked(); /* unless it fails */
- for (tmp = conf; tmp; tmp = tmp->next)
- /* Added a check against the user's IP address as well.
- * If the line is either CONF_KILL or CONF_IPKILL, check it; if and only
- * if it's CONF_IPKILL, check the IP address as well (the && below will
- * short circuit and the match won't even get run) -Kev
- */
- if ((tmp->status & CONF_KLINE) && tmp->host && tmp->name &&
- (match(tmp->host, host) == 0 ||
- ((tmp->status == CONF_IPKILL) &&
- match(tmp->host, inetntoa(cptr->ip)) == 0)) &&
- (!name || match(tmp->name, name) == 0) &&
- (!tmp->port || (tmp->port == cptr->acpt->port)))
- {
- /*
- * Can short-circuit evaluation - not taking chances
- * because check_time_interval destroys tmp->passwd
- * - Mmmm
- */
- if (BadPtr(tmp->passwd))
- break;
- else if (is_comment(tmp->passwd))
- break;
- else if (check_time_interval(tmp->passwd, reply))
- break;
+ /*
+ * Flush out deleted I and P lines although still in use.
+ */
+ for (tmp = &GlobalConfList; (tmp2 = *tmp);) {
+ if (CONF_ILLEGAL == (tmp2->status & CONF_ILLEGAL)) {
+ *tmp = tmp2->next;
+ tmp2->next = NULL;
+ if (!tmp2->clients)
+ free_conf(tmp2);
}
-
- if (reply[0])
- sendto_one(cptr, reply, me.name, ERR_YOUREBANNEDCREEP, cptr->name);
- else if (tmp)
- {
- if (BadPtr(tmp->passwd))
- sendto_one(cptr,
- ":%s %d %s :Connection from your host is refused on this server.",
- me.name, ERR_YOUREBANNEDCREEP, cptr->name);
else
- {
- if (*tmp->passwd == '"')
- {
- char *sbuf =
- sprintf_irc(sendbuf, ":%s %d %s :%s", me.name, ERR_YOUREBANNEDCREEP,
- cptr->name, &tmp->passwd[1]);
- sbuf[-1] = '.'; /* Overwrite last quote with a dot */
- sendbufto_one(cptr);
+ tmp = &tmp2->next;
+ }
+
+ for (i = 0; i <= HighestFd; i++) {
+ if ((acptr = LocalClientArray[i])) {
+ assert(!IsMe(acptr));
+ if (IsServer(acptr)) {
+ det_confs_butmask(acptr,
+ ~(CONF_HUB | CONF_LEAF | CONF_UWORLD | CONF_ILLEGAL));
+ attach_confs_byname(acptr, cli_name(acptr),
+ CONF_HUB | CONF_LEAF | CONF_UWORLD);
+ }
+ /* Because admin's are getting so uppity about people managing to
+ * get past K/G's etc, we'll "fix" the bug by actually explaining
+ * whats going on.
+ */
+ if ((found_g = find_kill(acptr))) {
+ sendto_opmask_butone(0, found_g == -2 ? SNO_GLINE : SNO_OPERKILL,
+ found_g == -2 ? "G-line active for %s%s" :
+ "K-line active for %s%s",
+ IsUnknown(acptr) ? "Unregistered Client ":"",
+ get_client_name(acptr, HIDE_IP));
+ if (exit_client(cptr, acptr, &me, found_g == -2 ? "G-lined" :
+ "K-lined") == CPTR_KILLED)
+ ret = CPTR_KILLED;
}
- else if (*tmp->passwd == '!')
- killcomment(cptr, cptr->name, &tmp->passwd[1]);
- else
-#ifdef COMMENT_IS_FILE
- killcomment(cptr, cptr->name, tmp->passwd);
-#else
- sendto_one(cptr, ":%s %d %s :%s.", me.name, ERR_YOUREBANNEDCREEP,
- cptr->name, tmp->passwd);
-#endif
}
}
- /* find active glines */
- /* added a check against the user's IP address to find_gline() -Kev */
- else if ((agline = find_gline(cptr, NULL)) && GlineIsActive(agline))
- sendto_one(cptr, ":%s %d %s :%s.", me.name, ERR_YOUREBANNEDCREEP,
- cptr->name, agline->reason);
- else
- agline = NULL; /* if a gline was found, it was inactive */
-
- return (tmp ? -1 : (agline ? -2 : 0));
+ return ret;
}
-#ifdef R_LINES
/*
- * find_restrict
+ * init_conf
+ *
+ * Read configuration file.
*
- * Works against host/name and calls an outside program
- * to determine whether a client is allowed to connect. This allows
- * more freedom to determine who is legal and who isn't, for example
- * machine load considerations. The outside program is expected to
- * return a reply line where the first word is either 'Y' or 'N' meaning
- * "Yes Let them in" or "No don't let them in." If the first word
- * begins with neither 'Y' or 'N' the default is to let the person on.
- * It returns a value of 0 if the user is to be let through -Hoppie
+ * returns 0, if file cannot be opened
+ * 1, if file read
*/
-int find_restrict(aClient *cptr)
+
+int init_conf(void)
{
- aConfItem *tmp;
- char reply[80], temprpl[80];
- char *rplhold = reply, *host, *name, *s;
- char rplchar = 'Y';
- int pi[2], rc = 0, n;
- FBFILE *file = NULL;
-
- if (!cptr->user)
+ if (read_configuration_file()) {
+ /*
+ * make sure we're sane to start if the config
+ * file read didn't get everything we need.
+ * XXX - should any of these abort the server?
+ * TODO: add warning messages
+ */
+ if (0 == localConf.name || 0 == localConf.numeric)
+ return 0;
+ if (conf_error)
+ return 0;
+
+ if (0 == localConf.location1)
+ DupString(localConf.location1, "");
+ if (0 == localConf.location2)
+ DupString(localConf.location2, "");
+ if (0 == localConf.contact)
+ DupString(localConf.contact, "");
+
+ return 1;
+ }
+ return 0;
+}
+
+/*
+ * find_kill
+ * input:
+ * client pointer
+ * returns:
+ * 0: Client may continue to try and connect
+ * -1: Client was K/k:'d - sideeffect: reason was sent.
+ * -2: Client was G/g:'d - sideeffect: reason was sent.
+ * sideeffects:
+ * Client may have been sent a reason why they are denied, as above.
+ */
+int find_kill(struct Client *cptr)
+{
+ const char* host;
+ const char* name;
+ const char* realname;
+ struct DenyConf* deny;
+ struct Gline* agline = NULL;
+
+ assert(0 != cptr);
+
+ if (!cli_user(cptr))
return 0;
- name = cptr->user->username;
- host = cptr->sockhost;
- Debug((DEBUG_INFO, "R-line check for %s[%s]", name, host));
- for (tmp = conf; tmp; tmp = tmp->next)
- {
- if (tmp->status != CONF_RESTRICT ||
- (tmp->host && host && match(tmp->host, host)) ||
- (tmp->name && name && match(tmp->name, name)))
- continue;
+ host = cli_sockhost(cptr);
+ name = cli_user(cptr)->username;
+ realname = cli_info(cptr);
+
+ assert(strlen(host) <= HOSTLEN);
+ assert((name ? strlen(name) : 0) <= HOSTLEN);
+ assert((realname ? strlen(realname) : 0) <= REALLEN);
- if (BadPtr(tmp->passwd))
- {
- sendto_ops("Program missing on R-line %s/%s, ignoring", name, host);
+ /* 2000-07-14: Rewrote this loop for massive speed increases.
+ * -- Isomer
+ */
+ for (deny = denyConfList; deny; deny = deny->next) {
+ if (0 != match(deny->usermask, name))
continue;
- }
- if (pipe(pi) == -1)
- {
- report_error("Error creating pipe for R-line %s: %s", &me);
- return 0;
- }
- switch (rc = fork())
- {
- case -1:
- report_error("Error forking for R-line %s: %s", &me);
- return 0;
- case 0:
- {
- Reg1 int i;
-
- close(pi[0]);
- for (i = 2; i < MAXCONNECTIONS; i++)
- if (i != pi[1])
- close(i);
- if (pi[1] != 2)
- dup2(pi[1], 2);
- dup2(2, 1);
- if (pi[1] != 2 && pi[1] != 1)
- close(pi[1]);
- execlp(tmp->passwd, tmp->passwd, name, host, 0);
- exit(-1);
- }
- default:
- close(pi[1]);
+ if (EmptyString(deny->hostmask))
+ break;
+
+ if (deny->flags & DENY_FLAGS_REALNAME) { /* K: by real name */
+ if (0 == match(deny->hostmask, realname))
break;
+ } else if (deny->flags & DENY_FLAGS_IP) { /* k: by IP */
+ Debug((DEBUG_DEBUG, "ip: %08x network: %08x/%i mask: %08x",
+ cli_ip(cptr).s_addr, deny->address, deny->bits, NETMASK(deny->bits)));
+ if ((cli_ip(cptr).s_addr & NETMASK(deny->bits)) == deny->address)
+ break;
}
- *reply = '\0';
- file = fdbopen(pi[0], "r");
- while (fbgets(temprpl, sizeof(temprpl) - 1, file))
- {
- if ((s = strchr(temprpl, '\n')))
- *s = '\0';
- if (strlen(temprpl) + strlen(reply) < sizeof(reply) - 2)
- sprintf_irc(rplhold, "%s %s", rplhold, temprpl);
+ else if (0 == match(deny->hostmask, host))
+ break;
+ }
+ if (deny) {
+ if (EmptyString(deny->message))
+ send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP,
+ ":Connection from your host is refused on this server.");
+ else {
+ if (deny->flags & DENY_FLAGS_FILE)
+ killcomment(cptr, deny->message);
else
- {
- sendto_ops("R-line %s/%s: reply too long!", name, host);
- break;
- }
+ send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.", deny->message);
}
- fbclose(file);
- kill(rc, SIGKILL); /* cleanup time */
- wait(0);
-
- rc = 0;
- while (*rplhold == ' ')
- rplhold++;
- rplchar = *rplhold; /* Pull out the yes or no */
- while (*rplhold != ' ')
- rplhold++;
- while (*rplhold == ' ')
- rplhold++;
- strcpy(reply, rplhold);
- rplhold = reply;
-
- if ((rc = (rplchar == 'n' || rplchar == 'N')))
- break;
}
- if (rc)
- {
- sendto_one(cptr, ":%s %d %s :Restriction: %s",
- me.name, ERR_YOUREBANNEDCREEP, cptr->name, reply);
- return -1;
+ else if ((agline = gline_lookup(cptr, 0)) && GlineIsActive(agline)) {
+ /*
+ * find active glines
+ * added a check against the user's IP address to find_gline() -Kev
+ */
+ send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.", GlineReason(agline));
}
+ else
+ agline = 0; /* if a gline was found, it was inactive */
+
+ if (deny)
+ return -1;
+ if (agline)
+ return -2;
+
return 0;
}
-#endif
/*
- * output the reason for being k lined from a file - Mmmm
- * sptr is server
- * parv is the sender prefix
- * filename is the file that is to be output to the K lined client
+ * Ordinary client access check. Look for conf lines which have the same
+ * status as the flags passed.
*/
-static void killcomment(aClient *sptr, char *parv, char *filename)
+enum AuthorizationCheckResult conf_check_client(struct Client *cptr)
{
- FBFILE *file = NULL;
- char line[80];
- Reg1 char *tmp;
- struct stat sb;
- struct tm *tm;
+ enum AuthorizationCheckResult acr = ACR_OK;
- if (NULL == (file = fbopen(filename, "r")))
- {
- sendto_one(sptr, err_str(ERR_NOMOTD), me.name, parv);
- sendto_one(sptr,
- ":%s %d %s :Connection from your host is refused on this server.",
- me.name, ERR_YOUREBANNEDCREEP, parv);
- return;
- }
- fbstat(&sb, file);
- tm = localtime((time_t *) & sb.st_mtime); /* NetBSD needs cast */
- while (fbgets(line, sizeof(line) - 1, file))
- {
- if ((tmp = strchr(line, '\n')))
- *tmp = '\0';
- if ((tmp = strchr(line, '\r')))
- *tmp = '\0';
- /* sendto_one(sptr,
- * ":%s %d %s : %s.",
- * me.name, ERR_YOUREBANNEDCREEP, parv,line); */
- sendto_one(sptr, rpl_str(RPL_MOTD), me.name, parv, line);
+ ClearAccess(cptr);
+
+ if ((acr = attach_iline(cptr))) {
+ Debug((DEBUG_DNS, "ch_cl: access denied: %s[%s]",
+ cli_name(cptr), cli_sockhost(cptr)));
+ return acr;
}
- sendto_one(sptr,
- ":%s %d %s :Connection from your host is refused on this server.",
- me.name, ERR_YOUREBANNEDCREEP, parv);
- fbclose(file);
- return;
+ return ACR_OK;
}
/*
- * is the K line field an interval or a comment? - Mmmm
+ * check_server()
+ *
+ * Check access for a server given its name (passed in cptr struct).
+ * Must check for all C/N lines which have a name which matches the
+ * name given and a host which matches. A host alias which is the
+ * same as the server name is also acceptable in the host field of a
+ * C/N line.
+ *
+ * Returns
+ * 0 = Success
+ * -1 = Access denied
+ * -2 = Bad socket.
*/
-static int is_comment(char *comment)
+int conf_check_server(struct Client *cptr)
{
- size_t i;
- for (i = 0; i < strlen(comment); i++)
- if ((comment[i] != ' ') && (comment[i] != '-')
- && (comment[i] != ',') && ((comment[i] < '0') || (comment[i] > '9')))
- return (1);
+ struct ConfItem* c_conf = NULL;
+ struct SLink* lp;
- return (0);
-}
+ Debug((DEBUG_DNS, "sv_cl: check access for %s[%s]",
+ cli_name(cptr), cli_sockhost(cptr)));
-/*
- * check against a set of time intervals
- */
-static int check_time_interval(char *interval, char *reply)
-{
- struct tm *tptr;
- char *p;
- int perm_min_hours, perm_min_minutes, perm_max_hours, perm_max_minutes;
- int nowm, perm_min, perm_max;
+ if (IsUnknown(cptr) && !attach_confs_byname(cptr, cli_name(cptr), CONF_SERVER)) {
+ Debug((DEBUG_DNS, "No C/N lines for %s", cli_sockhost(cptr)));
+ return -1;
+ }
+ lp = cli_confs(cptr);
+ /*
+ * We initiated this connection so the client should have a C and N
+ * line already attached after passing through the connect_server()
+ * function earlier.
+ */
+ if (IsConnecting(cptr) || IsHandshake(cptr)) {
+ c_conf = find_conf_byname(lp, cli_name(cptr), CONF_SERVER);
+ if (!c_conf) {
+ sendto_opmask_butone(0, SNO_OLDSNO, "Connect Error: lost C:line for %s",
+ cli_name(cptr));
+ det_confs_butmask(cptr, 0);
+ return -1;
+ }
+ }
- tptr = localtime(&now);
- nowm = tptr->tm_hour * 60 + tptr->tm_min;
+ ClearAccess(cptr);
- while (interval)
- {
- p = strchr(interval, ',');
- if (p)
- *p = '\0';
- if (sscanf(interval, "%2d%2d-%2d%2d", &perm_min_hours, &perm_min_minutes,
- &perm_max_hours, &perm_max_minutes) != 4)
- {
- if (p)
- *p = ',';
- return (0);
- }
- if (p)
- *(p++) = ',';
- perm_min = 60 * perm_min_hours + perm_min_minutes;
- perm_max = 60 * perm_max_hours + perm_max_minutes;
- /*
- * The following check allows intervals over midnight ...
- */
- if ((perm_min < perm_max)
- ? (perm_min <= nowm && nowm <= perm_max)
- : (perm_min <= nowm || nowm <= perm_max))
- {
- printf(reply,
- ":%%s %%d %%s :%s %d:%02d to %d:%02d.",
- "You are not allowed to connect from",
- perm_min_hours, perm_min_minutes, perm_max_hours, perm_max_minutes);
- return (ERR_YOUREBANNEDCREEP);
+ if (!c_conf) {
+ if (cli_dns_reply(cptr)) {
+ int i;
+ struct hostent* hp = cli_dns_reply(cptr);
+ const char* name = hp->h_name;
+ /*
+ * If we are missing a C or N line from above, search for
+ * it under all known hostnames we have for this ip#.
+ */
+ for (i = 0; name; name = hp->h_aliases[i++]) {
+ if ((c_conf = find_conf_byhost(lp, name, CONF_SERVER))) {
+ ircd_strncpy(cli_sockhost(cptr), name, HOSTLEN);
+ break;
+ }
+ }
+ if (!c_conf) {
+ for (i = 0; hp->h_addr_list[i]; i++) {
+ if ((c_conf = find_conf_byip(lp, hp->h_addr_list[i], CONF_SERVER)))
+ break;
+ }
+ }
}
- if ((perm_min < perm_max)
- ? (perm_min <= nowm + 5 && nowm + 5 <= perm_max)
- : (perm_min <= nowm + 5 || nowm + 5 <= perm_max))
- {
- sprintf_irc(reply, ":%%s %%d %%s :%d minute%s%s",
- perm_min - nowm, (perm_min - nowm) > 1 ? "s " : " ",
- "and you will be denied for further access");
- return (ERR_YOUWILLBEBANNED);
+ else {
+ /*
+ * Check for C lines with the hostname portion the ip number
+ * of the host the server runs on. This also checks the case where
+ * there is a server connecting from 'localhost'.
+ */
+ c_conf = find_conf_byhost(lp, cli_sockhost(cptr), CONF_SERVER);
}
- interval = p;
}
- return (0);
-}
+ /*
+ * Attach by IP# only if all other checks have failed.
+ * It is quite possible to get here with the strange things that can
+ * happen when using DNS in the way the irc server does. -avalon
+ */
+ if (!c_conf)
+ c_conf = find_conf_byip(lp, (const char*) &(cli_ip(cptr)), CONF_SERVER);
+ /*
+ * detach all conf lines that got attached by attach_confs()
+ */
+ det_confs_butmask(cptr, 0);
+ /*
+ * if no C or no N lines, then deny access
+ */
+ if (!c_conf) {
+ Debug((DEBUG_DNS, "sv_cl: access denied: %s[%s@%s]",
+ cli_name(cptr), cli_username(cptr), cli_sockhost(cptr)));
+ return -1;
+ }
+ ircd_strncpy(cli_name(cptr), c_conf->name, HOSTLEN);
+ /*
+ * attach the C and N lines to the client structure for later use.
+ */
+ attach_conf(cptr, c_conf);
+ attach_confs_byname(cptr, cli_name(cptr), CONF_HUB | CONF_LEAF | CONF_UWORLD);
-aMotdItem *read_motd(char *motdfile)
-{
- FBFILE *file = NULL;
- register aMotdItem *temp, *newmotd, *last;
- struct stat sb;
- char line[80];
- register char *tmp;
+ if (INADDR_NONE == c_conf->ipnum.s_addr)
+ c_conf->ipnum.s_addr = cli_ip(cptr).s_addr;
- if (NULL == (file = fbopen(motdfile, "r")))
- {
- Debug((DEBUG_ERROR, "Couldn't open \"%s\": %s", motdfile, strerror(errno)));
- return NULL;
- }
- if (-1 == fbstat(&sb, file))
- {
- return NULL;
- }
- newmotd = last = NULL;
- motd_tm = *localtime((time_t *) & sb.st_mtime); /* NetBSD needs cast */
- while (fbgets(line, sizeof(line) - 1, file))
- {
- if ((tmp = (char *)strchr(line, '\n')))
- *tmp = '\0';
- if ((tmp = (char *)strchr(line, '\r')))
- *tmp = '\0';
- temp = (aMotdItem *) RunMalloc(sizeof(aMotdItem));
- if (!temp)
- outofmemory();
- strcpy(temp->line, line);
- temp->next = NULL;
- if (!newmotd)
- newmotd = temp;
- else
- last->next = temp;
- last = temp;
- }
- fbclose(file);
- return newmotd;
+ Debug((DEBUG_DNS, "sv_cl: access ok: %s[%s]",
+ cli_name(cptr), cli_sockhost(cptr)));
+ return 0;
}
+
projects / ircu2.10.12-pk.git / blobdiff