[Feature][T8TSK-291]modify the sensitive information in syslog (imei log)
Only Configure: No
Affected branch: GSW3.0-No-Connman
Affected module: log
Is it affected on both ZXIC and MTK: only MTK
Self-test: Yes
Doc Update: No
Change-Id: Ifa0d8f28791a0a58ab8d8a4e3176675d6c05d7ea
diff --git a/src/lynq/framework/lynq-ril-service/src/ril.cpp b/src/lynq/framework/lynq-ril-service/src/ril.cpp
index 01829e2..a30b0af 100755
--- a/src/lynq/framework/lynq-ril-service/src/ril.cpp
+++ b/src/lynq/framework/lynq-ril-service/src/ril.cpp
@@ -306,6 +306,7 @@
static int responseString(Parcel &p, void *response, size_t responselen);
//xf.li@20231120 modify for T8TSK-291 start
static int responseStringNoLog(Parcel &p, void *response, size_t responselen);
+static int responseStringsNoLog(Parcel &p, void *response, size_t responselen);
//xf.li@20231120 modify for T8TSK-291 end
static int responseVoid(Parcel &p, void *response, size_t responselen);
static int responseCallList(Parcel &p, void *response, size_t responselen);
@@ -2181,6 +2182,43 @@
writeStringToParcel(p, (const char *)response);
return 0;
}
+
+static int responseStringsNoLog(Parcel &p, void *response, size_t responselen) {
+ int numStrings;
+ char log_buf[512] = {0};
+
+ if (response == NULL && responselen != 0) {
+ RLOGE("invalid response: NULL");
+ return RIL_ERRNO_INVALID_RESPONSE;
+ }
+ if (responselen % sizeof(char *) != 0) {
+ RLOGE("responseStrings: invalid response length %d expected multiple of %d\n",
+ (int)responselen, (int)sizeof(char *));
+ return RIL_ERRNO_INVALID_RESPONSE;
+ }
+
+ if (response == NULL) {
+ p.writeInt32 (0);
+ } else {
+ char **p_cur = (char **) response;
+
+ numStrings = responselen / sizeof(char *);
+ p.writeInt32 (numStrings);
+
+ /* each string*/
+ startResponse;
+ for (int i = 0 ; i < numStrings ; i++) {
+ //appendPrintBuf("%s%s,", printBuf, (char*)p_cur[i]);
+ memset(log_buf, 0, sizeof(log_buf));
+ snprintf(log_buf, sizeof(log_buf), "%s,", (char*)p_cur[i]);
+ encode_log(log_buf, 6);
+ writeStringToParcel (p, p_cur[i]);
+ }
+ removeLastChar;
+ closeResponse;
+ }
+ return 0;
+}
//xf.li@20231120 modify for T8TSK-291 end
static int responseVoid(Parcel &p, void *response, size_t responselen) {
startResponse;
diff --git a/src/lynq/framework/lynq-ril-service/src/ril_commands.h b/src/lynq/framework/lynq-ril-service/src/ril_commands.h
index 362bb7d..d90c8ba 100755
--- a/src/lynq/framework/lynq-ril-service/src/ril_commands.h
+++ b/src/lynq/framework/lynq-ril-service/src/ril_commands.h
@@ -114,7 +114,9 @@
{RIL_REQUEST_CDMA_SUBSCRIPTION, dispatchVoid, responseStrings},
{RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM, dispatchRilCdmaSmsWriteArgs, responseInts},
{RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM, dispatchInts, responseVoid},
- {RIL_REQUEST_DEVICE_IDENTITY, dispatchVoid, responseStrings},
+ //xf.li@20231205 modify for T8TSK-291 start
+ {RIL_REQUEST_DEVICE_IDENTITY, dispatchVoid, responseStringsNoLog},
+ //xf.li@20231120 modify for T8TSK-291 end
{RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE, dispatchVoid, responseVoid},
{RIL_REQUEST_GET_SMSC_ADDRESS, dispatchVoid, responseString},
{RIL_REQUEST_SET_SMSC_ADDRESS, dispatchString, responseVoid},
diff --git a/src/telephonyware/3.0/hardware/ril/fusion/libril/rilmipc/telephony/sys/RpSysController.cpp b/src/telephonyware/3.0/hardware/ril/fusion/libril/rilmipc/telephony/sys/RpSysController.cpp
index f6ad76e..89b2acb 100644
--- a/src/telephonyware/3.0/hardware/ril/fusion/libril/rilmipc/telephony/sys/RpSysController.cpp
+++ b/src/telephonyware/3.0/hardware/ril/fusion/libril/rilmipc/telephony/sys/RpSysController.cpp
@@ -134,8 +134,10 @@
mipc_sys_info_struct *result_ptr,
void *cb_priv_ptr
) {
- RFX_LOG_D(RFX_LOG_TAG,"mipc_sys_info_get_cb:sim_ps_id %d data %s firmware_info %s\n",
- sim_ps_id,result_ptr->device_id,result_ptr->firmware_info);
+//xf.li@20231204 modify for T8TSK-291 start
+ RFX_LOG_D(RFX_LOG_TAG,"mipc_sys_info_get_cb:sim_ps_id %d data imei(has got) firmware_info %s\n",
+ sim_ps_id,result_ptr->firmware_info);
+//xf.li@20231204 modify for T8TSK-291 end
Parcel * parcel = NULL;
RIL_Errno err = RIL_E_SUCCESS;
android::RequestInfo *requestInfo = (android::RequestInfo *)cb_priv_ptr;
diff --git a/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/framework/base/RfxTransferUtils.cpp b/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/framework/base/RfxTransferUtils.cpp
index ad71e64..b734ad9 100755
--- a/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/framework/base/RfxTransferUtils.cpp
+++ b/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/framework/base/RfxTransferUtils.cpp
@@ -1656,7 +1656,7 @@
if (p->dataAvail() > 0) {
p->readInt32 (&countStrings);
appendPrintBuf("%d:",countStrings);
-
+//xf.li@20231204 modify for T8TSK-291 end
if (countStrings == 0) {
// just some non-null pointer
pStrings = (char **)alloca(sizeof(char *));
@@ -1671,8 +1671,17 @@
for (int i = 0 ; i < countStrings ; i++) {
pStrings[i] = strdupReadString(p);
- appendPrintBuf("%s, ",pStrings[i]);
+//xf.li@20231204 modify for T8TSK-291 start
+ if(strcmp(requestToString(id), "DEVICE_IDENTITY") == 0 && i == 0)
+ {
+ appendPrintBuf("imei(has got), ");
+ }
+ else
+ {
+ appendPrintBuf("%s, ",pStrings[i]);
+ }
}
+//xf.li@20231204 modify for T8TSK-291 end
}
}