Merge pull request #304 from bill1600/clrtoken3p4

clr auth token if fetch fails
2026-01-28 02:20:02 +00:00 · 2019-05-15 20:05:05 -07:00 · 2019-05-14 16:25:34 -07:00 · 2019-04-02 23:00:02 -07:00 · 2019-04-02 22:59:50 -07:00 · 2019-04-02 22:59:29 -07:00
19 changed files with 246 additions and 794 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

-## [Unreleased]
- Security: Added support to use auth token during initial connect to cloud
-
 ## [1.0.2] - 2019-02-08
 - Refactored connection.c and updated corresponding unit tests
 - Additional `/cloud-status` and `/cloud-disconnect` fields.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,6 @@ include_directories(${INCLUDE_DIR}
                    ${INCLUDE_DIR}/cjson
                    ${INCLUDE_DIR}/nopoll
                    ${INCLUDE_DIR}/msgpack
-	            ${INCLUDE_DIR}/curl
                    ${INCLUDE_DIR}/trower-base64
                    ${INCLUDE_DIR}/wrp-c                   
                    ${INCLUDE_DIR}/libparodus
@@ -135,18 +134,6 @@ add_library(libmsgpack STATIC SHARED IMPORTED)
 add_dependencies(libmsgpack msgpack)


-# curl external dependency
-#-------------------------------------------------------------------------------
-ExternalProject_Add(curl
-    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/curl
-    GIT_REPOSITORY https://github.com/curl/curl.git
-    GIT_TAG "curl-7_63_0"
-    CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
-)
-add_library(libcurl STATIC SHARED IMPORTED)
-add_dependencies(libcurl curl)
-
-
 # cimplog external dependency
 #-------------------------------------------------------------------------------
 ExternalProject_Add(cimplog
--- a/README.md
+++ b/README.md
@@ -55,9 +55,9 @@ make test

 - /force-ipv6 -Forcefully connect parodus to ipv6 address (optional argument)

- /client-cert-path -MTLS client cert location to request auth token for establishing secure connection [absolute path where client cert is present] (optional argument)
+- /token-read-script -Script to get auth token for establishing secure connection (absolute path where that script is present) -optional argument

- /token-server-url -complete server url with API path to request new auth token for establishing secure connection (optional argument)
+- /token-acquisition-script -Script to create new auth token for establishing secure connection (absolute path where that script is present) -optional argument 

 - /crud-config-file -Config json file to store objects during create, retrieve, update and delete (CRUD) operations -optional argument 

@@ -82,17 +82,17 @@ make test
 ```
 # Seshat & FEATURE_DNS_QUERY Enabled

-./parodus --hw-model=TGXXX --hw-serial-number=E8GBUEXXXXXXXXX --hw-manufacturer=ARRIS --hw-mac=14cfexxxxxxx --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_20170512115046sdy --boot-time=1494590301 --webpa-ping-timeout=180 --webpa-interface-used=eth0 --webpa-url=https://somebody.net:8080 --webpa-backoff-max=9 --parodus-local-url=tcp://127.0.0.1:6666 --partner-id=comcast --ssl-cert-path=/etc/ssl/certs/ca-certificates.crt --acquire-jwt=1 --dns-txt-url=somebody.net --jwt-public-key-file=webpa-rs256.pem --jwt-algo=RS256 --seshat-url=tcp://127.0.0.1:7777 --client-cert-path=/tmp/clientcert.mch --token-server-url=https://somebody.net:8080/token --force-ipv4 --crud-config-file=/tmp/parodus_cfg.json
+./parodus --hw-model=TGXXX --hw-serial-number=E8GBUEXXXXXXXXX --hw-manufacturer=ARRIS --hw-mac=14cfexxxxxxx --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_20170512115046sdy --boot-time=1494590301 --webpa-ping-timeout=180 --webpa-interface-used=eth0 --webpa-url=somebody.net:8080 --webpa-backoff-max=9 --parodus-local-url=tcp://127.0.0.1:6666 --partner-id=comcast --ssl-cert-path=/etc/ssl/certs/ca-certificates.crt --acquire-jwt=1 --dns-txt-url=somebody.net --jwt-public-key-file=webpa-rs256.pem --jwt-algo=RS256 --seshat-url=tcp://127.0.0.1:7777 --token-read-script=/usr/ccsp/parodus/parodus_token1.sh --token-acquisition-script=/usr/ccsp/parodus/parodus_token2.sh --force-ipv4 --crud-config-file=/tmp/parodus_cfg.json


 # Seshat is not enabled

-./parodus --hw-model=TGXXX --hw-serial-number=E8GBUEXXXXXXXXX --hw-manufacturer=ARRIS --hw-mac=14cfexxxxxxx --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_20170512115046sdy --boot-time=1494590301 --webpa-ping-timeout=180 --webpa-interface-used=eth0 --webpa-url=https://somebody.net:8080 --webpa-backoff-max=9 --parodus-local-url=tcp://127.0.0.1:6666 --partner-id=comcast --ssl-cert-path=/etc/ssl/certs/ca-certificates.crt --acquire-jwt=1 --dns-txt-url=somebody.net --jwt-public-key-file=webpa-rs256.pem --jwt-algo=RS256 --client-cert-path=/tmp/clientcert.mch --token-server-url=https://somebody.net:8080/token --force-ipv4 --crud-config-file=/tmp/parodus_cfg.json
+./parodus --hw-model=TGXXX --hw-serial-number=E8GBUEXXXXXXXXX --hw-manufacturer=ARRIS --hw-mac=14cfexxxxxxx --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_20170512115046sdy --boot-time=1494590301 --webpa-ping-timeout=180 --webpa-interface-used=eth0 --webpa-url=somebody.net:8080 --webpa-backoff-max=9 --parodus-local-url=tcp://127.0.0.1:6666 --partner-id=comcast --ssl-cert-path=/etc/ssl/certs/ca-certificates.crt --acquire-jwt=1 --dns-txt-url=somebody.net --jwt-public-key-file=webpa-rs256.pem --jwt-algo=RS256 --token-read-script=/usr/ccsp/parodus/parodus_token1.sh --token-acquisition-script=/usr/ccsp/parodus/parodus_token2.sh --force-ipv4 --crud-config-file=/tmp/parodus_cfg.json


 # When both Seshat & FEATURE_DNS_QUERY not Enabled

-./parodus --hw-model=TGXXX --hw-serial-number=E8GBUEXXXXXXXXX --hw-manufacturer=ARRIS --hw-mac=14cfexxxxxxx --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_20170512115046sdy --boot-time=1494590301 --webpa-ping-timeout=180 --webpa-interface-used=eth0 --webpa-url=https://somebody.net:8080 --webpa-backoff-max=9 --parodus-local-url=tcp://127.0.0.1:6666 --partner-id=comcast --ssl-cert-path=/etc/ssl/certs/ca-certificates.crt --client-cert-path=/tmp/clientcert.mch --token-server-url=https://somebody.net:8080/token --force-ipv4 --crud-config-file=/tmp/parodus_cfg.json
+./parodus --hw-model=TGXXX --hw-serial-number=E8GBUEXXXXXXXXX --hw-manufacturer=ARRIS --hw-mac=14cfexxxxxxx --hw-last-reboot-reason=unknown --fw-name=TG1682_DEV_master_20170512115046sdy --boot-time=1494590301 --webpa-ping-timeout=180 --webpa-interface-used=eth0 --webpa-url=somebody.net:8080 --webpa-backoff-max=9 --parodus-local-url=tcp://127.0.0.1:6666 --partner-id=comcast --ssl-cert-path=/etc/ssl/certs/ca-certificates.crt --token-read-script=/usr/ccsp/parodus/parodus_token1.sh --token-acquisition-script=/usr/ccsp/parodus/parodus_token2.sh --force-ipv4 --crud-config-file=/tmp/parodus_cfg.json

 ```

--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,7 +15,7 @@ set(SOURCES main.c mutex.c networking.c nopoll_helpers.c heartBeat.c nopoll_hand
    ParodusInternal.c string_helpers.c time.c config.c conn_interface.c
    connection.c spin_thread.c client_list.c service_alive.c
    upstream.c downstream.c thread_tasks.c partners_check.c token.c 
-	crud_interface.c crud_tasks.c crud_internal.c close_retry.c auth_token.c)
+	crud_interface.c crud_tasks.c crud_internal.c close_retry.c)

 if (ENABLE_SESHAT)
 set(SOURCES ${SOURCES} seshat_interface.c)
@@ -30,7 +30,6 @@ target_link_libraries (parodus
    ${CMAKE_THREAD_LIBS_INIT}
    -lwrp-c
    -lmsgpackc
-    -lcurl
    -ltrower-base64
    -lnopoll
    -luuid
--- a/src/auth_token.c
+++ b/src/auth_token.c
@@ -1,319 +0,0 @@
-/**
- * Copyright 2015 Comcast Cable Communications Management, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-/**
- * @file auth_token.c
- *
- * @description This file is to fetch authorization token during parodus cloud connection.
- *
- */
-
-#include <stdio.h>
-#include <fcntl.h> 
-#include "config.h"
-#include "auth_token.h"
-#include "ParodusInternal.h"
-#include <cjwt/cjwt.h>
-#include <stdlib.h>
-#include <curl/curl.h>
-#include <uuid/uuid.h>
-
-#define MAX_BUF_SIZE	        128
-#define CURL_TIMEOUT_SEC	25L
-#define MAX_CURL_RETRY_COUNT 	3
-/*----------------------------------------------------------------------------*/
-/*                            File Scoped Variables                           */
-/*----------------------------------------------------------------------------*/
-void createCurlheader(char *mac_header, char *serial_header, char *uuid_header, char *transaction_uuid, struct curl_slist *list, struct curl_slist **header_list);
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-/*
-* @brief Initialize curl object with required options. create newToken using libcurl.
-* @param[out] newToken auth token string obtained from JWT curl response
-* @param[in] len total token size
-* @param[in] r_count Number of curl retries on ipv4 and ipv6 mode during failure
-* @return returns 0 if success, otherwise failed to fetch auth token and will be retried.
-*/
-
-int requestNewAuthToken(char *newToken, size_t len, int r_count)
-{
-	CURL *curl;
-	CURLcode res;
-	CURLcode time_res;
-	struct curl_slist *list = NULL;
-	struct curl_slist *headers_list = NULL;
-
-	char *mac_header = NULL;
-	char *serial_header = NULL;
-	char *uuid_header = NULL;
-	char *transaction_uuid = NULL;
-	double total;
-	long response_code;
-
-	struct token_data data;
-	data.size = 0;
-
-	curl = curl_easy_init();
-	if(curl)
-	{
-		//this memory will be dynamically grown by write call back fn as required
-		data.data = (char *) malloc(sizeof(char) * 1);
-		if(NULL == data.data)
-		{
-			ParodusError("Failed to allocate memory.\n");
-			return -1;
-		}
-		data.data[0] = '\0';
-
-		createCurlheader(mac_header, serial_header, uuid_header, transaction_uuid, list, &headers_list);
-
-		curl_easy_setopt(curl, CURLOPT_URL, get_parodus_cfg()->token_server_url);
-		curl_easy_setopt(curl, CURLOPT_TIMEOUT, CURL_TIMEOUT_SEC);
-
-		if(get_parodus_cfg()->webpa_interface_used !=NULL && strlen(get_parodus_cfg()->webpa_interface_used) >0)
-		{
-			curl_easy_setopt(curl, CURLOPT_INTERFACE, get_parodus_cfg()->webpa_interface_used);
-		}
-		/* set callback for writing received data */
-		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback_fn);
-		curl_easy_setopt(curl, CURLOPT_WRITEDATA, &data);
-
-		curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers_list);
-
-		/* setting curl resolve option as default mode.
-		If any failure, retry with v4 first and then v6 mode. */
-
-		if(r_count == 1)
-		{
-			ParodusInfo("curl Ip resolve option set as V4 mode\n");
-			curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
-		}
-		else if(r_count == 2)
-		{
-			ParodusInfo("curl Ip resolve option set as V6 mode\n");
-			curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V6);
-		}
-		else
-		{
-			ParodusInfo("curl Ip resolve option set as default mode\n");
-			curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_WHATEVER);
-		}
-
-		/* set the cert for client authentication */
-		curl_easy_setopt(curl, CURLOPT_SSLCERT, get_parodus_cfg()->client_cert_path);
-
-		curl_easy_setopt(curl, CURLOPT_CAINFO, get_parodus_cfg()->cert_path);
-
-		/* disconnect if it is failed to validate server's cert */
-		curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L);
-
-		/* Perform the request, res will get the return code */
-		res = curl_easy_perform(curl);
-
-		curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code);
-		ParodusInfo("themis curl response %d http_code %d\n", res, response_code);
-
-		time_res = curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &total);
-		if(time_res == 0)
-		{
-			ParodusInfo("curl response Time: %.1f seconds\n", total);
-		}
-		curl_slist_free_all(headers_list);
-		if(res != 0)
-		{
-			ParodusError("curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
-			curl_easy_cleanup(curl);
-			if(data.data)
-			{
-				free(data.data);
-				data.data = NULL;
-			}
-			return -1;
-		}
-		else
-		{
-			if(response_code == 200)
-			{
-				ParodusInfo("cURL success\n");
-				strncpy(newToken, data.data, len);
-			}
-		}
-		if(data.data)
-		{
-			free(data.data);
-			data.data = NULL;
-		}
-		curl_easy_cleanup(curl);
-	}
-	else
-	{
-		ParodusError("curl init failure\n");
-		return -1;
-	}
-
-	return 0;
-}
-
-/*
-* @brief Fetches authorization token and update to parodus config.
-  This will do curl retry in case of any failure till it reaches max curl retry count.
- * @param[in] cfg Global parodus config structure to update webpa_auth_token
-*/
-
-void getAuthToken(ParodusCfg *cfg)
-{
-	int status = -1;
-	int retry_count = 0;
-
-	if( cfg->hw_mac != NULL && strlen(cfg->hw_mac) !=0 )
-	{
-		if( cfg->client_cert_path !=NULL && strlen(cfg->client_cert_path) !=0 )
-		{
-			while(1)
-			{
-				//Fetch new auth token using libcurl
-				status = requestNewAuthToken(cfg->webpa_auth_token, sizeof(cfg->webpa_auth_token), retry_count);
-				if(status == 0)
-				{
-					ParodusInfo("cfg->webpa_auth_token created successfully\n");
-					break;
-				}
-				else
-				{
-					ParodusError("Failed to create new token\n");
-					retry_count++;
-					ParodusError("Curl execution is failed, retry attempt: %d\n", retry_count);
-				}
-
-				if(retry_count == MAX_CURL_RETRY_COUNT)
-				{
-					ParodusError("Curl retry is reached to max %d attempts, proceeding without token\n", retry_count);
-					break;
-				}
-			}
-		}
-		else
-		{
-			ParodusError("client_cert_path is NULL, failed to fetch auth token\n");
-		}
-	}
-	else
-	{
-		ParodusError("hw_mac is NULL, failed to fetch auth token\n");
-	}
-}
-
-/* @brief callback function for writing libcurl received data
- * @param[in] buffer curl delivered data which need to be saved.
- * @param[in] size size is always 1
- * @param[in] nmemb size of delivered data
- * @param[out] data curl response data saved.
-*/
-size_t write_callback_fn(void *buffer, size_t size, size_t nmemb, struct token_data *data)
-{
-    size_t index = data->size;
-    size_t n = (size * nmemb);
-    char* tmp;
-
-    data->size += (size * nmemb);
-
-    tmp = realloc(data->data, data->size + 1); /* +1 for '\0' */
-
-    if(tmp) {
-        data->data = tmp;
-    } else {
-        if(data->data) {
-            free(data->data);
-        }
-        ParodusError("Failed to allocate memory for data\n");
-        return 0;
-    }
-
-    memcpy((data->data + index), buffer, n);
-    data->data[data->size] = '\0';
-
-    return size * nmemb;
-}
-
-/* @brief function to generate random uuid.
-*/
-char* generate_trans_uuid()
-{
-	char *transID = NULL;
-	uuid_t transaction_Id;
-	char *trans_id = NULL;
-	trans_id = (char *)malloc(37);
-	uuid_generate_random(transaction_Id);
-	uuid_unparse(transaction_Id, trans_id);
-
-	if(trans_id !=NULL)
-	{
-		transID = trans_id;
-	}
-	return transID;
-}
-
-/* @brief function to create curl header contains mac, serial number and uuid.
- * @param[in] mac_header mac address header key value pair
- * @param[in] serial_header serial number key value pair
- * @param[in] uuid_header transaction uuid key value pair
- * @param[in] list temp curl header list
- * @param[out] header_list output curl header list
-*/
-void createCurlheader(char *mac_header, char *serial_header, char *uuid_header, char *transaction_uuid, struct curl_slist *list, struct curl_slist **header_list)
-{
-	mac_header = (char *) malloc(sizeof(char)*MAX_BUF_SIZE);
-	if(mac_header !=NULL)
-	{
-		snprintf(mac_header, MAX_BUF_SIZE, "X-Midt-Mac-Address: %s", get_parodus_cfg()->hw_mac);
-		ParodusPrint("mac_header formed %s\n", mac_header);
-		list = curl_slist_append(list, mac_header);
-		free(mac_header);
-		mac_header = NULL;
-	}
-
-	serial_header = (char *) malloc(sizeof(char)*MAX_BUF_SIZE);
-	if(serial_header !=NULL)
-	{
-		snprintf(serial_header, MAX_BUF_SIZE, "X-Midt-Serial-Number: %s", get_parodus_cfg()->hw_serial_number);
-		ParodusPrint("serial_header formed %s\n", serial_header);
-		list = curl_slist_append(list, serial_header);
-		free(serial_header);
-		serial_header = NULL;
-	}
-
-	transaction_uuid = generate_trans_uuid();
-	if(transaction_uuid !=NULL)
-	{
-		uuid_header = (char *) malloc(sizeof(char)*MAX_BUF_SIZE);
-		if(uuid_header !=NULL)
-		{
-			snprintf(uuid_header, MAX_BUF_SIZE, "X-Midt-Uuid: %s", transaction_uuid);
-			ParodusInfo("uuid_header formed %s\n", uuid_header);
-			list = curl_slist_append(list, uuid_header);
-			free(transaction_uuid);
-			transaction_uuid = NULL;
-			free(uuid_header);
-			uuid_header = NULL;
-		}
-	}
-	else
-	{
-		ParodusError("Failed to generate transaction_uuid\n");
-	}
-	*header_list = list;
-}
--- a/src/auth_token.h
+++ b/src/auth_token.h
@@ -1,57 +0,0 @@
-/**
- * Copyright 2015 Comcast Cable Communications Management, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-/**
- * @file auth_token.h
- *
- * @description This file is to fetch authorization token during parodus cloud connection.
- *
- */
- 
-#ifndef _AUTH_TOKEN_H_ 
-#define _AUTH_TOKEN_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*----------------------------------------------------------------------------*/
-/*                                   Macros                                   */
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*                               Data Structures                              */
-/*----------------------------------------------------------------------------*/
-
-struct token_data {
-    size_t size;
-    char* data;
-};
-
-/*----------------------------------------------------------------------------*/
-/*                             Function Prototypes                            */
-/*----------------------------------------------------------------------------*/
-
-int requestNewAuthToken(char *newToken, size_t len, int r_count);
-void getAuthToken(ParodusCfg *cfg);
-size_t write_callback_fn(void *buffer, size_t size, size_t nmemb, struct token_data *data);
-char* generate_trans_uuid();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
--- a/src/client_list.c
+++ b/src/client_list.c
@@ -76,7 +76,11 @@ int addToList( wrp_msg_t **msg)
            if(rc < 0)
            {
                ParodusError ("Unable to connect socket (errno=%d, %s)\n",errno, strerror(errno));
-                nn_close (sock);
+		if (nn_close (sock) < 0)
+                {
+                   ParodusError ("nn_close socket=%d (err=%d, %s)\n", 
+			sock, errno, strerror(errno));
+		}
                
            }
            else
