Skip to content

RDKB-64112: Account ID check removal from IDM #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
veeraputhiran-thangavel wants to merge 13 commits into
base: develop
Choose a base branch
from
+220 −54
Open

RDKB-64112: Account ID check removal from IDM #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5cb526e
Remove accountId validation gates from idm_client.c
veeraputhiran-thangavel Mar 25, 2026
6d07c43
Apply suggestion from @Copilot
veeraputhiran-thangavel Mar 26, 2026
8d346a1
Make device association unconditional; treat GetAccountId as optional
veeraputhiran-thangavel Mar 26, 2026
52dc00b
Add Consolelog and T2 telemetry markers for IDM pairing events
veeraputhiran-thangavel Mar 27, 2026
f4755b1
idm: redirect IDM logs to Consolelog.txt.0
veeraputhiran-thangavel Apr 13, 2026
45c2ccf
Update src/idm_log.c
veeraputhiran-thangavel Apr 13, 2026
2bdb3a3
idm_log: append newline automatically in idm_consolelog; update call …
Copilot Apr 13, 2026
b94fc4a
idm: add IDM_LOG_ERR dual-logging for all error paths in idm_client.c
veeraputhiran-thangavel Apr 13, 2026
5a31a2b
idm: remove flooding-risk IDM_LOG_ERR calls from verify_devices loop
veeraputhiran-thangavel Apr 13, 2026
3971804
idm: fix fopen fallback, strip trailing \n from log call sites
veeraputhiran-thangavel Apr 14, 2026
13ff1a7
idm: remove IDM_LOG_INFO calls already covered by CcspTraceInfo
veeraputhiran-thangavel Apr 14, 2026
aa90f70
Merge branch 'develop' into remove_xle_accountid_check_v3
snayak002c May 8, 2026
407ce53
xupnp: route IDM logs to InterDeviceManager.txt.0; redact cert paths
veeraputhiran-thangavel May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ if BROADBAND_SUPPORT
xcal_device_LDADD = $(top_builddir)/broadband/lib/libxdevice.la
if RDKB_INTER_DEVICE_MANAGER_SUPPORT
lib_LTLIBRARIES = libupnpidm.la
libupnpidm_la_SOURCES = idm_server.c idm_client.c idm_library.c
libupnpidm_la_SOURCES = idm_server.c idm_client.c idm_library.c idm_log.c
endif
endif
if VIDEO_SUPPORT
Expand Down
103 changes: 50 additions & 53 deletions src/idm_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@
#ifdef ENABLE_HW_CERT_USAGE
#include "rdkconfig.h"
#endif
#if defined(ENABLE_FEATURE_TELEMETRY2_0)
#include <telemetry_busmessage_sender.h>
#endif
#include "idm_log.h"
#define CLIENT_CONTEXT_PORT 50767
#define IDM_CLIENT_DEVICE "urn:schemas-upnp-org:device:IDM:1"
#define IDM_SERVICE "urn:schemas-upnp-org:service:X1IDM:1"
Expand All @@ -75,7 +79,6 @@ char se_cert_conf_file[128];

