/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2019 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2024 Alexander Barton (alex@barton.de) and Contributors.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/* not using systemd socket activation, initialize listening sockets: */
+#ifdef SSL_SUPPORT
+ if (!Conf_SSLOptions.KeyFile &&
+ array_length(&Conf_SSLOptions.ListenPorts, sizeof (UINT16))) {
+ Log(LOG_ERR,
+ "Ignoring SSL-enabled listening ports: No key file set!");
+ array_free(&Conf_SSLOptions.ListenPorts);
+ }
+#endif
+
/* can't use Conf_ListenAddress directly, see below */
copy = strdup(Conf_ListenAddress);
if (!copy) {
/**
* Set a socket to "IPv6 only". If the given socket doesn't belong to the
* AF_INET6 family, or the operating system doesn't support this functionality,
- * this function retruns silently.
+ * this function returns silently.
*
* @param af Address family of the socket.
* @param sock Socket handle.
* the result is a valid IRC message (oversized messages are shortened, for
* example). Then it calls the Conn_Write() function to do the actual sending.
*
- * @param Idx Index fo the connection.
+ * @param Idx Index of the connection.
* @param Format Format string, see printf().
* @returns true on success, false otherwise.
*/
}
#endif
/* Send ERROR to client (see RFC 2812, section 3.1.7) */
- if (FwdMsg)
- Conn_WriteStr(Idx, "ERROR :%s", FwdMsg);
+ if (c)
+ Conn_WriteStr(Idx, "ERROR :Closing connection: %s[%s@%s] (%s)",
+ Client_ID(c), Client_User(c), Client_Hostname(c),
+ FwdMsg ? FwdMsg : "\"\"");
else
Conn_WriteStr(Idx, "ERROR :Closing connection");
}
} /* Conn_CountMax */
/**
- * Get number of connections accepted since the daemon startet.
+ * Get number of connections accepted since the daemon started.
*
* @returns Number of connections accepted.
*/
if (errno == EAGAIN || errno == EINTR)
return true;
- /* Log write errors but do not close the connection yet.
- * Calling Conn_Close() now could result in too many recursive calls.
- */
- if (!Conn_OPTION_ISSET(&My_Connections[Idx], CONN_ISCLOSING))
+ if (!Conn_OPTION_ISSET(&My_Connections[Idx], CONN_ISCLOSING)) {
Log(LOG_ERR,
"Write error on connection %d (socket %d): %s!",
Idx, My_Connections[Idx].sock, strerror(errno));
- else
+ Conn_Close(Idx, "Write error", NULL, false);
+ } else
LogDebug("Recursive write error on connection %d (socket %d): %s!",
Idx, My_Connections[Idx].sock, strerror(errno));
new_sock = accept(Sock, (struct sockaddr *)&new_addr,
(socklen_t *)&new_sock_len);
if (new_sock < 0) {
- Log(LOG_CRIT, "Can't accept connection: %s!", strerror(errno));
+ Log(LOG_CRIT, "Can't accept connection on socket %d: %s!",
+ Sock, strerror(errno));
return -1;
}
NumConnectionsAccepted++;
if (!ng_ipaddr_tostr_r(&new_addr, ip_str)) {
- Log(LOG_CRIT, "fd %d: Can't convert IP address!", new_sock);
+ Log(LOG_CRIT, "Can't convert peer IP address of socket %d!", new_sock);
Simple_Message(new_sock, "ERROR :Internal Server Error");
close(new_sock);
return -1;
fromhost(&req);
if (!hosts_access(&req)) {
Log(deny_severity,
- "Refused connection from %s (by TCP Wrappers)!", ip_str);
+ "Refused connection from %s on socket %d (by TCP Wrappers)!",
+ ip_str, Sock);
Simple_Message(new_sock, "ERROR :Connection refused");
close(new_sock);
return -1;
if ((Conf_MaxConnectionsIP > 0) && (cnt >= Conf_MaxConnectionsIP)) {
/* Access denied, too many connections from this IP address! */
Log(LOG_ERR,
- "Refused connection from %s: too may connections (%ld) from this IP address!",
- ip_str, cnt);
+ "Refused connection from %s on socket %d: too may connections (%ld) from this IP address!",
+ ip_str, Sock, cnt);
Simple_Message(new_sock,
"ERROR :Connection refused, too many connections from your IP address");
close(new_sock);
assert(Idx >= 0);
- /* Nothing to do if DNS (and resolver subprocess) is disabled */
- if (!Conf_DNS)
- return;
-
#ifdef IDENTAUTH
/* Should we make an IDENT request? */
if (Conf_Ident)
if (Conf_NoticeBeforeRegistration) {
/* Send "NOTICE *" messages to the client */
#ifdef IDENTAUTH
- if (Conf_Ident)
- (void)Conn_WriteStr(Idx,
- "NOTICE * :*** Looking up your hostname and checking ident");
- else
+ if (Conf_Ident) {
+ if (Conf_DNS)
+ (void)Conn_WriteStr(Idx,
+ "NOTICE * :*** Looking up your hostname and checking ident");
+ else
+ (void)Conn_WriteStr(Idx,
+ "NOTICE * :*** Checking ident");
+ } else
#endif
+ if(Conf_DNS)
(void)Conn_WriteStr(Idx,
"NOTICE * :*** Looking up your hostname");
+ else
+ (void)Conn_WriteStr(Idx,
+ "NOTICE * :*** Processing your connection");
/* Send buffered data to the client, but break on errors
* because Handle_Write() would have closed the connection
* again in this case! */
return;
}
- Resolve_Addr(&My_Connections[Idx].proc_stat, &My_Connections[Idx].addr,
- ident_sock, cb_Read_Resolver_Result);
+ Resolve_Addr_Ident(&My_Connections[Idx].proc_stat,
+ &My_Connections[Idx].addr,
+ ident_sock, cb_Read_Resolver_Result);
}
/**
* a 1:1 mapping today) and enlarge the "connection pool" accordingly.
*
* @param Sock Socket handle.
- * @returns Connecion index or NONE when the pool is too small.
+ * @returns Connection index or NONE when the pool is too small.
*/
static CONN_ID
Socket2Index( int Sock )
* the resolver results, so we don't have to worry to override settings
* from these commands here. */
if(Client_Type(c) == CLIENT_UNKNOWN) {
- strlcpy(My_Connections[i].host, readbuf,
- sizeof(My_Connections[i].host));
- Client_SetHostname(c, readbuf);
- if (Conf_NoticeBeforeRegistration)
- (void)Conn_WriteStr(i,
+ if (readbuf[0]) {
+ /* We got a hostname */
+ strlcpy(My_Connections[i].host, readbuf,
+ sizeof(My_Connections[i].host));
+ Client_SetHostname(c, readbuf);
+ if (Conf_NoticeBeforeRegistration)
+ (void)Conn_WriteStr(i,
"NOTICE * :*** Found your hostname: %s",
My_Connections[i].host);
+ }
#ifdef IDENTAUTH
++identptr;
if (*identptr) {
/**
* IO callback for new outgoing SSL-enabled server connections.
*
+ * IMPORTANT: The SSL session has been validated before, but all errors have
+ * been ignored so far! The reason for this is that the generic SSL code has no
+ * idea if the new session actually belongs to a server, as this only becomes
+ * clear when the remote peer sends its PASS command (and we have to handle
+ * invalid client certificates!). Therefore, it is important to check the
+ * status of the SSL session first before continuing the server handshake here!
+ *
* @param sock Socket descriptor.
* @param unused (ignored IO specification)
*/
cb_connserver_login_ssl(int sock, short unused)
{
CONN_ID idx = Socket2Index(sock);
+ int serveridx;
(void) unused;
return;
}
+ serveridx = Conf_GetServer(idx);
+ assert(serveridx >= 0);
+ if (serveridx < 0)
+ goto err;
+
Log( LOG_INFO, "SSL connection %d with \"%s:%d\" established.", idx,
My_Connections[idx].host, Conf_Server[Conf_GetServer( idx )].port );
+ if (!Conn_OPTION_ISSET(&My_Connections[idx], CONN_SSL_PEERCERT_OK)) {
+ if (Conf_Server[serveridx].SSLVerify) {
+ Log(LOG_ERR,
+ "SSLVerify enabled for %d, but peer certificate check failed",
+ idx);
+ goto err;
+ }
+ Log(LOG_WARNING,
+ "Peer certificate check failed for %d, but SSLVerify is disabled, continuing",
+ idx);
+ }
server_login(idx);
+ return;
+ err:
+ Log(LOG_ERR, "SSL connection on socket %d failed!", sock);
+ Conn_Close(idx, "Can't connect!", NULL, false);
}
projects / ngircd-alex.git / blobdiff