kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 07:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ugly code to try to remove issue discovered by Luigi as well as attack bug #7608

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2006-10-25 19:30:04 +00:00
parent 9617866005
commit cef98c1e87
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
channels/chan_sip.c
View File

@@ -8075,7 +8075,8 @@ static int cb_extensionstate(char *context, char* exten, int state, void *data)
p->laststate = state; p->laststate = state;
break; break;
} }
transmit_state_notify(p, state, 1); if (p->subscribed != NONE) /* Only send state NOTIFY if we know the format */
transmit_state_notify(p, state, 1);
if (option_verbose > 1) if (option_verbose > 1)
ast_verbose(VERBOSE_PREFIX_1 "Extension Changed %s new state %s for Notify User %s\n", exten, ast_extension_state2str(state), p->username); ast_verbose(VERBOSE_PREFIX_1 "Extension Changed %s new state %s for Notify User %s\n", exten, ast_extension_state2str(state), p->username);
@@ -14066,9 +14067,10 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
int res = 0; int res = 0;
int firststate = AST_EXTENSION_REMOVED; int firststate = AST_EXTENSION_REMOVED;
struct sip_peer *authpeer = NULL; struct sip_peer *authpeer = NULL;
const char *event = get_header(req, "Event"); /* Get Event package name */ const char *eventheader = get_header(req, "Event"); /* Get Event package name */
const char *accept = get_header(req, "Accept"); const char *accept = get_header(req, "Accept");
int resubscribe = (p->subscribed != NONE); int resubscribe = (p->subscribed != NONE);
char *temp, *event;
if (p->initreq.headers) { if (p->initreq.headers) {
/* We already have a dialog */ /* We already have a dialog */
@@ -14099,22 +14101,34 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
return 0; return 0;
} }
if (!ast_test_flag(req, SIP_PKT_IGNORE) && !p->initreq.headers) { /* Set up dialog, new subscription */ if (!ast_test_flag(req, SIP_PKT_IGNORE) && !resubscribe) { /* Set up dialog, new subscription */
/* Use this as the basis */ /* Use this as the basis */
if (ast_test_flag(req, SIP_PKT_DEBUG)) if (ast_test_flag(req, SIP_PKT_DEBUG))
ast_verbose("Creating new subscription\n"); ast_verbose("Creating new subscription\n");
/* This call is no longer outgoing if it ever was */
ast_clear_flag(&p->flags[0], SIP_OUTGOING);
copy_request(&p->initreq, req); copy_request(&p->initreq, req);
check_via(p, req); check_via(p, req);
} else if (ast_test_flag(req, SIP_PKT_DEBUG) && ast_test_flag(req, SIP_PKT_IGNORE)) } else if (ast_test_flag(req, SIP_PKT_DEBUG) && ast_test_flag(req, SIP_PKT_IGNORE))
ast_verbose("Ignoring this SUBSCRIBE request\n"); ast_verbose("Ignoring this SUBSCRIBE request\n");
/* Find parameters to Event: header value and remove them for now */ /* Find parameters to Event: header value and remove them for now */
event = strsep((char **)&event, ";"); /* XXX bug here, overwrite string */ if (ast_strlen_zero(eventheader)) {
transmit_response(p, "489 Bad Event", req);
if (option_debug > 1)
ast_log(LOG_DEBUG, "Received SIP subscribe for unknown event package: <none>\n");
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
return 0;
}
/* Handle authentication if this is our first subscribe */ if ( (strchr(eventheader, ';'))) {
event = ast_strdupa(eventheader); /* Since eventheader is a const, we can't change it */
temp = strchr(event, ';');
*temp = '\0'; /* Remove any options for now */
/* We might need to use them later :-) */
} else
event = (char *) eventheader; /* XXX is this legal ? */
/* Handle authentication */
res = check_user_full(p, req, SIP_SUBSCRIBE, e, 0, sin, &authpeer); res = check_user_full(p, req, SIP_SUBSCRIBE, e, 0, sin, &authpeer);
/* if an authentication response was sent, we are done here */ /* if an authentication response was sent, we are done here */
if (res == AUTH_CHALLENGE_SENT) if (res == AUTH_CHALLENGE_SENT)