Changeset 427:3d9f300f3b49 in freeDiameter for extensions/app_sip/multimediaauth.c

Timestamp:

Jul 26, 2010, 9:39:27 PM (14 years ago)

Author:

Alexandre Westfahl <awestfahl@freediameter.net>

Branch:

default

Phase:

public

Message:

Added SAR/SAA and UAR/UAA

File:

• extensions/app_sip/multimediaauth.c (modified) (8 diffs)

extensions/app_sip/multimediaauth.c

@@ -48 +48 @@
         char * result;
         char password[51];
-        int idx=0, number_of_auth_items=0,i=0;
+        int idx=0, number_of_auth_items=0,i=0, ret=0;
         //Flags and variables for Database
         int sipurinotstored=0, authenticationpending=0, querylen=0, usernamelen=0;
@@ -122 +122 @@
                         CHECK_FCT( fd_msg_avp_hdr( avp, &avphdr )  );
                         
-                        //We allocate the double size of username because at worst it can be all quotes
-                        username=malloc(avphdr->avp_value->os.len*2+1);
-                        //We purify username not to have forbidden characters
-                        usernamelen=mysql_real_escape_string(conn, username, (const char *)avphdr->avp_value->os.data, avphdr->avp_value->os.len);
+                        
                         
                         
@@ -132 +129 @@
                                 not_found=1;
                                 
-                                //We copy username in query
-                                querylen=SQL_GETPASSWORD_LEN + usernamelen;
-                                query = malloc(querylen+2);
-                                snprintf(query, querylen+1, SQL_GETPASSWORD, username);
-                                
-                                
-                                
-                                //We make the query     
-                                request_mysql(query);
-                                res=mysql_use_result(conn);
-                                if(res==NULL)
+                                //TODO TODO TODO TODO TODO TODO TODO: maybe doesn't work!!'
+                                ret=get_password(avphdr->avp_value->os.data, avphdr->avp_value->os.len, (char *)&password);
+                                
+                                if(ret>1)
                                 {
                                         //We couldn't make the request
@@ -148 +138 @@
                                         goto out;
                                 }
-                        
-                        
-                        
-                                while ((row = mysql_fetch_row(res)) != NULL)
-                                {
-                                        if(strlen(row[0])>0)
-                                        {
-                                                strcpy(password,row[0]);
-                                                not_found=0;
-                                                break;
-                                        }
-                                }
-                                mysql_free_result(res);
-                                free(query);
-                                
-                                if(not_found)
+                                not_found=ret;
+                                
+                                if(not_found)
                                 {
                                         TRACE_DEBUG(FULL,"The user %s doesn't exist!",username);
@@ -172 +149 @@
                         
                         
-                        
+                                //We allocate the double size of username because at worst it can be all quotes
+                                username=malloc(avphdr->avp_value->os.len*2+1);
+                                //We purify username not to have forbidden characters
+                                usernamelen=mysql_real_escape_string(conn, username, (const char *)avphdr->avp_value->os.data, avphdr->avp_value->os.len);
+                                
                                 //Now that we know the user exist, we get the list of AOR owned by this user
                                 querylen=SQL_GETSIPAOR_LEN + usernamelen;
@@ -194 +175 @@
                                 not_found=1;
                                 while ((row = mysql_fetch_row(res)) != NULL)
-                                {
-                                        if(strncmp((const char *)avphdr->avp_value->os.data,row[0],avphdr->avp_value->os.len)==0)
-                                        {
-                                                not_found=0;
-                                                break;
-                                        }
-                                }
-                                mysql_free_result(res);
-                                free(query);
+                                {
+                                        if(strncmp((const char *)avphdr->avp_value->os.data,row[0],avphdr->avp_value->os.len)==0)
+                                        {
+                                                not_found=0;
+                                                break;
+                                        }
+                                }
+                                mysql_free_result(res);
+                                free(query);
                                 
-                                if(not_found)
+                                if(not_found)
                                 {
                                         TRACE_DEBUG(FULL,"The user %s can't use this SIP-AOR!",username);
@@ -244 +225 @@
                                 not_found=1;
                                 while ((row = mysql_fetch_row(res)) != NULL)
-                                {
-                                        if(strncmp((const char *)avphdr->avp_value->os.data,row[0],avphdr->avp_value->os.len)==0)
-                                        {
-                                                not_found=0;
-                                                break;
-                                        }
-                                }
-                                mysql_free_result(res);
-                                free(query);
-
-                                if(not_found)
-                                {
-                                        //We update the SIP_URI for the user and we flag "authentication in progress"
-                                        querylen=SQL_SETSIPURI_LEN + usernamelen + sipurilen;
-                                        query = malloc(querylen+2);
-                                        snprintf(query, querylen+1, SQL_SETSIPURI, sipuri, username);
-                        
-                                        //We make the query
-                                        request_mysql(query);
+                                {
+                                        if(strncmp((const char *)avphdr->avp_value->os.data,row[0],avphdr->avp_value->os.len)==0)
+                                        {
+                                                not_found=0;
+                                                break;
+                                        }
+                                }
+                                mysql_free_result(res);
+                                free(query);
+
+                                if(not_found)
+                                {
+                                        //Temporary
+                                        set_sipserver_uri(username, usernamelen, sipuri,sipurilen);
                                         
-                                        free(query);
-                                        authenticationpending=1;
-                                }
-                                free(sipuri);
+                                        
+                                        set_pending_flag(username, usernamelen);
+                                        
+                                        
+                                        authenticationpending=1;
+                                }
+                                free(sipuri);
                                 
                         }
@@ -715 +694 @@
                                                                 if(username!=NULL && authenticationpending)
                                                                 {
-                                                                        //We clear the flag "authentication pending"
-                                                                        querylen=SQL_CLEARFLAG_LEN + usernamelen;
-                                                                        query = malloc(querylen+2);
-                                                                        snprintf(query, querylen+1, SQL_CLEARFLAG, username);
-                
-                                                                        //We make the query
-                                                                        request_mysql(query);
-                                
-                                                                        free(query);
+                                                                        //We clear the pending flag
+                                                                        clear_pending_flag(username, usernamelen);
                                                                 }