!582 AI告警

Merge pull request !582 from 毕水秀/master

entry/src/main/ets/Ability/data/IIdlDlpRpcServiceTs/id_dlpRpc_service_stub.ets

@@ -41,7 +41,7 @@ export default class IdDlpRpcServiceStub extends rpc.RemoteObject implements IId
   }
 
   private checkParams(code: number, data: rpc.MessageSequence): boolean {
-    if (code === null || code === undefined || !data) {
+    if (Number.isNaN(code) || !data) {
       HiLog.error(TAG, 'params is invalid');
       return false;
     }
@@ -128,6 +128,7 @@ export default class IdDlpRpcServiceStub extends rpc.RemoteObject implements IId
       });
     } catch (err) {
       HiLog.wrapError(TAG, err, 'genDlpFileInner failed');
+      reply.writeInt(err.errCode);
     }
   }
 
@@ -143,6 +144,7 @@ export default class IdDlpRpcServiceStub extends rpc.RemoteObject implements IId
       });
     } catch (err) {
       HiLog.wrapError(TAG, err, 'openDlpFileInner failed');
+      reply.writeInt(err.errCode);
     }
   }
 
@@ -154,6 +156,7 @@ export default class IdDlpRpcServiceStub extends rpc.RemoteObject implements IId
       });
     } catch (err) {
       HiLog.wrapError(TAG, err, 'stopFuseLinkInner failed');
+      reply.writeInt(err.errCode);
     }
   }
 
@@ -165,6 +168,7 @@ export default class IdDlpRpcServiceStub extends rpc.RemoteObject implements IId
       });
     } catch (err) {
       HiLog.wrapError(TAG, err, 'resumeFuseLinkInner failed');
+      reply.writeInt(err.errCode);
     }
   }
 
@@ -177,6 +181,7 @@ export default class IdDlpRpcServiceStub extends rpc.RemoteObject implements IId
       });
     } catch (err) {
       HiLog.wrapError(TAG, err, 'replaceDlpLinkFileInner failed');
+      reply.writeInt(err.errCode);
     }
   }
 
@@ -190,6 +195,7 @@ export default class IdDlpRpcServiceStub extends rpc.RemoteObject implements IId
       });
     } catch (err) {
       HiLog.wrapError(TAG, err, 'recoverDlpFileInner failed');
+      reply.writeInt(err.errCode);
     }
   }
 
@@ -202,6 +208,7 @@ export default class IdDlpRpcServiceStub extends rpc.RemoteObject implements IId
       });
     } catch (err) {
       HiLog.wrapError(TAG, err, 'closeDlpFileInner failed');
+      reply.writeInt(err.errCode);
     }
   }
 
@@ -218,6 +225,7 @@ export default class IdDlpRpcServiceStub extends rpc.RemoteObject implements IId
       });
     } catch (err) {
       HiLog.wrapError(TAG, err, 'sandBoxLinkFileInner failed');
+      reply.writeInt(err.errCode);
     }
   }
 
@@ -230,6 +238,7 @@ export default class IdDlpRpcServiceStub extends rpc.RemoteObject implements IId
       });
     } catch (err) {
       HiLog.wrapError(TAG, err, 'fileOpenHistoryInner failed');
+      reply.writeInt(err.errCode);
     }
   }
 
@@ -242,6 +251,7 @@ export default class IdDlpRpcServiceStub extends rpc.RemoteObject implements IId
       });
     } catch (err) {
       HiLog.wrapError(TAG, err, 'linkSetInner failed');
+      reply.writeInt(err.errCode);
     }
   }
 

entry/src/main/ets/OpenDlpFile/handler/FileParseHandler.ets

@@ -128,11 +128,12 @@ class ZipParse extends FileParseBase {
   }
 
   parseDlpCert(certSize: number, fileName: string): Result<CertInfo> {
+    let dlpCert: fs.File | undefined;
     try {
       let accountType: number = 0;
       let certString: string = '';
       if (certSize !== 0) { // 6.0之后的版本，生成的zip格式的dlp文件
-        const dlpCert = fs.openSync(fileName, fs.OpenMode.READ_ONLY);
+        dlpCert = fs.openSync(fileName, fs.OpenMode.READ_ONLY);
         let cert = new ArrayBuffer(certSize);
         const option: ReadOptions = { offset: 0, length: certSize };
         fs.readSync(dlpCert.fd, cert, option);
@@ -153,6 +154,8 @@ class ZipParse extends FileParseBase {
     } catch (error) {
       HiLog.error(TAG, 'parseDlpCert error');
       return ResultMsg.getErrMsg(Constants.ERR_JS_NOT_DLP_FILE);
+    } finally {
+      FileUtil.closeSync(dlpCert);
     }
   }
 

entry/src/main/ets/rpc/CredCallbackStub.ets

@@ -32,7 +32,7 @@ export default class CredCallbackStub extends rpc.RemoteObject {
   }
 
   private checkParams(code: number, data: rpc.MessageSequence): boolean {
-    if (code === null || code === undefined || !data) {
+    if (Number.isNaN(code) || !data) {
       HiLog.error(TAG, 'ViewAbilityStub params is invalid');
       return false;
     }

entry/src/main/ets/rpc/DlpPermissionAbilityServiceStub.ets

@@ -60,7 +60,7 @@ export default class DlpPermissionAbilityServiceStub extends rpc.RemoteObject {
 
   onRemoteMessageRequest(code: number, data: rpc.MessageSequence, reply: rpc.MessageSequence,
     options: rpc.MessageOption): boolean {
-    if (code === null || code === undefined || !data || !reply) {
+    if (Number.isNaN(code) || !data || !reply) {
       HiLog.error(TAG, `Input params is invalid`);
       return false;
     }

entry/src/main/ets/rpc/OpeningDialog/stub/OpeningDialogStub.ets

@@ -31,7 +31,7 @@ export default class OpeningDialogStub extends rpc.RemoteObject {
   }
 
   private checkParams(code: number, data: rpc.MessageSequence): boolean {
-    if (code === null || code === undefined || !data) {
+    if (Number.isNaN(code) || !data) {
       HiLog.error(TAG, 'OpeningDialogStub params is invalid');
       return false;
     }

entry/src/main/ets/rpc/ViewAbility/stub/ViewAbilityStub.ets

@@ -32,7 +32,7 @@ export default class ViewAbilityStub extends rpc.RemoteObject {
   }
 
   private checkParams(code: number, data: rpc.MessageSequence): boolean {
-    if (code === null || code === undefined || !data) {
+    if (Number.isNaN(code) || !data) {
       HiLog.error(TAG, 'ViewAbilityStub params is invalid');
       return false;
     }