openharmony/applications_dlp_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_dlp_manager synced 2024-11-26 19:40:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!290 适配welink打开dlp文件，同步修改dlp权限管理hap

Browse Source 
Merge pull request !290 from 王永忠/master
This commit is contained in:
openharmony_ci 2024-10-18 06:22:38 +00:00 committed by Gitee
commit 3dcac3ae01
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AppScope/app.json
View File

@ -2,8 +2,8 @@
"app": {
"bundleName": "com.ohos.dlpmanager",
"vendor": "example",
"versionCode": 1000111,
"versionName": "1.0.1.11",
"versionCode": 1000112,
"versionName": "1.0.1.12",
"icon": "$media:app_icon",
"label": "$string:app_name",
"minAPIVersion": 12,

4
AppScope/app.json5
View File

@ -16,8 +16,8 @@
"app": {
"bundleName": "com.ohos.dlpmanager",
"vendor": "example",
"versionCode": 1000111,
"versionName": "1.0.1.11",
"versionCode": 1000112,
"versionName": "1.0.1.12",
"icon": "$media:app_icon",
"label": "$string:app_name",
"minAPIVersion": 12,

43
entry/src/main/ets/ViewAbility/ViewAbility.ets
View File

@ -59,6 +59,10 @@ import { ObjectUtil } from '../common/ObjectUtil';
const TAG = 'View';
const SUFFIX_INDEX = 2;
interface DlpConnectionPluginIdObj {
id: string
}
let opening: boolean = false;
export default class ViewAbility extends ServiceExtensionAbility {
private dlpFd: number = -1;
@ -68,6 +72,7 @@ export default class ViewAbility extends ServiceExtensionAbility {
private tokenId: number = -1;
private dlpFile: dlpPermission.DLPFile = defaultDlpFile;
private authPerm: dlpPermission.DLPFileAccess = dlpPermission.DLPFileAccess.READ_ONLY;
private needCallAccount: boolean = true;
private sandboxBundleName: string = '';
private sandboxAbilityName: string = '';
private sandboxModuleName: string = '';
@ -413,7 +418,7 @@ export default class ViewAbility extends ServiceExtensionAbility {
async dlpGetAuthPerm(): Promise<void> {
return new Promise(async (resolve, reject) => {
if (this.accountType === dlpPermission.AccountType.DOMAIN_ACCOUNT) {
if (this.needCallAccount && this.accountType === dlpPermission.AccountType.DOMAIN_ACCOUNT) {
this.authPerm = getAuthPerm(this.accountInfo?.domainInfo.accountName ?? '', this.dlpFile.dlpProperty);
} else {
this.authPerm = dlpPermission.DLPFileAccess.READ_ONLY;
@ -692,6 +697,30 @@ export default class ViewAbility extends ServiceExtensionAbility {
})
}
async checkNeedCallAccount(): Promise<boolean> {
switch (this.accountType) {
case dlpPermission.AccountType.CLOUD_ACCOUNT: {
return true;
}
case dlpPermission.AccountType.DOMAIN_ACCOUNT: {
try {
this.accountInfo = await getOsAccountInfo();
} catch (err) {
HiLog.error(TAG, 'getOsAccountInfo failed: ${JSON.stringify(err)}');
return true;
}
if (this.accountInfo.domainInfo.accountName === '') {
HiLog.debug(TAG, 'not need check call account');
return false;
}
}
defalut: {
break;
}
}
return true;
}
grandUriPermission() {
let flag = wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION |
wantConstant.Flags.FLAG_AUTH_PERSISTABLE_URI_PERMISSION;
@ -705,6 +734,13 @@ export default class ViewAbility extends ServiceExtensionAbility {
HiLog.debug(TAG, `enter onRequest`);
let paramCallerBundleName = want.parameters?.['ohos.aafwk.param.callerBundleName'] as string;
AppStorage.setOrCreate('paramCallerBundleName', paramCallerBundleName);
let pluginId: string = (want.parameters?.['DlpConnectionPluginId'] as DlpConnectionPluginIdObj)?.id;
if (pluginId !== null && pluginId !== undefined && paramCallerBundleName !== 'com.huawei.it.welink') {
HiLog.debug(TAG, 'call bundle name is: ${JSON.stringify(paramCallerBundleName)}');
return;
}
try {
await this.dlpFileMapHistory(want);
this.accountType = await getAccountType(this.context, this.dlpFd);
@ -716,6 +752,7 @@ export default class ViewAbility extends ServiceExtensionAbility {
this.sandboxBundleName = want.parameters?.['ohos.dlp.params.bundleName'] as string;
this.sandboxAbilityName = want.parameters?.['ohos.dlp.params.abilityName'] as string;
this.sandboxModuleName = want.parameters?.['ohos.dlp.params.moduleName'] as string;
this.needCallAccount = await this.checkNeedCallAccount();
if (this.fileName === undefined || this.dlpFd === undefined || this.uri === undefined ||
this.sandboxBundleName === undefined || this.sandboxAbilityName === undefined ||
this.sandboxModuleName === undefined || !this.uri.endsWith('.dlp')) {
@ -740,7 +777,9 @@ export default class ViewAbility extends ServiceExtensionAbility {
}
}
try {
await this.getAccountAndOpenDLPFile(startId);
if (this.needCallAccount) {
await this.getAccountAndOpenDLPFile(startId);
}
await this.getPolicyAndInstallSandbox(startId);
await this.getUriInfo(startId);
} catch {