Clear auth token if fetch fails

Handle unknown and * partner_id in parodus

CMakeLists.txt

@@ -83,7 +83,7 @@ add_dependencies(libtrower-base64 trower-base64)
 ExternalProject_Add(nopoll
     PREFIX ${PREFIX_DIR}/nopoll
     GIT_REPOSITORY https://github.com/Comcast/nopoll.git
-    GIT_TAG "nopoll_yocto"
+    GIT_TAG "18e83e32bfccd1f308b4df0fe0aa3565302903a4"
     CONFIGURE_COMMAND COMMAND <SOURCE_DIR>/autogen.sh --prefix=${PREFIX}
                                                      --includedir=${INCLUDE_DIR}
                                                      --libdir=${LIBRARY_DIR}

src/ParodusInternal.c

@@ -87,6 +87,10 @@ char* getWebpaConveyHeader()
      	ParodusError("Failed to GET Reconnect reason value\n");
     }
 	
+	if(get_parodus_cfg()->boot_retry_wait > 0)
+	{
+	    cJSON_AddNumberToObject(response, BOOT_RETRY_WAIT, get_parodus_cfg()->boot_retry_wait);
+	}
     buffer = cJSON_PrintUnformatted(response);
     ParodusInfo("X-WebPA-Convey Header: [%zd]%s\n", strlen(buffer), buffer);
 

src/config.c

@@ -292,6 +292,7 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
         {"force-ipv4",              no_argument,       0, '4'},
         {"force-ipv6",              no_argument,       0, '6'},
         {"token-read-script",       required_argument, 0, 'T'},
+        {"boot-time-retry-wait",    required_argument, 0, 'w'},
 	{"token-acquisition-script",     required_argument, 0, 'J'},
         {0, 0, 0, 0}
     };
@@ -313,7 +314,7 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
 
       /* getopt_long stores the option index here. */
       int option_index = 0;