@@ -87,6 +91,7 @@ int addToList( wrp_msg_t **msg)
 		{
    			memset( new_node, 0, sizeof( reg_list_item_t ) );
    			new_node->sock = sock;
+                        new_node->endpoint = rc;
    			ParodusPrint("new_node->sock is %d\n", new_node->sock);
    			
    			
@@ -219,6 +224,16 @@ int deleteFromList(char* service_name)
 			}
 			
 			ParodusPrint("Deleting the node\n");
+                        if(nn_shutdown(curr_node->sock, curr_node->endpoint) < 0)
+                        {
+                           ParodusError ("nn_shutdown socket=%d endpt=%d, err=%d\n", 
+				curr_node->sock, curr_node->endpoint, errno);
+                        }
+			if (nn_close (curr_node->sock) < 0)
+                        {
+                           ParodusError ("nn_close socket=%d err=%d\n", 
+				curr_node->sock, errno);
+                        }
 			free( curr_node );
 			curr_node = NULL;
 			ParodusInfo("Deleted successfully and returning..\n");
--- a/src/client_list.h
+++ b/src/client_list.h
@@ -30,6 +30,7 @@
 typedef struct reg_list_item
 {
 	int sock;
+	int endpoint;
 	char service_name[32];
 	char url[100];
 	struct reg_list_item *next;
--- a/src/config.c
+++ b/src/config.c
@@ -26,9 +26,8 @@
 #include "config.h"
 #include "ParodusInternal.h"
 #include <cjwt/cjwt.h>
-#include <stdlib.h>
-#include <curl/curl.h>
-#include <uuid/uuid.h>
+
+#define MAX_BUF_SIZE	128

 /*----------------------------------------------------------------------------*/
 /*                            File Scoped Variables                           */
@@ -37,6 +36,7 @@
 static ParodusCfg parodusCfg;
 static unsigned int rsa_algorithms = 
 	(1<<alg_rs256) | (1<<alg_rs384) | (1<<alg_rs512);
+
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -141,6 +141,31 @@ void read_key_from_file (const char *fname, char *buf, size_t buflen)
  ParodusInfo ("%d bytes read\n", nbytes);
 }

