Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ircd/listener: return a fatal TLS alert for early rejected TLS clients #412

Merged
merged 1 commit into from
Nov 7, 2023
+47 −20
Merged

ircd/listener: return a fatal TLS alert for early rejected TLS clients #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/reject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define DELAYED_EXIT_TIME 10

void init_reject(void);
int check_reject(rb_fde_t *F, struct sockaddr *addr);
int check_reject(rb_fde_t *F, struct sockaddr *addr, bool ssl);
void add_reject(struct Client *, const char *mask1, const char *mask2, struct ConfItem *aconf, const char *reason);
int is_reject_ip(struct sockaddr *addr);
void flush_reject(void);
Expand Down
24 changes: 19 additions & 5 deletions ircd/listener.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,13 +581,19 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
static time_t last_oper_notice = 0;
int len;

static const char *allinuse = "ERROR :All connections in use\r\n";
static const char *toofast = "ERROR :Reconnecting too fast, throttled.\r\n";

static const unsigned char sslerrcode[] = {
static const unsigned char ssldeniederrcode[] = {
// SSLv3.0 Fatal Alert: Access Denied
0x15, 0x03, 0x00, 0x00, 0x02, 0x02, 0x31
};

static const unsigned char sslinternalerrcode[] = {
// SSLv3.0 Fatal Alert: Internal Error
0x15, 0x03, 0x00, 0x00, 0x02, 0x02, 0x50
};

if(listener->ssl && (!ircd_ssl_ok || !get_ssld_count()))
{
rb_close(F);
Expand All @@ -608,7 +614,11 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
last_oper_notice = rb_current_time();
}

rb_write(F, "ERROR :All connections in use\r\n", 31);
if(listener->ssl)
rb_write(F, sslinternalerrcode, sizeof(sslinternalerrcode));
else
rb_write(F, allinuse, strlen(allinuse));

rb_close(F);
return 0;
}
Expand All @@ -625,7 +635,7 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi

if(listener->ssl)
{
rb_write(F, sslerrcode, sizeof(sslerrcode));
rb_write(F, ssldeniederrcode, sizeof(ssldeniederrcode));
}
else if(ConfigFileEntry.dline_with_reason)
{
Expand All @@ -648,15 +658,19 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
return 0;
}

if(check_reject(F, addr)) {
if(check_reject(F, addr, listener->ssl)) {
/* Reject the connection without closing the socket
* because it is now on the delay_exit list. */
return 0;
}

aaronmdjones marked this conversation as resolved.
Show resolved Hide resolved
if(throttle_add(addr))
{
rb_write(F, toofast, strlen(toofast));
if(listener->ssl)
rb_write(F, ssldeniederrcode, sizeof(ssldeniederrcode));
else
rb_write(F, toofast, strlen(toofast));

rb_close(F);
return 0;
}
Expand Down
41 changes: 27 additions & 14 deletions ircd/reject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ typedef struct _delay_data
rb_fde_t *F;
struct ConfItem *aconf;
const char *reason;
bool ssl;
} delay_t;

typedef struct _throttle
Expand Down Expand Up @@ -92,28 +93,39 @@ reject_exit(void *unused)
delay_t *ddata;
static const char *errbuf = "ERROR :Closing Link: (*** Banned (cache))\r\n";

static const unsigned char ssldeniederrcode[] = {
// SSLv3.0 Fatal Alert: Access Denied
0x15, 0x03, 0x00, 0x00, 0x02, 0x02, 0x31
};

RB_DLINK_FOREACH_SAFE(ptr, ptr_next, delay_exit.head)
{
ddata = ptr->data;

*dynamic_reason = '\0';

if (ddata->aconf)
if (ddata->ssl)
{
snprintf(dynamic_reason, sizeof dynamic_reason, form_str(ERR_YOUREBANNEDCREEP) "\r\n",
me.name, "*", get_user_ban_reason(ddata->aconf));
rb_write(ddata->F, dynamic_reason, strlen(dynamic_reason));

deref_conf(ddata->aconf);
rb_write(ddata->F, ssldeniederrcode, sizeof(ssldeniederrcode));
dwfreed marked this conversation as resolved.
Show resolved Hide resolved
}
else if (ddata->reason)
else
{
snprintf(dynamic_reason, sizeof dynamic_reason, ":%s 465 %s :%s\r\n",
me.name, "*", ddata->reason);
rb_write(ddata->F, dynamic_reason, strlen(dynamic_reason));
*dynamic_reason = '\0';

if (ddata->aconf)
snprintf(dynamic_reason, sizeof dynamic_reason, form_str(ERR_YOUREBANNEDCREEP) "\r\n",
me.name, "*", get_user_ban_reason(ddata->aconf));
else if (ddata->reason)
snprintf(dynamic_reason, sizeof dynamic_reason, ":%s 465 %s :%s\r\n",
me.name, "*", ddata->reason);

if (*dynamic_reason)
rb_write(ddata->F, dynamic_reason, strlen(dynamic_reason));

rb_write(ddata->F, errbuf, strlen(errbuf));
}

rb_write(ddata->F, errbuf, strlen(errbuf));
if (ddata->aconf)
deref_conf(ddata->aconf);

rb_close(ddata->F);
rb_free(ddata);
}
Expand Down Expand Up @@ -228,7 +240,7 @@ add_reject(struct Client *client_p, const char *mask1, const char *mask2, struct
}

int
check_reject(rb_fde_t *F, struct sockaddr *addr)
check_reject(rb_fde_t *F, struct sockaddr *addr, bool ssl)
{
rb_patricia_node_t *pnode;
reject_t *rdata;
Expand Down Expand Up @@ -276,6 +288,7 @@ check_reject(rb_fde_t *F, struct sockaddr *addr)
ddata->reason = NULL;
}
ddata->F = F;
ddata->ssl = ssl;
rb_dlinkAdd(ddata, &ddata->node, &delay_exit);
return 1;
}
Expand Down
Loading