9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

m_sasl: move some struct members around for sasl-reauth

Browse source
This commit is contained in:
William Pitcock 2015-02-16 15:39:36 -06:00
parent 3a48406b55
commit c6bc97fdcd
2 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/client.h
View file

@ -283,6 +283,10 @@ struct LocalUser
struct ev_entry *event; /* used for associated events */ struct ev_entry *event; /* used for associated events */
struct PrivilegeSet *privset; /* privset... */ struct PrivilegeSet *privset; /* privset... */
char sasl_agent[IDLEN];
unsigned char sasl_out;
unsigned char sasl_complete;
}; };
struct PreClient struct PreClient
@ -291,10 +295,6 @@ struct PreClient
char spoofuser[USERLEN + 1]; char spoofuser[USERLEN + 1];
char spoofhost[HOSTLEN + 1]; char spoofhost[HOSTLEN + 1];
char sasl_agent[IDLEN];
unsigned char sasl_out;
unsigned char sasl_complete;
rb_dlink_list dnsbl_queries; /* list of struct BlacklistClient * */ rb_dlink_list dnsbl_queries; /* list of struct BlacklistClient * */
struct Blacklist *dnsbl_listed; /* first dnsbl where it's listed */ struct Blacklist *dnsbl_listed; /* first dnsbl where it's listed */

34
modules/m_sasl.c
View file

@ -99,12 +99,18 @@ m_authenticate(struct Client *client_p, struct Client *source_p,
return 0; return 0;
} }
if(source_p->preClient->sasl_complete) if(source_p->localClient->sasl_complete)
{
if (!IsCapable(source_p, CLICAP_SASL_REAUTH))
{ {
sendto_one(source_p, form_str(ERR_SASLALREADY), me.name, EmptyString(source_p->name) ? "*" : source_p->name); sendto_one(source_p, form_str(ERR_SASLALREADY), me.name, EmptyString(source_p->name) ? "*" : source_p->name);
return 0; return 0;
} }
/* we're doing a reauth. */
source_p->localClient->sasl_complete = 0;
}
if(strlen(parv[1]) > 400) if(strlen(parv[1]) > 400)
{ {
sendto_one(source_p, form_str(ERR_SASLTOOLONG), me.name, EmptyString(source_p->name) ? "*" : source_p->name); sendto_one(source_p, form_str(ERR_SASLTOOLONG), me.name, EmptyString(source_p->name) ? "*" : source_p->name);
@ -118,8 +124,8 @@ m_authenticate(struct Client *client_p, struct Client *source_p,
add_to_id_hash(source_p->id, source_p); add_to_id_hash(source_p->id, source_p);
} }
if(*source_p->preClient->sasl_agent) if(*source_p->localClient->sasl_agent)
agent_p = find_id(source_p->preClient->sasl_agent); agent_p = find_id(source_p->localClient->sasl_agent);
if(agent_p == NULL) if(agent_p == NULL)
{ {
@ -132,13 +138,13 @@ m_authenticate(struct Client *client_p, struct Client *source_p,
source_p->id, saslserv_p->id, source_p->id, saslserv_p->id,
parv[1]); parv[1]);
rb_strlcpy(source_p->preClient->sasl_agent, saslserv_p->id, IDLEN); rb_strlcpy(source_p->localClient->sasl_agent, saslserv_p->id, IDLEN);
} }
else else
sendto_one(agent_p, ":%s ENCAP %s SASL %s %s C %s", me.id, agent_p->servptr->name, sendto_one(agent_p, ":%s ENCAP %s SASL %s %s C %s", me.id, agent_p->servptr->name,
source_p->id, agent_p->id, source_p->id, agent_p->id,
parv[1]); parv[1]);
source_p->preClient->sasl_out++; source_p->localClient->sasl_out++;
return 0; return 0;
} }
@ -174,10 +180,10 @@ me_sasl(struct Client *client_p, struct Client *source_p,
return 0; return 0;
/* Reject if someone has already answered. */ /* Reject if someone has already answered. */
if(*target_p->preClient->sasl_agent && strncmp(parv[1], target_p->preClient->sasl_agent, IDLEN)) if(*target_p->localClient->sasl_agent && strncmp(parv[1], target_p->localClient->sasl_agent, IDLEN))
return 0; return 0;
else if(!*target_p->preClient->sasl_agent) else if(!*target_p->localClient->sasl_agent)
rb_strlcpy(target_p->preClient->sasl_agent, parv[1], IDLEN); rb_strlcpy(target_p->localClient->sasl_agent, parv[1], IDLEN);
if(*parv[3] == 'C') if(*parv[3] == 'C')
sendto_one(target_p, "AUTHENTICATE %s", parv[4]); sendto_one(target_p, "AUTHENTICATE %s", parv[4]);
@ -187,10 +193,10 @@ me_sasl(struct Client *client_p, struct Client *source_p,
sendto_one(target_p, form_str(ERR_SASLFAIL), me.name, EmptyString(target_p->name) ? "*" : target_p->name); sendto_one(target_p, form_str(ERR_SASLFAIL), me.name, EmptyString(target_p->name) ? "*" : target_p->name);
else if(*parv[4] == 'S') { else if(*parv[4] == 'S') {
sendto_one(target_p, form_str(RPL_SASLSUCCESS), me.name, EmptyString(target_p->name) ? "*" : target_p->name); sendto_one(target_p, form_str(RPL_SASLSUCCESS), me.name, EmptyString(target_p->name) ? "*" : target_p->name);
target_p->preClient->sasl_complete = 1; target_p->localClient->sasl_complete = 1;
ServerStats.is_ssuc++; ServerStats.is_ssuc++;
} }
*target_p->preClient->sasl_agent = '\0'; /* Blank the stored agent so someone else can answer */ *target_p->localClient->sasl_agent = '\0'; /* Blank the stored agent so someone else can answer */
} }
else if(*parv[3] == 'M') else if(*parv[3] == 'M')
sendto_one(target_p, form_str(RPL_SASLMECHS), me.name, EmptyString(target_p->name) ? "*" : target_p->name, parv[4]); sendto_one(target_p, form_str(RPL_SASLMECHS), me.name, EmptyString(target_p->name) ? "*" : target_p->name, parv[4]);
@ -204,18 +210,18 @@ me_sasl(struct Client *client_p, struct Client *source_p,
static void static void
abort_sasl(struct Client *data) abort_sasl(struct Client *data)
{ {
if(data->preClient->sasl_out == 0 || data->preClient->sasl_complete) if(data->localClient->sasl_out == 0 || data->localClient->sasl_complete)
return; return;
data->preClient->sasl_out = data->preClient->sasl_complete = 0; data->localClient->sasl_out = data->localClient->sasl_complete = 0;
ServerStats.is_sbad++; ServerStats.is_sbad++;
if(!IsClosing(data)) if(!IsClosing(data))
sendto_one(data, form_str(ERR_SASLABORTED), me.name, EmptyString(data->name) ? "*" : data->name); sendto_one(data, form_str(ERR_SASLABORTED), me.name, EmptyString(data->name) ? "*" : data->name);
if(*data->preClient->sasl_agent) if(*data->localClient->sasl_agent)
{ {
struct Client *agent_p = find_id(data->preClient->sasl_agent); struct Client *agent_p = find_id(data->localClient->sasl_agent);
if(agent_p) if(agent_p)
{ {
sendto_one(agent_p, ":%s ENCAP %s SASL %s %s D A", me.id, agent_p->servptr->name, sendto_one(agent_p, ":%s ENCAP %s SASL %s %s D A", me.id, agent_p->servptr->name,