+void execute_token_script(char *token, char *name, size_t len, char *mac, char *serNum)
+{
+    FILE* out = NULL, *file = NULL;
+    char command[MAX_BUF_SIZE] = {'\0'};
+    if(strlen(name)>0)
+    {
+        file = fopen(name, "r");
+        if(file)
+        {
+            snprintf(command,sizeof(command),"%s %s %s",name,serNum,mac);
+            out = popen(command, "r");
+            if(out)
+            {
+                fgets(token, len, out);
+                pclose(out);
+            }
+            fclose(file);
+        }
+        else
+        {
+            ParodusError ("File %s open error\n", name);
+        }
+    }
+}
+
 // strips ':' characters
 // verifies that there exactly 12 characters
 int parse_mac_address (char *target, const char *arg)
@@ -361,9 +386,9 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
        {"ssl-cert-path",           required_argument, 0, 'c'},
        {"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'},
-	{"client-cert-path",        required_argument, 0, 'P'},
-	{"token-server-url",        required_argument, 0, 'U'},
+	{"token-acquisition-script",     required_argument, 0, 'J'},
 	{"crud-config-file",        required_argument, 0, 'C'},
        {0, 0, 0, 0}
    };
@@ -380,8 +405,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
 	cfg->jwt_algo = 0;
 	parStrncpy (cfg->jwt_key, "", sizeof(cfg->jwt_key));
 	cfg->crud_config_file = NULL;
-	cfg->client_cert_path = NULL;
-	cfg->token_server_url = NULL;
 	cfg->cloud_status = NULL;
 	cfg->cloud_disconnect = NULL;
 	optind = 1;  /* We need this if parseCommandLine is called again */
@@ -523,6 +546,14 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
          cfg->flags |= FLAGS_IPV6_ONLY;
          break;

+        case 'J':
+          parStrncpy(cfg->token_acquisition_script, optarg,sizeof(cfg->token_acquisition_script));
+          break;
+        
+        case 'T':
+          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);
@@ -533,16 +564,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
 		  ParodusInfo("crud_config_file is %s\n", cfg->crud_config_file);
 		  break;

