/* Goinked from old s_auth.c --Elizafox */
static const char *messages[] =
{
- ":*** Checking Ident",
- ":*** Got Ident response",
- ":*** No Ident response",
+ "*** Checking Ident",
+ "*** Got Ident response",
+ "*** No Ident response",
+ "*** Cannot verify ident validity, ignoring ident",
+ "*** Ident disabled, not checking ident",
};
typedef enum
REPORT_LOOKUP,
REPORT_FOUND,
REPORT_FAIL,
+ REPORT_INVALID,
+ REPORT_DISABLED,
} ident_message;
static EVH timeout_ident_queries_event;
static struct ev_entry *timeout_ev;
static int ident_timeout = 5;
+static bool ident_enable = true;
/* Timeout outstanding queries */
static void
-timeout_ident_queries_event(void *notused)
+timeout_ident_queries_event(void *notused __unused)
{
struct auth_client *auth;
rb_dictionary_iter iter;
* problems arise. -avalon
*/
static void
-ident_connected(rb_fde_t *F, int error, void *data)
+ident_connected(rb_fde_t *F __unused, int error, void *data)
{
struct auth_client *auth = data;
- struct ident_query *query = auth->data[PROVIDER_IDENT];
+ struct ident_query *query;
char authbuf[32];
int authlen;
+ if(auth == NULL)
+ return;
+
+ query = auth->data[PROVIDER_IDENT];
+
+ if(query == NULL)
+ return;
+
/* Check the error */
if(error != RB_OK)
{
read_ident_reply(rb_fde_t *F, void *data)
{
struct auth_client *auth = data;
- struct ident_query *query = auth->data[PROVIDER_IDENT];
+ struct ident_query *query;
+ char buf[IDENT_BUFSIZE + 1]; /* buffer to read auth reply into */
+ ident_message message = REPORT_FAIL;
char *s = NULL;
char *t = NULL;
- int len;
+ ssize_t len;
int count;
- char buf[IDENT_BUFSIZE + 1]; /* buffer to read auth reply into */
+
+ if(auth == NULL)
+ return;
+
+ query = auth->data[PROVIDER_IDENT];
+
+ if(query == NULL)
+ return;
len = rb_read(F, buf, IDENT_BUFSIZE);
if(len < 0 && rb_ignore_errno(errno))
{
- rb_setselect(F, RB_SELECT_READ, read_ident_reply, query);
+ rb_setselect(F, RB_SELECT_READ, read_ident_reply, auth);
return;
}
if(len > 0)
{
- buf[len] = '\0';
-
- if((s = get_valid_ident(buf)))
+ if((s = get_valid_ident(buf)) != NULL)
{
t = auth->username;
for (count = USERLEN; *s && count; s++)
{
- if(*s == '@')
- {
+ if(*s == '@' || *s == '\r' || *s == '\n')
break;
- }
+
if(*s != ' ' && *s != ':' && *s != '[')
{
*t++ = *s;
}
*t = '\0';
}
+ else
+ message = REPORT_INVALID;
}
if(s == NULL)
- client_fail(auth, REPORT_FAIL);
+ client_fail(auth, message);
else
client_success(auth);
}
{
struct ident_query *query = auth->data[PROVIDER_IDENT];
+ if(query == NULL)
+ return;
+
rb_strlcpy(auth->username, "*", sizeof(auth->username));
- rb_close(query->F);
+ if(query->F != NULL)
+ rb_close(query->F);
+
rb_free(query);
auth->data[PROVIDER_IDENT] = NULL;
{
struct ident_query *query = auth->data[PROVIDER_IDENT];
- rb_close(query->F);
+ if(query == NULL)
+ return;
+
+ if(query->F != NULL)
+ rb_close(query->F);
+
rb_free(query);
auth->data[PROVIDER_IDENT] = NULL;
colon1Ptr = strchr(remotePortString, ':');
if(!colon1Ptr)
- return 0;
+ return NULL;
*colon1Ptr = '\0';
colon1Ptr++;
colon2Ptr = strchr(colon1Ptr, ':');
if(!colon2Ptr)
- return 0;
+ return NULL;
*colon2Ptr = '\0';
colon2Ptr++;
commaPtr = strchr(remotePortString, ',');
if(!commaPtr)
- return 0;
+ return NULL;
*commaPtr = '\0';
commaPtr++;
remp = atoi(remotePortString);
if(!remp)
- return 0;
+ return NULL;
locp = atoi(commaPtr);
if(!locp)
- return 0;
+ return NULL;
/* look for USERID bordered by first pair of colons */
if(!strstr(colon1Ptr, "USERID"))
- return 0;
+ return NULL;
colon3Ptr = strchr(colon2Ptr, ':');
if(!colon3Ptr)
- return 0;
+ return NULL;
*colon3Ptr = '\0';
colon3Ptr++;
{
struct ident_query *query = rb_malloc(sizeof(struct ident_query));
struct rb_sockaddr_storage l_addr, c_addr;
- int family;
- rb_fde_t *F;
+ int family = GET_SS_FAMILY(&auth->c_addr);
+
+ if(auth->data[PROVIDER_IDENT] != NULL)
+ {
+ set_provider_done(auth, PROVIDER_IDENT); /* for blacklists */
+ return true;
+ }
+ else if(!ident_enable)
+ {
+ notice_client(auth->cid, messages[REPORT_DISABLED]);
+ set_provider_done(auth, PROVIDER_IDENT);
+ return true;
+ }
+
+ notice_client(auth->cid, messages[REPORT_LOOKUP]);
auth->data[PROVIDER_IDENT] = query;
query->timeout = rb_current_time() + ident_timeout;
- if((F = rb_socket(family, SOCK_STREAM, 0, "ident")) == NULL)
+ if((query->F = rb_socket(family, SOCK_STREAM, 0, "ident")) == NULL)
{
+ warn_opers(L_DEBUG, "Could not create ident socket: %s", strerror(errno));
client_fail(auth, REPORT_FAIL);
return true; /* Not a fatal error */
}
- query->F = F;
-
/* Build sockaddr_storages for rb_connect_tcp below */
memcpy(&l_addr, &auth->l_addr, sizeof(l_addr));
memcpy(&c_addr, &auth->c_addr, sizeof(c_addr));
#endif
((struct sockaddr_in *)&c_addr)->sin_port = htons(113);
- rb_connect_tcp(F, (struct sockaddr *)&c_addr,
+ rb_connect_tcp(query->F, (struct sockaddr *)&c_addr,
(struct sockaddr *)&l_addr,
GET_SS_LEN(&l_addr), ident_connected,
- query, ident_timeout);
+ auth, ident_timeout);
- notice_client(auth->cid, messages[REPORT_LOOKUP]);
set_provider_on(auth, PROVIDER_IDENT);
return true;
}
static void
-add_conf_ident_timeout(const char *key, int parc, const char **parv)
+add_conf_ident_timeout(const char *key __unused, int parc __unused, const char **parv)
{
int timeout = atoi(parv[0]);
ident_timeout = timeout;
}
+static void
+set_ident_enabled(const char *key __unused, int parc __unused, const char **parv)
+{
+ ident_enable = (*parv[0] == '1');
+}
+
struct auth_opts_handler ident_options[] =
{
{ "ident_timeout", 1, add_conf_ident_timeout },
+ { "ident_enabled", 1, set_ident_enabled },
{ NULL, 0, NULL },
};