-      c = getopt_long (argc, argv, "m:s:f:d:r:n:b:u:t:o:i:l:p:e:D:j:a:k:c:T:J:46",
+      c = getopt_long (argc, argv, "m:s:f:d:r:n:b:u:t:o:i:l:p:e:D:j:a:k:c:T:w:J:46",
 				long_options, &option_index);
 
       /* Detect the end of the options. */
@@ -363,8 +364,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
 
         case 'b':
           cfg->boot_time = parse_num_arg (optarg, "boot-time");
-          if (cfg->boot_time == (unsigned int) -1)
-			return -1;
           ParodusInfo("boot_time is %d\n",cfg->boot_time);
           break;
        
@@ -456,6 +455,11 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
           parStrncpy(cfg->token_read_script, optarg,sizeof(cfg->token_read_script));
           break;
 
+        case 'w':
+          cfg->boot_retry_wait = parse_num_arg (optarg, "boot-time-retry-wait");
+          ParodusInfo("boot_retry_wait is %d\n",cfg->boot_retry_wait);
+          break;
+
         case '?':
           /* getopt_long already printed an error message. */
           break;
@@ -507,6 +511,7 @@ void createNewAuthToken(char *newToken, size_t len)
 {
 	//Call create script
 	char output[12] = {'\0'};
+	memset (newToken, 0, len);
 	execute_token_script(output,get_parodus_cfg()->token_acquisition_script,sizeof(output),get_parodus_cfg()->hw_mac,get_parodus_cfg()->hw_serial_number);
   	if (strlen(output)>0  && strcmp(output,"SUCCESS")==0)
 	{
@@ -528,7 +533,7 @@ void getAuthToken(ParodusCfg *cfg)
 {
 	//local var to update cfg->webpa_auth_token only in success case
 	char output[4069] = {'\0'} ;
-	
+	memset (cfg->webpa_auth_token, 0, sizeof(cfg->webpa_auth_token));
 	if( strlen(cfg->token_read_script) !=0 && strlen(cfg->token_acquisition_script) !=0)
     	{
 		execute_token_script(output,cfg->token_read_script,sizeof(output),cfg->hw_mac,cfg->hw_serial_number);

src/config.h

@@ -49,6 +49,7 @@ extern "C" {
 #define WEBPA_BACKOFF_MAX       "webpa-backoff-max"
 #define PARTNER_ID              "partner-id"
 #define CERT_PATH               "ssl-cert-path"
+#define BOOT_RETRY_WAIT         "boot-time-retry-wait"
 
 #define PROTOCOL_VALUE 					"PARODUS-2.0"
 #define WEBPA_PATH_URL                  "/api/v2/device"
@@ -93,6 +94,7 @@ typedef struct
     char webpa_auth_token[4096];
     char token_acquisition_script[64];
     char token_read_script[64];
+    unsigned int boot_retry_wait;
 } ParodusCfg;
 
 #define FLAGS_IPV6_ONLY (1 << 0)

src/downstream.c

@@ -89,7 +89,7 @@ void listenerOnMessage(void * msg, size_t msgSize)
                     if(ret < 0)
                     {
                         response = cJSON_CreateObject();
-                        cJSON_AddNumberToObject(response, "statusCode", 430);
+                        cJSON_AddNumberToObject(response, "statusCode", 403);
                         cJSON_AddStringToObject(response, "message", "Invalid partner_id");
                     } 
 

src/partners_check.c

@@ -39,85 +39,172 @@
 /*----------------------------------------------------------------------------*/
 /*                             External functions                             */
 /*----------------------------------------------------------------------------*/
+static void parse_partner_id(char *partnerId, partners_t **partnersList)
+{
+    char *token;
+    int i = 0, j = 0, count = 0;
+    ParodusPrint("********* %s ********\n",__FUNCTION__);
+    while(partnerId[i] != '\0')
+    {
+        if(partnerId[i] == ',')
+        {
+            count++;
+        }
+        i++;
+    }
+    ParodusPrint("count = %d\n", count+1);
+    *partnersList = (partners_t *)malloc(sizeof(partners_t)+ sizeof( char * ) * (count+1));
+    memset(*partnersList, 0, sizeof(partners_t));
+    (*partnersList)->count = count+1;
+    while ((token = strsep(&partnerId, ",")) != NULL)
+    {
+        ParodusPrint("token=%s\n", token);
+        (*partnersList)->partner_ids[j] = strdup(token);
+        ParodusPrint("(*partnersList)->partner_ids[%d] = %s\n",j,(*partnersList)->partner_ids[j]);
+        j++;
+    }
+}
+
 int validate_partner_id(wrp_msg_t *msg, partners_t **partnerIds)
 {
     int matchFlag = 0, i = 0, count = 0;
+    size_t j = 0;
+    partners_t *partnersList = NULL;
+    char *partnerId = NULL;
     ParodusPrint("********* %s ********\n",__FUNCTION__);
-    char *partnerId = get_parodus_cfg()->partner_id;
-    if(strlen(partnerId) <= 0)
+    char *temp = get_parodus_cfg()->partner_id;
+    ParodusPrint("temp = %s\n",temp);
+    if(temp[0] != '\0' && strlen(temp) > 0)
+    {
+        partnerId = strdup(temp);
+    }
+    ParodusPrint("partnerId = %s\n",partnerId);
+    if(partnerId != NULL)
+    {
+        parse_partner_id(partnerId, &partnersList);
+        ParodusPrint("partnersList->count = %lu\n", partnersList->count);
+        if(msg->msg_type == WRP_MSG_TYPE__EVENT)
+        {
+            if(msg->u.event.partner_ids != NULL)
+            {
+                count = (int) msg->u.event.partner_ids->count;
+                ParodusPrint("partner_ids count is %d\n",count);
+                for(i = 0; i < count; i++)
+                {
+                    for(j = 0; j<partnersList->count; j++)
+                    {
+                        ParodusPrint("partnersList->partner_ids[%lu] = %s\n",j, partnersList->partner_ids[j]);
+                        if(strcmp(partnersList->partner_ids[j], msg->u.event.partner_ids->partner_ids[i]) == 0)
+                        {
+                            ParodusInfo("partner_id match found\n");
+                            matchFlag = 1;
+                            break;
+                        }
+                    }
+                    /* Commandline input partner_ids matched with partner_ids from request */
+                    if(matchFlag == 1)
+                    {
+                        break;
+                    }
+                }
+
+                /* Commandline input partner_ids not matching with partner_ids from request, appending to request partner_ids*/
+                if(matchFlag != 1)
+                {
+                    (*partnerIds) = (partners_t *) malloc(sizeof(partners_t) + (sizeof(char *) * (count+partnersList->count)));
+                    (*partnerIds)->count = count+partnersList->count;
+                    for(i = 0; i < count; i++)
+                    {
+                        (*partnerIds)->partner_ids[i] = msg->u.event.partner_ids->partner_ids[i];
+                        ParodusPrint("(*partnerIds)->partner_ids[%d] : %s\n",i,(*partnerIds)->partner_ids[i]);
+                    }
+                    i = 0;
+                    for(j = count; j<(count+partnersList->count); j++)
+                    {
+                        (*partnerIds)->partner_ids[j] = (char *) malloc(sizeof(char) * 64);
+                        parStrncpy((*partnerIds)->partner_ids[j], partnersList->partner_ids[i], 64);
+                        ParodusPrint("(*partnerIds)->partner_ids[%lu] : %s\n",j,(*partnerIds)->partner_ids[j]);
+                        i++;
+                    }
+                }
+            }
+            else
+            {
+                ParodusPrint("partner_ids list is NULL\n");
+                (*partnerIds) = (partners_t *) malloc(sizeof(partners_t) + (sizeof(char *) * partnersList->count));
+                (*partnerIds)->count = partnersList->count;
+                i=0;
+                for(j = 0; j<partnersList->count; j++)
+                {
+                    (*partnerIds)->partner_ids[j] = (char *) malloc(sizeof(char) * 64);
+                    parStrncpy((*partnerIds)->partner_ids[j], partnersList->partner_ids[i], 64);
+                    ParodusPrint("(*partnerIds)->partner_ids[%lu] : %s\n",j,(*partnerIds)->partner_ids[j]);
+                    i++;
+                }
+            }
+        }
+        else if(msg->msg_type == WRP_MSG_TYPE__REQ)
+        {
+            if(msg->u.req.partner_ids != NULL)
+            {
+                count = (int) msg->u.req.partner_ids->count;
+                ParodusPrint("partner_ids count is %d\n",count);
+                for(i = 0; i < count; i++)
+                {
+                    for(j = 0; j<partnersList->count; j++)
+                    {
+                        ParodusPrint("partnersList->partner_ids[%lu] = %s\n",j, partnersList->partner_ids[j]);
+                        if(strcmp(partnersList->partner_ids[j], msg->u.req.partner_ids->partner_ids[i]) == 0)
+                        {
+                            ParodusInfo("partner_id match found\n");
+                            matchFlag = 1;
+                            break;
+                        }
+                    }
+                }
+
+                /* Commandline input partner_ids not matching with partner_ids from request, ignoring request*/
+                if(matchFlag != 1)
+                {
+                    ParodusError("Invalid partner_id %s\n",temp);
+                    if(partnersList != NULL)
+                    {
+                        for(j=0; j<partnersList->count; j++)
+                        {
+                            if(partnersList->partner_ids[j] != NULL)
+                            {
+                                free(partnersList->partner_ids[j]);
+                            }
+                        }
+                        free(partnersList);
+                    }
+                    free(partnerId);
+                    return -1;
+                }
+            }
+            else
+            {
+                ParodusPrint("partner_ids list is NULL\n");
+            }
+        }
+        if(partnersList != NULL)
+        {
+            for(j=0; j<partnersList->count; j++)
+            {
+                if(partnersList->partner_ids[j] != NULL)
+                {
+                    free(partnersList->partner_ids[j]);
+                }
+            }
+            free(partnersList);
+        }
+        free(partnerId);
+    }
+    else
     {
         ParodusPrint("partner_id is not available to validate\n");
         return 0;
     }
-    
-    if(msg->msg_type == WRP_MSG_TYPE__EVENT)
-    {
-        if(msg->u.event.partner_ids != NULL)
-        {
-            count = (int) msg->u.event.partner_ids->count;
-            ParodusPrint("partner_ids count is %d\n",count);
-            for(i = 0; i < count; i++)
-            {
-                if(strcmp(partnerId, msg->u.event.partner_ids->partner_ids[i]) == 0)
-                {
-                    ParodusInfo("partner_id match found\n");
-                    matchFlag = 1;
-                    break;
-                }
-            }
-            
-            if(matchFlag != 1)
-            {
-                (*partnerIds) = (partners_t *) malloc(sizeof(partners_t));
-                (*partnerIds)->count = count+1;
-                for(i = 0; i < count; i++)
-                {
-                    (*partnerIds)->partner_ids[i] = msg->u.event.partner_ids->partner_ids[i];
-                    ParodusPrint("(*partnerIds)->partner_ids[%d] : %s\n",i,(*partnerIds)->partner_ids[i]);
-                }
-                (*partnerIds)->partner_ids[count] = (char *) malloc(sizeof(char) * 64);
-                parStrncpy((*partnerIds)->partner_ids[count], partnerId, 64);
-                ParodusPrint("(*partnerIds)->partner_ids[%d] : %s\n",count,(*partnerIds)->partner_ids[count]);
-            }
-        }
-        else
-        {
-            ParodusPrint("partner_ids list is NULL\n");
-            (*partnerIds) = (partners_t *) malloc(sizeof(partners_t));
-            (*partnerIds)->count = 1;
-            (*partnerIds)->partner_ids[0] = (char *) malloc(sizeof(char) * 64);
-            parStrncpy((*partnerIds)->partner_ids[0], partnerId, 64);
-            ParodusPrint("(*partnerIds)->partner_ids[0] : %s\n",(*partnerIds)->partner_ids[0]);
-        }
-    }
-    else if(msg->msg_type == WRP_MSG_TYPE__REQ)
-    {
-        if(msg->u.req.partner_ids != NULL)
-        {
-            count = (int) msg->u.req.partner_ids->count;
-            ParodusPrint("partner_ids count is %d\n",count);
-            for(i = 0; i < count; i++)
-            {
-                if(strcmp(partnerId, msg->u.req.partner_ids->partner_ids[i]) == 0)
-                {
-                    ParodusInfo("partner_id match found\n");
-                    matchFlag = 1;
-                    break;
-                }
-            }
-
-            if(matchFlag != 1)
-            {
-                ParodusError("Invalid partner_id %s\n",partnerId);
-                return -1;
-            }
-        }
-        else
-        {
-            ParodusPrint("partner_ids list is NULL\n");
-        }
-    }
-    
     return 1;
 }
 

tests/test_partners_check.c

@@ -43,7 +43,7 @@ ParodusCfg *get_parodus_cfg(void)
 
 void test_validate_partner_id_for_req()
 {
-    static partners_t partner_ids = {1,{"comcast"}};
+    static partners_t partner_ids = {3,{"shaw","","comcast"}};
     wrp_msg_t *msg = (wrp_msg_t*) malloc(sizeof(wrp_msg_t));
     memset(msg, 0, sizeof(wrp_msg_t));
     msg->msg_type = WRP_MSG_TYPE__REQ;
@@ -51,7 +51,7 @@ void test_validate_partner_id_for_req()
     
     ParodusCfg cfg;
     memset(&cfg, 0, sizeof(ParodusCfg));
-    parStrncpy(cfg.partner_id, "comcast", sizeof(cfg.partner_id));
+    parStrncpy(cfg.partner_id, "shaw,bar,comcast", sizeof(cfg.partner_id));
     
     will_return(get_parodus_cfg, (intptr_t)&cfg);
     expect_function_call(get_parodus_cfg);
@@ -68,7 +68,7 @@ void test_validate_partner_id_for_req_listNULL()
     
     ParodusCfg cfg;
     memset(&cfg, 0, sizeof(ParodusCfg));
-    parStrncpy(cfg.partner_id, "comcast", sizeof(cfg.partner_id));
+    parStrncpy(cfg.partner_id, "*,comcast", sizeof(cfg.partner_id));
     
     will_return(get_parodus_cfg, (intptr_t)&cfg);
     expect_function_call(get_parodus_cfg);
@@ -103,7 +103,7 @@ void err_validate_partner_id_for_req()
     
     ParodusCfg cfg;
     memset(&cfg, 0, sizeof(ParodusCfg));
-    parStrncpy(cfg.partner_id, "comcast", sizeof(cfg.partner_id));
+    parStrncpy(cfg.partner_id, "*,,comcast", sizeof(cfg.partner_id));
     
     will_return(get_parodus_cfg, (intptr_t)&cfg);
     expect_function_call(get_parodus_cfg);
@@ -114,7 +114,7 @@ void err_validate_partner_id_for_req()
 
 void test_validate_partner_id_for_event()
 {
-    static partners_t partner_ids = {1,{"comcast"}};
+    static partners_t partner_ids = {4,{"shaw","","*","comcast"}};
     wrp_msg_t *msg = (wrp_msg_t*) malloc(sizeof(wrp_msg_t));
     memset(msg, 0, sizeof(wrp_msg_t));
     msg->msg_type = WRP_MSG_TYPE__EVENT;
@@ -122,7 +122,7 @@ void test_validate_partner_id_for_event()
     
     ParodusCfg cfg;
     memset(&cfg, 0, sizeof(ParodusCfg));
-    parStrncpy(cfg.partner_id, "comcast", sizeof(cfg.partner_id));
+    parStrncpy(cfg.partner_id, "abc,*,comcast", sizeof(cfg.partner_id));
     
     will_return(get_parodus_cfg, (intptr_t)&cfg);
     expect_function_call(get_parodus_cfg);