-		case 'P':
-		cfg->client_cert_path = strdup(optarg);
-		ParodusInfo("client_cert_path is %s\n", cfg->client_cert_path);
-		break;
-
-		case 'U':
-		cfg->token_server_url = strdup(optarg);
-		ParodusInfo("token_server_url is %s\n", cfg->token_server_url);
-		break;
-
        case '?':
          /* getopt_long already printed an error message. */
          break;
@@ -585,6 +606,64 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
    return 0;
 }

+/*
+* call parodus create/acquisition script to create new auth token, if success then calls 
+* execute_token_script func with args as parodus read script.
+*/
+
+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)
+	{
+		//Call read script 
+		execute_token_script(newToken,get_parodus_cfg()->token_read_script,len,get_parodus_cfg()->hw_mac,get_parodus_cfg()->hw_serial_number);
+	}	
+	else 
+	{
+		ParodusError("Failed to create new token\n");
+	}
+}
+
+/*
+* Fetches authorization token from the output of read script. If read script returns "ERROR"
+* it will call createNewAuthToken to create and read new token 
+*/
+
+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);
+		
+	    	if ((strlen(output) == 0))
+	    	{
+			ParodusError("Unable to get auth token\n");
+		}
+		else if(strcmp(output,"ERROR")==0)
+		{
+			ParodusInfo("Failed to read token from %s. Proceeding to create new token.\n",cfg->token_read_script);
+			//Call create/acquisition script
+			createNewAuthToken(cfg->webpa_auth_token, sizeof(cfg->webpa_auth_token));	
+		}
+		else
+		{
+			ParodusInfo("update cfg->webpa_auth_token in success case\n");
+			parStrncpy(cfg->webpa_auth_token, output, sizeof(cfg->webpa_auth_token));
+		}
+	}
+	else
+	{
+        	ParodusInfo("Both read and write file are NULL \n");
+	}
+}
+
 void setDefaultValuesToCfg(ParodusCfg *cfg)
 {
    if(cfg == NULL)
@@ -616,8 +695,6 @@ void setDefaultValuesToCfg(ParodusCfg *cfg)
    parStrncpy(cfg->webpa_uuid, "1234567-345456546",sizeof(cfg->webpa_uuid));
    ParodusPrint("cfg->webpa_uuid is :%s\n", cfg->webpa_uuid);
    cfg->crud_config_file = NULL;
-    cfg->client_cert_path = NULL;
-    cfg->token_server_url = NULL;
 	
 	cfg->cloud_status = CLOUD_STATUS_OFFLINE;
 	ParodusInfo("Default cloud_status is %s\n", cfg->cloud_status);
@@ -758,6 +835,24 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
        ParodusPrint("cert_path is NULL. set to empty\n");
    }

+    if(strlen(config->token_acquisition_script )!=0)
+    {
+          parStrncpy(cfg->token_acquisition_script, config->token_acquisition_script,sizeof(cfg->token_acquisition_script));
+    }
+    else
+    {
+          ParodusPrint("token_acquisition_script is NULL. read from tmp file\n");
+    }
+        
+    if(strlen(config->token_read_script )!=0)
+    {
+          parStrncpy(cfg->token_read_script, config->token_read_script,sizeof(cfg->token_read_script));
+    }
+    else
+    {
+          ParodusPrint("token_read_script is NULL. read from tmp file\n");
+    }
+
    cfg->boot_time = config->boot_time;
    cfg->webpa_ping_timeout = config->webpa_ping_timeout;
    cfg->webpa_backoff_max = config->webpa_backoff_max;
@@ -775,24 +870,6 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg)
    {
        ParodusPrint("crud_config_file is NULL. set to empty\n");
    }
-
-    if(config->client_cert_path != NULL)
-    {
-        cfg->client_cert_path = strdup(config->client_cert_path);
-    }
-    else
-    {
-        ParodusPrint("client_cert_path is NULL. set to empty\n");
-    }
-
-    if(config->token_server_url != NULL)
-    {
-        cfg->token_server_url = strdup(config->token_server_url);
-    }
-    else
-    {
-        ParodusPrint("token_server_url is NULL. set to empty\n");
-    }
 }


--- a/src/config.h
+++ b/src/config.h
@@ -99,8 +99,6 @@ typedef struct
    char webpa_auth_token[4096];
    char token_acquisition_script[64];
    char token_read_script[64];
-    char *client_cert_path;
-    char *token_server_url;
 	char *crud_config_file;
 	char *cloud_status;
 	char *cloud_disconnect;
@@ -116,6 +114,7 @@ typedef struct
 /*----------------------------------------------------------------------------*/

 void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg);
+void createNewAuthToken(char *newToken, size_t len);

 /**
 * parse command line arguments and create config structure
@@ -129,6 +128,7 @@ void loadParodusCfg(ParodusCfg * config,ParodusCfg *cfg);
 int parseCommandLine(int argc,char **argv,ParodusCfg * cfg);

 void setDefaultValuesToCfg(ParodusCfg *cfg); 
+void getAuthToken(ParodusCfg *cfg);
 // Accessor for the global config structure.
 ParodusCfg *get_parodus_cfg(void);
 void set_parodus_cfg(ParodusCfg *);
@@ -149,6 +149,7 @@ void reset_cloud_disconnect_reason(ParodusCfg *cfg);
 */ 
 int parse_webpa_url (const char *full_url, 
 	char **server_addr, unsigned int *port);
+
 #ifdef __cplusplus
 }
 #endif
--- a/src/conn_interface.c
+++ b/src/conn_interface.c
@@ -36,7 +36,6 @@
 #include "crud_interface.h"
 #include "heartBeat.h"
 #include "close_retry.h"
-#include <curl/curl.h>
 #ifdef FEATURE_DNS_QUERY
 #include <ucresolv_log.h>
 #endif
@@ -206,7 +205,6 @@ void createSocketConnection(void (* initKeypress)())
    close_and_unref_connection(get_global_conn());
    nopoll_ctx_unref(ctx);
    nopoll_cleanup_library();
-    curl_global_cleanup();
 }

 void shutdownSocketConnection(void) {
--- a/src/connection.c
+++ b/src/connection.c
@@ -25,7 +25,6 @@
 #include "time.h"
 #include "token.h"
 #include "config.h"
-#include "auth_token.h"
 #include "nopoll_helpers.h"
 #include "mutex.h"
 #include "spin_thread.h"
@@ -298,9 +297,10 @@ void set_current_server (create_connection_ctx_t *ctx)

 void set_extra_headers (create_connection_ctx_t *ctx, int reauthorize)
 {
-  if (reauthorize && (get_parodus_cfg()->client_cert_path !=NULL && strlen(get_parodus_cfg()->client_cert_path) >0))
+  if (reauthorize && (strlen(get_parodus_cfg()->token_acquisition_script) >0))
  {
-    getAuthToken(get_parodus_cfg());
+    createNewAuthToken(get_parodus_cfg()->webpa_auth_token,
+      sizeof(get_parodus_cfg()->webpa_auth_token));
  }
  
  ctx->extra_headers = build_extra_hdrs (&ctx->header_info);
--- a/src/main.c
+++ b/src/main.c
@@ -18,10 +18,8 @@
 #include <string.h>
 #include "stdlib.h"
 #include "config.h"
-#include "auth_token.h"
 #include "conn_interface.h"
 #include "parodus_log.h"
-#include <curl/curl.h>
 #ifdef INCLUDE_BREAKPAD
 #include "breakpad_wrapper.h"
 #else
@@ -82,7 +80,6 @@ int main( int argc, char **argv)
    if (0 != parseCommandLine(argc,argv,cfg)) {
 		abort();
 	}
-    curl_global_init(CURL_GLOBAL_DEFAULT);
    getAuthToken(cfg);
     
    createSocketConnection( NULL);
--- a/src/upstream.c
+++ b/src/upstream.c
@@ -190,6 +190,16 @@ void *handle_upstream()
                    ParodusError("failure in allocation for message\n");
                }
            }
+	    if(nn_shutdown(sock, bind) < 0)
+	    {
+	        ParodusError ("nn_shutdown bind socket=%d endpt=%d, err=%d\n", 
+		    sock, bind, errno);
+	    }
+	    if (nn_close (sock) < 0)
+	    {
+	        ParodusError ("nn_close bind socket=%d err=%d\n", 
+		    sock, errno);
+	    }
        }
    }
    else