static int fd = -1;
static gboolean idm_upnp_init_status = FALSE;
static char accountId[ACCOUNTID_SIZE];
static GUPnPContext *upnpContextDeviceProtect;
static GMainLoop *main_loop;
typedef GTlsInteraction XupnpTlsInteraction;
Expand Down Expand Up @@ -270,6 +273,7 @@ xupnp_tls_interaction_request_certificate (GTlsInteraction *interac
if(rdkconfig_get(&pass_phrase, &pass_size, se_cert_conf_file) == RDKCONFIG_FAIL)
{
g_message("Error in getting passcode\n");
IDM_LOG_ERR("rdkconfig_get failed for SE cert passcode");
}
else
{
Expand All @@ -288,6 +292,8 @@ xupnp_tls_interaction_request_certificate (GTlsInteraction *interac
else
{
g_message(" Failed to generate g_tls cert from SE certificate\n");
IDM_LOG_ERR("g_tls_certificate_new_from_file_with_password failed: %s",
xupnp_error ? xupnp_error->message : "unknown error");
if(xupnp_error)
{
g_message(" %s\n",xupnp_error->message);
Expand All @@ -311,12 +317,14 @@ xupnp_tls_interaction_request_certificate (GTlsInteraction *interac
if ((certFile[0] == '\0') || (keyFile[0] == '\0')) {

g_message(" Certificate or Key file NULL");
IDM_LOG_ERR("certFile or keyFile path is empty (HW cert fallback path)");
return G_TLS_INTERACTION_FAILED;
}

if((access(certFile,F_OK ) != 0) || (access(keyFile,F_OK ) != 0)) {

g_message(" Certificate or Key file does not exist");
IDM_LOG_ERR("certFile or keyFile not found");
return G_TLS_INTERACTION_FAILED;
}

Expand All @@ -326,6 +334,7 @@ xupnp_tls_interaction_request_certificate (GTlsInteraction *interac
if(cert == NULL) {

g_message("Certificate creation failed from cert and key files");
IDM_LOG_ERR("g_tls_certificate_new_from_files failed");

if(xupnp_error != NULL) {

Expand All @@ -341,12 +350,14 @@ xupnp_tls_interaction_request_certificate (GTlsInteraction *interac
if ((certFile[0] == '\0') || (keyFile[0] == '\0')) {

g_message(" Certificate or Key file NULL");
IDM_LOG_ERR("certFile or keyFile path is empty");
return G_TLS_INTERACTION_FAILED;
}

if((access(certFile,F_OK ) != 0) || (access(keyFile,F_OK ) != 0)) {

g_message(" Certificate or Key file does not exist");
IDM_LOG_ERR("certFile or keyFile not found");
return G_TLS_INTERACTION_FAILED;
}

Expand All @@ -356,6 +367,7 @@ xupnp_tls_interaction_request_certificate (GTlsInteraction *interac
if(cert == NULL) {

g_message("Certificate creation failed from cert and key files");
IDM_LOG_ERR("g_tls_certificate_new_from_files failed");

if(xupnp_error != NULL) {
g_message("Failure reason for certificate creation: %s\n", xupnp_error->message );
Copy link
Copy Markdown

@johnsonsebastiar johnsonsebastiar May 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need this error message in the log file?

Expand Down Expand Up @@ -421,6 +433,7 @@ GError *error = NULL;
if ( NULL != error ) //Didn't went well
{
g_message ("%s process gw services Error: %s\n", requestFn, error->message);
IDM_LOG_ERR("gupnp_service_proxy_send_action failed fn=%s error=%s", requestFn, error->message);
if ( isInCriticalPath ) // Update telemetry
{
g_message("TELEMETRY_XUPNP_PARTIAL_DISCOVERY:%d,%s",error->code, requestFn);
Expand Down Expand Up @@ -657,6 +670,7 @@ device_proxy_available_cb_bgw (GUPnPControlPoint *cp, GUPnPDeviceProxy *dproxy)
{
deviceAddNo--;
g_message("WARNING - Received a null pointer for broadband device device no %u",deviceAddNo);
IDM_LOG_ERR("null pointer received for broadband device no %u", deviceAddNo);
return;
}
gchar* sno = gupnp_device_info_get_serial_number (GUPNP_DEVICE_INFO (dproxy));
Expand Down Expand Up @@ -710,51 +724,27 @@ device_proxy_available_cb_bgw (GUPnPControlPoint *cp, GUPnPDeviceProxy *dproxy)
g_message("GatewayIPv6=%s",di.Ipv6);
g_free(temp);
}
if ( processStringRequest((GUPnPServiceProxy *)gwydata->sproxy_i, "GetAccountId","AccountId", &temp, FALSE))
{
int valid_account=1,loop=0;
g_message("Discovered device sent accountId as %s",temp);
for(loop=0;loop<(int)(strlen(temp));loop++)
{
if(temp[loop] < '0' || temp[loop] > '9')
{
g_message("not a valid account due to %c presence",temp[loop]);
valid_account=0;
break;
}
}
if(valid_account==1)
{
g_message("Discovered device AccountId is valid");
if(g_strcmp0(g_strstrip(accountId),temp)==0)
{
g_mutex_lock(mutex);
xdevlist = g_list_insert_sorted_with_data(xdevlist, gwydata,(GCompareDataFunc)g_list_compare_sno, NULL);
g_mutex_unlock(mutex);
g_message("Inserted new/updated device %s in the list as accountId %s is same", sno,temp);
callback(&di,1,1);
}
else
{
g_message("Not adding to the list as accountId %s is different",temp);
}
}
else
{
g_message("Its not valid accountID so accountId %s not adding to the list",temp);
}
g_free(temp);
}
g_mutex_lock(mutex);
xdevlist = g_list_insert_sorted_with_data(xdevlist, gwydata,(GCompareDataFunc)g_list_compare_sno, NULL);
g_mutex_unlock(mutex);
g_message("Associating device %s", sno);
g_message("TELEMETRY_IDM_DEVICE_ASSOCIATED:%s", sno);
#if defined(ENABLE_FEATURE_TELEMETRY2_0)
t2_event_s("IDM_DEVICE_ASSOCIATED_split", sno);
#endif
callback(&di,1,1);
Comment thread
veeraputhiran-thangavel marked this conversation as resolved.
}
else
{
g_message("In available_cb_bgw gateway device receiver id is NULL");
IDM_LOG_ERR("gateway device receiver id is NULL sno=%s", sno);
}
Comment on lines 739 to 741
}
}
else
{
g_message("Gateway UDN is NULL");
IDM_LOG_ERR("gateway UDN is NULL sno=%s", sno);
}
Comment on lines 745 to 748
}
g_free(sno);
Expand All @@ -770,6 +760,7 @@ static void device_proxy_available_cb (GUPnPControlPoint *cp, GUPnPDeviceProxy *
{
deviceAddNo--;
g_message("WARNING - Received a null pointer for gateway device device no %u",deviceAddNo);
IDM_LOG_ERR("null pointer received for gateway device no %u", deviceAddNo);
return;
}
gchar* sno = gupnp_device_info_get_serial_number (GUPNP_DEVICE_INFO (dproxy));
Expand All @@ -789,13 +780,15 @@ static void device_proxy_available_cb (GUPnPControlPoint *cp, GUPnPDeviceProxy *
else
{
g_critical("Could not allocate memory for Gwydata. Exiting...");
IDM_LOG_ERR("could not allocate memory for GwyData, exiting");
exit(1);
}
gwydata->sproxy = gupnp_device_info_get_service(GUPNP_DEVICE_INFO (dproxy), IDM_SERVICE);
if(!gwydata->sproxy)
{
deviceAddNo--;
g_message("Unable to get the services, sproxy null. returning");
IDM_LOG_ERR("unable to get services sproxy null sno=%s", sno ? sno : "NULL");
return;
Comment on lines 786 to 792
}
if (sno != NULL)
Expand Down Expand Up @@ -841,14 +834,24 @@ static void device_proxy_available_cb (GUPnPControlPoint *cp, GUPnPDeviceProxy *
xdevlist = g_list_insert_sorted_with_data(xdevlist, gwydata,(GCompareDataFunc)g_list_compare_sno, NULL);
g_mutex_unlock(mutex);
g_message("Inserted new/updated device %s in the list", sno);
g_message("TELEMETRY_IDM_DEVICE_ASSOCIATED:%s", sno);
#if defined(ENABLE_FEATURE_TELEMETRY2_0)
t2_event_s("IDM_DEVICE_ASSOCIATED_split", sno);
#endif
callback(&di,1,0);
}
else
{
g_message("Device receiver id is NULL");
IDM_LOG_ERR("device receiver id is NULL sno=%s", sno);
}
Comment on lines 843 to +847
}
}
else
{
g_message("Device UDN is NULL");
IDM_LOG_ERR("device UDN is NULL sno=%s", sno);
}
Comment on lines 850 to +854
}
g_free(sno);
deviceAddNo--;
Expand Down Expand Up @@ -907,6 +910,8 @@ void start_discovery(discovery_config_t* dc_obj,int (*func_callback)(device_info
{
g_message("some of mandatory values are missing");
g_message("interface=%s port=%d discovery_interval=%d loss_detection_window=%d\n", dc_obj->interface, dc_obj->port, dc_obj->discovery_interval, dc_obj->loss_detection_window);
IDM_LOG_ERR("mandatory values missing interface=%s port=%d interval=%d window=%d",
dc_obj->interface, dc_obj->port, dc_obj->discovery_interval, dc_obj->loss_detection_window);
return;
}
g_message("interface=%s port=%d",dc_obj->interface,dc_obj->port);
Expand All @@ -916,23 +921,9 @@ void start_discovery(discovery_config_t* dc_obj,int (*func_callback)(device_info
ownSerialNo=g_string_new(NULL);
getserialnum(ownSerialNo);
callback=func_callback;
#ifndef IDM_DEBUG
int ind=-1;
errno_t rc = -1;
memset(accountId,0,ACCOUNTID_SIZE);
while(1)
{
getAccountId(accountId);
g_message("%s:AccountId=%s",__FUNCTION__,accountId);
rc = strcasecmp_s("unknown",strlen("unknown"),accountId,&ind);
ERR_CHK(rc);
if(ind || rc != EOK)
{
break;
}
sleep(5);
}
g_message("%s:Account ID complete.AccountId = %s", __FUNCTION__, accountId);
g_message("TELEMETRY_IDM_DISCOVERY_STARTED:%s", ownSerialNo->str);
Copy link
Copy Markdown

@johnsonsebastiar johnsonsebastiar May 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we do a NULL check before using ownSerialNo->str?

#if defined(ENABLE_FEATURE_TELEMETRY2_0)
t2_event_s("IDM_DISCOVERY_STARTED_split", ownSerialNo->str);
#endif
#ifndef IDM_DEBUG
#ifndef ENABLE_HW_CERT_USAGE
Expand Down Expand Up @@ -966,6 +957,7 @@ void start_discovery(discovery_config_t* dc_obj,int (*func_callback)(device_info
if(access(se_cert_p12, F_OK ) == -1)
{
g_message("Cannot create p12 cert file");
IDM_LOG_ERR("cannot create p12 cert file");
}
else
{
Expand All @@ -982,6 +974,7 @@ void start_discovery(discovery_config_t* dc_obj,int (*func_callback)(device_info
strncpy(certFile, dc_obj->sslCert, sizeof(certFile) -1);
strncpy(keyFile, dc_obj->sslKey, sizeof(keyFile) -1);
g_message("SE HW certificate is not accessible.");
IDM_LOG_ERR("SE HW certificate not accessible, falling back to software cert");

}
#endif
Expand All @@ -990,6 +983,7 @@ void start_discovery(discovery_config_t* dc_obj,int (*func_callback)(device_info
if(rvalue==1)
{
g_message("id_server_start has facing some issue");
IDM_LOG_ERR("idm_server_start failed rvalue=%d", rvalue);
return;
}
mutex = g_mutex_new ();
Expand Down Expand Up @@ -1056,6 +1050,7 @@ void start_discovery(discovery_config_t* dc_obj,int (*func_callback)(device_info
if(0 != err)
{
g_message("%s: create the event handle thread error!\n", __FUNCTION__);
IDM_LOG_ERR("pthread_create EventHandler failed err=%d", err);
}
}
cp_bgw = gupnp_control_point_new(upnpContextDeviceProtect, IDM_DP_CLIENT_DEVICE);
Expand All @@ -1068,6 +1063,7 @@ void start_discovery(discovery_config_t* dc_obj,int (*func_callback)(device_info
else
{
g_message("%s:mandatory files doesn't present",__FUNCTION__);
IDM_LOG_ERR("mandatory cert/key files not present, running without TLS");
}
#ifdef GUPNP_0_19
main_loop = g_main_loop_new (NULL, FALSE);
Expand All @@ -1089,6 +1085,7 @@ void start_discovery(discovery_config_t* dc_obj,int (*func_callback)(device_info
if (error) {
g_message ("Error creating the GUPnP context: %s", error->message);
g_critical("%s:Error creating the XUPnP context on %s:%d Error:%s", __FUNCTION__,dc_obj->interface, CLIENT_CONTEXT_PORT, error->message);
IDM_LOG_ERR("GUPnP context creation failed on %s:%d error=%s", dc_obj->interface, CLIENT_CONTEXT_PORT, error->message);
g_error_free (error);
return;
}
Expand Down
Loading
Loading