@@ -234,7 +244,7 @@ void *processUpstreamMessage()
            if(rv > 0)
            {
                msgType = msg->msg_type;				   
-                if(msgType == 9)
+                if(msgType == WRP_MSG_TYPE__SVC_REGISTRATION)
                {
                    ParodusInfo("\n Nanomsg client Registration for Upstream\n");
                    //Extract serviceName and url & store it in a linked list for reg_clients
@@ -249,12 +259,16 @@ void *processUpstreamMessage()
                            {
                                ParodusInfo("match found, client is already registered\n");
                                parStrncpy(temp->url,msg->u.reg.url, sizeof(temp->url));
-                                if(nn_shutdown(temp->sock, 0) < 0)
+                                if(nn_shutdown(temp->sock, temp->endpoint) < 0)
                                {
-                                    ParodusError ("nn_shutdown socket=%d err=%d\n", 
+                                    ParodusError ("nn_shutdown socket=%d endpt=%d, err=%d\n", 
+					temp->sock, temp->endpoint, errno);
+                                }
+				if (nn_close (temp->sock) < 0)
+                                {
+                                    ParodusError ("nn_close socket=%d err=%d\n", 
 					temp->sock, errno);
                                }
-				nn_close (temp->sock);

                                temp->sock = nn_socket(AF_SP,NN_PUSH );
                                if(temp->sock >= 0)
@@ -272,6 +286,7 @@ void *processUpstreamMessage()
                                    }
                                    else
                                    {
+                                        temp->endpoint = rc;
                                        ParodusInfo("Client registered before. Sending ack on socket %d\n", temp->sock); 
                                        status =sendAuthStatus(temp);

@@ -402,9 +417,8 @@ void *processUpstreamMessage()
 								{
 									ParodusError("Failed to get device_id\n");
 								}
-						}
-						else
-						{
+						} else if (WRP_MSG_TYPE__SVC_ALIVE != msgType) {
+						  /* Don't reply to service alive message */
 							sendUpstreamMsgToServer(&message->msg, message->len);
 						}
 					}
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -120,10 +120,10 @@ target_link_libraries (test_nopoll_handlers_fragment -lnopoll -lcunit -lcimplog
 add_test(NAME test_connection COMMAND ${MEMORY_CHECK} ./test_connection)
 set (CONN_SRC ../src/connection.c 
  ../src/string_helpers.c ../src/mutex.c ../src/time.c 
-  ../src/config.c ../src/auth_token.c ../src/spin_thread.c  ../src/heartBeat.c ../src/close_retry.c)
+  ../src/config.c ../src/spin_thread.c  ../src/heartBeat.c ../src/close_retry.c)
 #set(CONN_SRC ../src/connection.c ${PARODUS_COMMON_SRC})
 add_executable(test_connection test_connection.c ${CONN_SRC})
-target_link_libraries (test_connection ${PARODUS_COMMON_LIBS} -lcmocka -lcurl -luuid)
+target_link_libraries (test_connection ${PARODUS_COMMON_LIBS} -lcmocka)

 #-------------------------------------------------------------------------------
 #   test_connection - function createNopollConnection
@@ -141,7 +141,7 @@ target_link_libraries (test_connection ${PARODUS_COMMON_LIBS} -lcmocka -lcurl -l
 add_test(NAME test_client_list COMMAND ${MEMORY_CHECK} ./test_client_list)
 #add_executable(test_client_list test_client_list.c ../src/client_list.c ../src/service_alive.c ../src/upstream.c ../src/networking.c ../src/nopoll_helpers.c ../src/downstream.c ../src/connection.c ../src/nopoll_handlers.c ../src/ParodusInternal.c ../src/thread_tasks.c ../src/conn_interface.c ../src/partners_check.c ${PARODUS_COMMON_SRC})
 #target_link_libraries (test_client_list ${PARODUS_COMMON_LIBS})
-set(CLIST_SRC test_client_list.c ../src/client_list.c ../src/auth_token.c
+set(CLIST_SRC test_client_list.c ../src/client_list.c 
 ../src/service_alive.c ../src/upstream.c ../src/networking.c ../src/nopoll_helpers.c 
 ../src/downstream.c ../src/connection.c ../src/nopoll_handlers.c ../src/heartBeat.c ../src/close_retry.c
 ../src/ParodusInternal.c ../src/thread_tasks.c ../src/conn_interface.c 
@@ -155,7 +155,7 @@ endif (ENABLE_SESHAT)
 
 add_executable(test_client_list ${CLIST_SRC})
 #target_link_libraries (test_client_list ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS})
-target_link_libraries (test_client_list ${PARODUS_COMMON_LIBS} -lcurl -luuid)
+target_link_libraries (test_client_list ${PARODUS_COMMON_LIBS})

 #-------------------------------------------------------------------------------
 #   test_service_alive
@@ -163,7 +163,7 @@ target_link_libraries (test_client_list ${PARODUS_COMMON_LIBS} -lcurl -luuid)
 add_test(NAME test_service_alive COMMAND ${MEMORY_CHECK} ./test_service_alive)
 #add_executable(test_service_alive test_service_alive.c ../src/client_list.c ../src/service_alive.c ../src/upstream.c ../src/networking.c ../src/nopoll_helpers.c ../src/nopoll_handlers.c ../src/config.c ../src/connection.c ../src/ParodusInternal.c ../src/downstream.c ../src/thread_tasks.c ../src/conn_interface.c ../src/partners_check.c ${PARODUS_COMMON_SRC})
 #target_link_libraries (test_service_alive ${PARODUS_COMMON_LIBS})
-set(SVA_SRC test_service_alive.c ../src/client_list.c ../src/service_alive.c ../src/auth_token.c ../src/upstream.c ../src/networking.c ../src/nopoll_helpers.c ../src/nopoll_handlers.c ../src/config.c ../src/connection.c ../src/ParodusInternal.c ../src/downstream.c ../src/thread_tasks.c ../src/conn_interface.c ../src/partners_check.c ../src/heartBeat.c ../src/close_retry.c ${PARODUS_COMMON_SRC})
+set(SVA_SRC test_service_alive.c ../src/client_list.c ../src/service_alive.c ../src/upstream.c ../src/networking.c ../src/nopoll_helpers.c ../src/nopoll_handlers.c ../src/config.c ../src/connection.c ../src/ParodusInternal.c ../src/downstream.c ../src/thread_tasks.c ../src/conn_interface.c ../src/partners_check.c ../src/heartBeat.c ../src/close_retry.c ${PARODUS_COMMON_SRC})
 if (ENABLE_SESHAT)
 set(SVA_SRC ${SVA_SRC} ../src/seshat_interface.c)
 else()
@@ -172,27 +172,18 @@ endif (ENABLE_SESHAT)

 add_executable(test_service_alive ${SVA_SRC})
 #target_link_libraries (test_service_alive ${PARODUS_CONN_LIBS} ${PARODUS_COMMON_LIBS})
-target_link_libraries (test_service_alive ${PARODUS_COMMON_LIBS} -lcurl -luuid)
+target_link_libraries (test_service_alive ${PARODUS_COMMON_LIBS})

 #-------------------------------------------------------------------------------
 #   test_config
 #-------------------------------------------------------------------------------
 add_test(NAME test_config COMMAND ${MEMORY_CHECK} ./test_config)
-add_executable(test_config test_config.c ../src/config.c ../src/auth_token.c ../src/string_helpers.c)
+add_executable(test_config test_config.c ../src/config.c ../src/string_helpers.c)
 target_link_libraries (test_config -lcmocka
 -Wl,--no-as-needed -lcimplog
- -lcjson -lcjwt -ltrower-base64 -lssl -lcrypto -lrt -lm -lcurl -luuid
+ -lcjson -lcjwt -ltrower-base64 -lssl -lcrypto -lrt -lm
 )

-#-------------------------------------------------------------------------------
-#   test_auth_token
-#-------------------------------------------------------------------------------
-add_test(NAME test_auth_token COMMAND ${MEMORY_CHECK} ./test_auth_token)
-add_executable(test_auth_token test_auth_token.c ../src/config.c ../src/auth_token.c ../src/string_helpers.c)
-target_link_libraries (test_auth_token -lcmocka
- -Wl,--no-as-needed -lcimplog
- -lcjson -lcjwt -ltrower-base64 -lssl -lcrypto -lrt -lm -lcurl -luuid
-)
 #-------------------------------------------------------------------------------
 #   test_crud_interface
 #-------------------------------------------------------------------------------
@@ -212,7 +203,7 @@ target_link_libraries (test_crud_tasks -lcmocka ${PARODUS_COMMON_LIBS} )
 #-------------------------------------------------------------------------------
 add_test(NAME test_crud_internal COMMAND ${MEMORY_CHECK} ./test_crud_internal)
 add_executable(test_crud_internal test_crud_internal.c ../src/config.c ../src/close_retry.c ../src/string_helpers.c ../src/crud_internal.c )
-target_link_libraries (test_crud_internal -lcmocka ${PARODUS_COMMON_LIBS} -lcurl -luuid)
+target_link_libraries (test_crud_internal -lcmocka ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
 #   test_upstream
@@ -268,14 +259,14 @@ else()
 set(CONIFC_SRC ${CONIFC_SRC} ../src/seshat_interface_stub.c)
 endif (ENABLE_SESHAT)
 add_executable(test_conn_interface ${CONIFC_SRC})
-target_link_libraries (test_conn_interface -lcmocka ${PARODUS_COMMON_LIBS} -lcurl -luuid )
+target_link_libraries (test_conn_interface -lcmocka ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
 #   test_ParodusInternal
 #-------------------------------------------------------------------------------
 add_test(NAME test_ParodusInternal COMMAND ${MEMORY_CHECK} ./test_ParodusInternal)
 add_executable(test_ParodusInternal test_ParodusInternal.c ../src/ParodusInternal.c ../src/config.c ../src/string_helpers.c)
-target_link_libraries (test_ParodusInternal -lcmocka ${PARODUS_COMMON_LIBS} -lcurl -luuid)
+target_link_libraries (test_ParodusInternal -lcmocka ${PARODUS_COMMON_LIBS} )

 #-------------------------------------------------------------------------------
 #   test_partners_check
@@ -294,7 +285,7 @@ set(TOKEN_SRC ../src/conn_interface.c ../src/config.c
 ../src/nopoll_handlers.c ../src/nopoll_helpers.c
 ../src/partners_check.c ../src/ParodusInternal.c
 ../src/upstream.c ../src/downstream.c 
- ../src/networking.c ../src/auth_token.c
+ ../src/networking.c
 ../src/thread_tasks.c ../src/time.c
 ../src/string_helpers.c ../src/mutex.c 
 ../src/token.c ../src/heartBeat.c
@@ -315,7 +306,7 @@ endif (FEATURE_DNS_QUERY)

 add_executable(test_token ${TOKEN_SRC} ) 
 #target_link_libraries (test_token ${PARODUS_COMMON_LIBS} ${PARODUS_JWT_LIBS} -lcmocka )
-target_link_libraries (test_token ${PARODUS_COMMON_LIBS} -lcmocka -lcurl -luuid)
+target_link_libraries (test_token ${PARODUS_COMMON_LIBS} -lcmocka )

 #-------------------------------------------------------------------------------
 #   test_seshat_interface - registerWithSeshat
--- a/tests/test_auth_token.c
+++ b/tests/test_auth_token.c
@@ -1,299 +0,0 @@
-/**
- *  Copyright 2010-2016 Comcast Cable Communications Management, LLC
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-
-#include <CUnit/Basic.h>
-
-#include "../src/config.h"
-#include "../src/auth_token.h"
-#include "../src/ParodusInternal.h"
-
-extern int requestNewAuthToken(char *newToken, size_t len, int r_count);
-
-/*----------------------------------------------------------------------------*/
-/*                                   Mocks                                    */
-/*----------------------------------------------------------------------------*/
-typedef void CURL;
-
-typedef enum {
-  CURLINFO_RESPONSE_CODE    = 2,
-  CURLINFO_TOTAL_TIME
-} CURLINFO;
-
-int curl_easy_perform(CURL *curl)
-{
-	UNUSED(curl);
-	function_called();
-	return (int) mock();
-}
-
-int curl_easy_getinfo(CURL *curl, CURLINFO CURLINFO_RESPONSE_CODE, long response_code)
-{
-	UNUSED(curl);
-	UNUSED(CURLINFO_RESPONSE_CODE);
-	UNUSED(response_code);
-	function_called();
-	return (int) mock();
-}
-/*----------------------------------------------------------------------------*/
-/*                                   Tests                                    */
-/*----------------------------------------------------------------------------*/
-void getAuthToken_Null()
-{
-	ParodusCfg cfg;
-	memset(&cfg,0,sizeof(cfg));
-	parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-	cfg.client_cert_path = NULL;
-	getAuthToken(&cfg);
-	set_parodus_cfg(&cfg);
-	assert( cfg.client_cert_path == NULL);
-}
-
-void getAuthToken_MacNull()
-{
-    ParodusCfg cfg;
-    memset(&cfg,0,sizeof(cfg));
-    cfg.client_cert_path = NULL;
-    getAuthToken(&cfg);
-    set_parodus_cfg(&cfg);
-    assert( cfg.client_cert_path == NULL);
-}
-
-void test_requestNewAuthToken_init_fail ()
-{
-	char token[32];
-	ParodusCfg cfg;
-	int output = -1;
-	memset(&cfg,0,sizeof(cfg));
-
-	cfg.token_server_url = strdup("https://dev.comcast.net/token");
-	parStrncpy(cfg.cert_path , "/etc/ssl/certs/ca-certificates.crt", sizeof(cfg.cert_path));
-	parStrncpy(cfg.hw_serial_number, "Fer23u948590", sizeof(cfg.hw_serial_number));
-	parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-
-	set_parodus_cfg(&cfg);
-
-	will_return (curl_easy_perform, -1);
-	expect_function_calls (curl_easy_perform, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_getinfo, -1);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	requestNewAuthToken (token, sizeof(token), 2);
-	assert_int_equal (output, -1);
-	free(cfg.token_server_url);
-}
-
-
-void test_requestNewAuthToken_failure ()
-{
-	char token[32];
-	ParodusCfg cfg;
-	int output = -1;
-	memset(&cfg,0,sizeof(cfg));
-
-	cfg.token_server_url = strdup("https://dev.comcast.net/token");
-	parStrncpy(cfg.cert_path , "/etc/ssl/certs/ca-certificates.crt", sizeof(cfg.cert_path));
-	parStrncpy(cfg.hw_serial_number, "Fer23u948590", sizeof(cfg.hw_serial_number));
-	parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-	set_parodus_cfg(&cfg);
-
-	will_return (curl_easy_perform, -1);
-	expect_function_calls (curl_easy_perform, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_getinfo, -1);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	requestNewAuthToken (token, sizeof(token), 2);
-	assert_int_equal (output, -1);
-	free(cfg.token_server_url);
-}
-
-
-void test_requestNewAuthToken ()
-{
-  char token[1024];
-  ParodusCfg cfg;
-  int output = -1;
-  memset(&cfg,0,sizeof(cfg));
-
-  cfg.token_server_url = strdup("https://dev.comcast.net/token");
-  parStrncpy(cfg.cert_path , "/etc/ssl/certs/ca-certificates.crt", sizeof(cfg.cert_path));
-  parStrncpy(cfg.webpa_interface_used , "eth0", sizeof(cfg.webpa_interface_used));
-  parStrncpy(cfg.hw_serial_number, "Fer23u948590", sizeof(cfg.hw_serial_number));
-  parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-  set_parodus_cfg(&cfg);
-
-  will_return (curl_easy_perform, 0);
-  expect_function_calls (curl_easy_perform, 1);
-  will_return (curl_easy_getinfo, 0);
-  expect_function_calls (curl_easy_getinfo, 1);
-
-  will_return (curl_easy_getinfo, 0);
-  expect_function_calls (curl_easy_getinfo, 1);
-
-  output = requestNewAuthToken (token, sizeof(token), 1);
-  assert_int_equal (output, 0);
-  free(cfg.token_server_url);
-}
-
-void test_getAuthToken ()
-{
-	ParodusCfg cfg;
-	memset(&cfg,0,sizeof(cfg));
-
-	cfg.token_server_url = strdup("https://dev.comcast.net/token");
-	cfg.client_cert_path = strdup("testcert");
-	parStrncpy(cfg.cert_path , "/etc/ssl/certs/ca-certificates.crt", sizeof(cfg.cert_path));
-	parStrncpy(cfg.webpa_interface_used , "eth0", sizeof(cfg.webpa_interface_used));
-	parStrncpy(cfg.hw_serial_number, "Fer23u948590", sizeof(cfg.hw_serial_number));
-	parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-	set_parodus_cfg(&cfg);
-
-	/* To test curl failure case and retry on v4 mode */
-	will_return (curl_easy_perform, -1);
-	expect_function_calls (curl_easy_perform, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	/* To test curl failure case and retry on v6 mode */
-	will_return (curl_easy_perform, -1);
-	expect_function_calls (curl_easy_perform, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	/* To test curl success case */
-	will_return (curl_easy_perform, 0);
-	expect_function_calls (curl_easy_perform, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	getAuthToken(&cfg);
-
-	free(cfg.client_cert_path);
-	free(cfg.token_server_url);
-}
-
-void test_getAuthTokenFailure ()
-{
-	ParodusCfg cfg;
-	memset(&cfg,0,sizeof(cfg));
-
-	cfg.token_server_url = strdup("https://dev.comcast.net/token");
-	cfg.client_cert_path = strdup("testcert");
-	parStrncpy(cfg.cert_path , "/etc/ssl/certs/ca-certificates.crt", sizeof(cfg.cert_path));
-	parStrncpy(cfg.webpa_interface_used , "eth0", sizeof(cfg.webpa_interface_used));
-	parStrncpy(cfg.hw_serial_number, "Fer23u948590", sizeof(cfg.hw_serial_number));
-	parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
-	set_parodus_cfg(&cfg);
-	will_return (curl_easy_perform, -1);
-	expect_function_calls (curl_easy_perform, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_perform, -1);
-	expect_function_calls (curl_easy_perform, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_perform, -1);
-	expect_function_calls (curl_easy_perform, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	will_return (curl_easy_getinfo, 0);
-	expect_function_calls (curl_easy_getinfo, 1);
-
-	getAuthToken(&cfg);
-
-	assert_string_equal( cfg.webpa_auth_token, "");
-
-	free(cfg.client_cert_path);
-	free(cfg.token_server_url);
-}
-
-void test_write_callback_fn ()
-{
-	void *buffer;
-	size_t size = 1;
-	size_t nmemb =8;
-	int out_len=0;
-	struct token_data data;
-	data.size = 0;
-	buffer = strdup("response");
-
-	data.data = (char *) malloc(sizeof(char) * 5);
-	data.data[0] = '\0';
-
-	out_len = write_callback_fn(buffer, size, nmemb, &data);
-	assert_string_equal(data.data, buffer);
-	assert_int_equal( out_len, strlen(buffer));
-	free(data.data);
-}
-
-/*----------------------------------------------------------------------------*/
-/*                             External Functions                             */
-/*----------------------------------------------------------------------------*/
-
-int main(void)
-{
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(test_requestNewAuthToken),
-	cmocka_unit_test(test_requestNewAuthToken_init_fail),
-	cmocka_unit_test(test_requestNewAuthToken_failure),
-	cmocka_unit_test(getAuthToken_Null),
-	cmocka_unit_test(getAuthToken_MacNull),
-	cmocka_unit_test(test_getAuthToken),
-	cmocka_unit_test(test_getAuthTokenFailure),
-	cmocka_unit_test(test_write_callback_fn),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
--- a/tests/test_config.c
+++ b/tests/test_config.c
@@ -25,7 +25,6 @@
 #include <CUnit/Basic.h>

 #include "../src/config.h"
-#include "../src/auth_token.h"
 #include "../src/ParodusInternal.h"

 extern int parse_mac_address (char *target, const char *arg);
@@ -38,6 +37,8 @@ extern int parse_webpa_url (const char *full_url,
 	char **server_addr, unsigned int *port);
 extern unsigned int get_algo_mask (const char *algo_str);
 extern unsigned int parse_num_arg (const char *arg, const char *arg_name);
+extern void execute_token_script(char *token, char *name, size_t len, char *mac, char *serNum);
+extern void createNewAuthToken(char *newToken, size_t len);

 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
@@ -52,7 +53,6 @@ void create_token_script(char *fname)
    sprintf(command, "chmod +x %s",fname);
    system(command);
 }
-
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/
@@ -184,10 +184,9 @@ void test_parseCommandLine()
 #endif
 		"--force-ipv4",
 		"--force-ipv6",
-		"--boot-time-retry-wait=10",
+		"--token-read-script=/tmp/token.sh",
+		"--token-acquisition-script=/tmp/token.sh",
 		"--ssl-cert-path=/etc/ssl/certs/ca-certificates.crt",
-		"--client-cert-path=testcert",
-		"--token-server-url=https://dev.comcast.net/token",
 #ifdef FEATURE_DNS_QUERY
 		"--acquire-jwt=1",
 		"--dns-txt-url=mydns.mycom.net",
@@ -215,7 +214,6 @@ void test_parseCommandLine()
    assert_string_equal( parodusCfg.hw_last_reboot_reason, "unknown");	
    assert_string_equal( parodusCfg.fw_name, "TG1682_DEV_master_2016000000sdy");	
    assert_int_equal( (int) parodusCfg.webpa_ping_timeout,180);	
-    assert_int_equal( (int) parodusCfg.boot_retry_wait,10);
    assert_string_equal( parodusCfg.webpa_interface_used, "br0");	
    assert_string_equal( parodusCfg.webpa_url, "http://127.0.0.1");
    assert_int_equal( (int) parodusCfg.webpa_backoff_max,0);
@@ -226,20 +224,18 @@ void test_parseCommandLine()
    assert_string_equal(  parodusCfg.seshat_url, "ipc://127.0.0.1:7777");
 #endif
    assert_int_equal( (int) parodusCfg.flags, FLAGS_IPV6_ONLY|FLAGS_IPV4_ONLY);
-    
-    set_parodus_cfg(&parodusCfg);
+    sprintf(expectedToken,"secure-token-%s-%s",parodusCfg.hw_serial_number,parodusCfg.hw_mac);
    getAuthToken(&parodusCfg);
+    set_parodus_cfg(&parodusCfg);
+    
    assert_string_equal(  get_parodus_cfg()->webpa_auth_token,expectedToken);
    assert_string_equal(  parodusCfg.cert_path,"/etc/ssl/certs/ca-certificates.crt");
-	assert_string_equal(  parodusCfg.client_cert_path,"testcert");
-	assert_string_equal(  parodusCfg.token_server_url,"https://dev.comcast.net/token");
 #ifdef FEATURE_DNS_QUERY
 	assert_int_equal( (int) parodusCfg.acquire_jwt, 1);
    assert_string_equal(parodusCfg.dns_txt_url, "mydns.mycom.net");
    assert_int_equal( (int) parodusCfg.jwt_algo, 1024);
 	assert_string_equal ( get_parodus_cfg()->jwt_key, jwt_key);
 #endif
-	assert_int_equal( (int) parodusCfg.boot_retry_wait, 10);
 	assert_string_equal(parodusCfg.crud_config_file, "parodus_cfg.json");
 }

@@ -321,13 +317,13 @@ void test_loadParodusCfg()
    Cfg->jwt_algo = 1025;
    parStrncpy(Cfg->jwt_key, "AGdyuwyhwl2ow2ydsoioiygkshwdthuwd",sizeof(Cfg->jwt_key));
 #endif
+    parStrncpy(Cfg->token_acquisition_script , "/tmp/token.sh", sizeof(Cfg->token_acquisition_script));
+    parStrncpy(Cfg->token_read_script , "/tmp/token.sh", sizeof(Cfg->token_read_script));
    parStrncpy(Cfg->cert_path, "/etc/ssl.crt",sizeof(Cfg->cert_path));
 #ifdef ENABLE_SESHAT
    parStrncpy(Cfg->seshat_url, "ipc://tmp/seshat_service.url", sizeof(Cfg->seshat_url));
 #endif
 	Cfg->crud_config_file = strdup("parodus_cfg.json");
-	Cfg->client_cert_path = strdup("testcert");
-	Cfg->token_server_url = strdup("https://dev.comcast.net/token");
    memset(&tmpcfg,0,sizeof(ParodusCfg));
    loadParodusCfg(Cfg,&tmpcfg);

@@ -338,14 +334,14 @@ void test_loadParodusCfg()
    assert_string_equal( tmpcfg.local_url, "tcp://10.0.0.1:6000");
    assert_string_equal( tmpcfg.partner_id, "shaw");
    assert_string_equal( tmpcfg.webpa_protocol, protocol);
-	assert_string_equal(tmpcfg.client_cert_path, "testcert");
-	assert_string_equal(tmpcfg.token_server_url, "https://dev.comcast.net/token");
 #ifdef FEATURE_DNS_QUERY
 	assert_int_equal( (int) tmpcfg.acquire_jwt, 1);
    assert_string_equal(tmpcfg.dns_txt_url, "mydns");
    assert_int_equal( (int) tmpcfg.jwt_algo, 1025);
    assert_string_equal(tmpcfg.jwt_key, "AGdyuwyhwl2ow2ydsoioiygkshwdthuwd");
 #endif
+    assert_string_equal(  tmpcfg.token_acquisition_script,"/tmp/token.sh");
+    assert_string_equal(  tmpcfg.token_read_script,"/tmp/token.sh");
    assert_string_equal(tmpcfg.cert_path, "/etc/ssl.crt");
 #ifdef ENABLE_SESHAT
    assert_string_equal(tmpcfg.seshat_url, "ipc://tmp/seshat_service.url");
@@ -557,6 +553,47 @@ void test_get_algo_mask ()
 #endif	
 }

+void test_execute_token_script()
+{
+  char *cmd1 = "../../tests/return_ser_mac.bsh";
+  char *cmd2 = "nosuch";
+  char token[32];
+  
+  memset (token, '\0', sizeof(token));
+  execute_token_script (token, cmd1, sizeof(token), "mac123", "ser456");
+  assert_string_equal (token, "SER_MAC ser456 mac123");
+  
+  memset (token, '\0', sizeof(token));
+  execute_token_script (token, cmd2, sizeof(token), "mac123", "ser456");
+  assert_string_equal (token, "");
+}
+
+void test_new_auth_token ()
+{
+  char token[64];
+  ParodusCfg cfg;
+  memset(&cfg,0,sizeof(cfg));
+
+  parStrncpy (cfg.token_acquisition_script, "../../tests/return_success.bsh",
+	sizeof(cfg.token_acquisition_script));
+  parStrncpy (cfg.token_read_script, "../../tests/return_ser_mac.bsh",
+	sizeof(cfg.token_read_script));
+  parStrncpy(cfg.hw_serial_number, "Fer23u948590", sizeof(cfg.hw_serial_number));
+  parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
+	
+  set_parodus_cfg(&cfg);
+  createNewAuthToken (token, sizeof(token));
+  assert_string_equal (token, "SER_MAC Fer23u948590 123567892366");
+  
+  memset (token, 0, sizeof(token));
+  parStrncpy (cfg.token_acquisition_script, "../../tests/return_failure.bsh",
+	sizeof(cfg.token_acquisition_script));
+  set_parodus_cfg(&cfg);
+  createNewAuthToken (token, sizeof(token));
+  assert_string_equal (token, "");  
+	
+}
+
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -581,6 +618,8 @@ int main(void)
        //cmocka_unit_test(test_parodusGitVersion),
        cmocka_unit_test(test_setDefaultValuesToCfg),
        cmocka_unit_test(err_setDefaultValuesToCfg),
+        cmocka_unit_test(test_execute_token_script),
+        cmocka_unit_test(test_new_auth_token)
    };

    return cmocka_run_group_tests(tests, NULL, NULL);
--- a/tests/test_connection.c
+++ b/tests/test_connection.c
@@ -381,6 +381,7 @@ void test_set_extra_headers ()
  create_connection_ctx_t ctx;
  ParodusCfg cfg;
  const char *expected_extra_headers =
+      "\r\nAuthorization: Bearer SER_MAC Fer23u948590 123567892366"
      "\r\nX-WebPA-Device-Name: mac:123567892366"
      "\r\nX-WebPA-Device-Protocols: wrp-0.11,getset-0.1"
      "\r\nUser-Agent: WebPA-1.6 (2.364s2; TG1682/ARRISGroup,Inc.;)"
@@ -389,13 +390,15 @@ void test_set_extra_headers ()
  memset(&cfg,0,sizeof(cfg));
  memset (&ctx, 0, sizeof(ctx));

-  cfg.client_cert_path = strdup("testcert");
+  parStrncpy (cfg.token_acquisition_script, "../../tests/return_success.bsh",
+	sizeof(cfg.token_acquisition_script));    
+  parStrncpy (cfg.token_read_script, "../../tests/return_ser_mac.bsh",
+	sizeof(cfg.token_read_script));
  parStrncpy(cfg.hw_serial_number, "Fer23u948590", sizeof(cfg.hw_serial_number));
  parStrncpy(cfg.hw_mac , "123567892366", sizeof(cfg.hw_mac));
  parStrncpy(cfg.hw_model, "TG1682", sizeof(cfg.hw_model));
  parStrncpy(cfg.hw_manufacturer , "ARRISGroup,Inc.", sizeof(cfg.hw_manufacturer));
  parStrncpy(cfg.fw_name , "2.364s2", sizeof(cfg.fw_name));
-  parStrncpy(cfg.cert_path , "/etc/ssl/certs/ca-certificates.crt", sizeof(cfg.cert_path));
  parStrncpy(cfg.webpa_protocol , "WebPA-1.6", sizeof(cfg.webpa_protocol));
 	
  set_parodus_cfg(&cfg);
@@ -407,9 +410,9 @@ void test_set_extra_headers ()
  assert_string_equal (ctx.header_info.conveyHeader, "WebPA-1.6 (TG1682)");
  set_extra_headers (&ctx, true);
  
+  assert_string_equal (get_parodus_cfg()->webpa_auth_token, 
+    "SER_MAC Fer23u948590 123567892366");
  assert_string_equal (ctx.extra_headers, expected_extra_headers);
-  if(cfg.client_cert_path !=NULL) {
-  free(cfg.client_cert_path); }
  free (ctx.extra_headers);
  free_header_info (&ctx.header_info);
 	
--- a/tests/test_upstream.c
+++ b/tests/test_upstream.c
@@ -273,6 +273,10 @@ void test_handleUpstreamNull()
    expect_function_call(nn_bind);
    will_return(nn_recv, 12);
    expect_function_call(nn_recv);
+    will_return(nn_shutdown, 0);
+    expect_function_call(nn_shutdown);
+    will_return(nn_close, 0);
+    expect_function_call(nn_close);
    handle_upstream();
 }

@@ -294,6 +298,10 @@ void test_handle_upstream()
    expect_function_call(nn_bind);
    will_return(nn_recv, 12);
    expect_function_call(nn_recv);
+    will_return(nn_shutdown, 0);
+    expect_function_call(nn_shutdown);
+    will_return(nn_close, 0);
+    expect_function_call(nn_close);
    handle_upstream();
    free(UpStreamMsgQ->next);
    free(UpStreamMsgQ);
Author	SHA1	Message	Date
shilpa24balaji	117db39c64	Merge pull request #304 from bill1600/clrtoken3p4 clr auth token if fetch fails	2019-05-15 20:05:05 -07:00
Bill Williams	0ac7605a3b	clr auth token if fetch fails	2019-05-14 16:25:34 -07:00
Bill Williams	e03b795989	log all nn_close	2019-04-02 23:00:02 -07:00
Bill Williams	950954ee4d	close client when deleting from client list	2019-04-02 22:59:50 -07:00
Bill Williams	a2909de3ca	use endpoint in nn_shutdown and log nn_close errors	2019-04-02 22:59:29 -07:00
Bill Williams	1fd9cccaac	fix mutex error in service alive	2019-04-02 22:55:34 -07:00
Bill Williams	561113fe0a	fix test_upstream test	2019-04-02 22:55:22 -07:00
Bill Williams	1bc804f445	add nn_close to nn_shutdown	2019-04-02 22:55:10 -07:00