From 78d7273dd1a0cb655d10db5f0b93648d1f4d5f42 Mon Sep 17 00:00:00 2001 From: xiongqiao Date: Thu, 8 Jun 2023 16:25:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E5=92=8C=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0=20Signed?= =?UTF-8?q?-off-by:xiongqiao3@huawei.com?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xiongqiao --- bundle.json | 8 +- .../jskits/@ohos.PrintExtensionAbility.d.ts | 200 +++++++++--------- interfaces/kits/jskits/@ohos.print.d.ts | 2 +- .../kits/jsnapi/extension/print_extension.js | 62 +++--- .../extensionctx/print_extension_context.js | 72 +++---- services/src/print_security_guard_manager.cpp | 2 +- test/fuzztest/printservice_fuzzer/BUILD.gn | 13 ++ 7 files changed, 189 insertions(+), 170 deletions(-) diff --git a/bundle.json b/bundle.json index ac53e2f3..77e63ec8 100644 --- a/bundle.json +++ b/bundle.json @@ -37,6 +37,7 @@ "hisysevent_native", "hitrace_native", "hiviewdfx_hilog_native", + "i18n", "init", "ipc", "ipc_js", @@ -45,10 +46,15 @@ "os_account", "preferences", "relational_store", + "resource_management", "safwk", - "samgr" + "samgr", + "security_guard", + "time_service" ], "third_party": [ + "thirdparty_googletest", + "zlib" ] }, "build": { diff --git a/interfaces/kits/jskits/@ohos.PrintExtensionAbility.d.ts b/interfaces/kits/jskits/@ohos.PrintExtensionAbility.d.ts index 028be954..452bebdd 100644 --- a/interfaces/kits/jskits/@ohos.PrintExtensionAbility.d.ts +++ b/interfaces/kits/jskits/@ohos.PrintExtensionAbility.d.ts @@ -27,113 +27,113 @@ import print from "./@ohos.print"; export default class PrintExtensionAbility { - /** - * Called once to initialize the extensionAbility. - * - * @systemapi Hide this for inner system use. - * @since 9 - * @syscap SystemCapability.Print.PrintFramework - * @return - - * @StageModelOnly - */ - onCreate(want: Want): void; + /** + * Called once to initialize the extensionAbility. + * + * @systemapi Hide this for inner system use. + * @since 9 + * @syscap SystemCapability.Print.PrintFramework + * @return - + * @StageModelOnly + */ + onCreate(want: Want): void; - /** - * Called once to start to discover the printers connected with the device. - * - * @systemapi Hide this for inner system use. - * @since 9 - * @syscap SystemCapability.Print.PrintFramework - * @return - - * @StageModelOnly - */ - onStartDiscoverPrinter(): void; + /** + * Called once to start to discover the printers connected with the device. + * + * @systemapi Hide this for inner system use. + * @since 9 + * @syscap SystemCapability.Print.PrintFramework + * @return - + * @StageModelOnly + */ + onStartDiscoverPrinter(): void; - /** - * Called once to stop discovering the printer. - * - * @systemapi Hide this for inner system use. - * @since 9 - * @syscap SystemCapability.Print.PrintFramework - * @return - - * @StageModelOnly - */ - onStopDiscoverPrinter(): void; + /** + * Called once to stop discovering the printer. + * + * @systemapi Hide this for inner system use. + * @since 9 + * @syscap SystemCapability.Print.PrintFramework + * @return - + * @StageModelOnly + */ + onStopDiscoverPrinter(): void; - /** - * Called once to connect to the specific printer. - * - * @systemapi Hide this for inner system use. - * @since 9 - * @syscap SystemCapability.Print.PrintFramework - * @return - - * @StageModelOnly - */ - onConnectPrinter(printerId: number): void; + /** + * Called once to connect to the specific printer. + * + * @systemapi Hide this for inner system use. + * @since 9 + * @syscap SystemCapability.Print.PrintFramework + * @return - + * @StageModelOnly + */ + onConnectPrinter(printerId: number): void; - /** - * Called once to disconnect the specific printer. - * - * @systemapi Hide this for inner system use. - * @since 9 - * @syscap SystemCapability.Print.PrintFramework - * @return - - * @StageModelOnly - */ - onDisconnectPrinter(printerId: number): void; + /** + * Called once to disconnect the specific printer. + * + * @systemapi Hide this for inner system use. + * @since 9 + * @syscap SystemCapability.Print.PrintFramework + * @return - + * @StageModelOnly + */ + onDisconnectPrinter(printerId: number): void; - /** - * Called once to start print job. - * - * @systemapi Hide this for inner system use. - * @since 9 - * @syscap SystemCapability.Print.PrintFramework - * @return - - * @StageModelOnly - */ - onStartPrintJob(jobInfo: print.PrintJob): void; + /** + * Called once to start print job. + * + * @systemapi Hide this for inner system use. + * @since 9 + * @syscap SystemCapability.Print.PrintFramework + * @return - + * @StageModelOnly + */ + onStartPrintJob(jobInfo: print.PrintJob): void; - /** - * Called once to remove the print job has been started. - * - * @systemapi Hide this for inner system use. - * @since 9 - * @syscap SystemCapability.Print.PrintFramework - * @return - - * @StageModelOnly - */ - onCancelPrintJob(jobInfo: print.PrintJob): void; + /** + * Called once to remove the print job has been started. + * + * @systemapi Hide this for inner system use. + * @since 9 + * @syscap SystemCapability.Print.PrintFramework + * @return - + * @StageModelOnly + */ + onCancelPrintJob(jobInfo: print.PrintJob): void; - /** - * Called once to request the capability of the printer. - * - * @systemapi Hide this for inner system use. - * @since 9 - * @syscap SystemCapability.Print.PrintFramework - * @return - - * @StageModelOnly - */ - onRequestPrinterCapability(printerId: number): print.PrinterCapability; + /** + * Called once to request the capability of the printer. + * + * @systemapi Hide this for inner system use. + * @since 9 + * @syscap SystemCapability.Print.PrintFramework + * @return - + * @StageModelOnly + */ + onRequestPrinterCapability(printerId: number): print.PrinterCapability; - /** - * Called once to request preview and send result to Print SA. - * - * @systemapi Hide this for inner system use. - * @since 9 - * @syscap SystemCapability.Print.PrintFramework - * @return - - * @StageModelOnly - */ - onRequestPreview(jobInfo: print.PrintJob): string; + /** + * Called once to request preview and send result to Print SA. + * + * @systemapi Hide this for inner system use. + * @since 9 + * @syscap SystemCapability.Print.PrintFramework + * @return - + * @StageModelOnly + */ + onRequestPreview(jobInfo: print.PrintJob): string; - /** - * Called once to finalize the extensionAbility. - * - * @systemapi Hide this for inner system use. - * @since 9 - * @syscap SystemCapability.Print.PrintFramework - * @return - - * @StageModelOnly - */ - onDestroy(): void; + /** + * Called once to finalize the extensionAbility. + * + * @systemapi Hide this for inner system use. + * @since 9 + * @syscap SystemCapability.Print.PrintFramework + * @return - + * @StageModelOnly + */ + onDestroy(): void; } \ No newline at end of file diff --git a/interfaces/kits/jskits/@ohos.print.d.ts b/interfaces/kits/jskits/@ohos.print.d.ts index df73afe6..52deb21b 100644 --- a/interfaces/kits/jskits/@ohos.print.d.ts +++ b/interfaces/kits/jskits/@ohos.print.d.ts @@ -173,7 +173,7 @@ declare namespace print { PRINT_JOB_BLOCK_FILE_CONVERT_SLOWLY = 25, // The file conversion is too slow. PRINT_JOB_RUNNING_UPLOADING_FILES = 26, // Uploading file... - PRINT_JOB_RUNNING_CONVERTING_FILES = 27, // Converting files... + PRINT_JOB_RUNNING_CONVERTING_FILES = 27, // Converting files... PRINT_JOB_BLOCK_UNKNOWN = 99, // unknown issue } diff --git a/interfaces/kits/jsnapi/extension/print_extension.js b/interfaces/kits/jsnapi/extension/print_extension.js index c8b9fcc5..0ad4b4b0 100644 --- a/interfaces/kits/jsnapi/extension/print_extension.js +++ b/interfaces/kits/jsnapi/extension/print_extension.js @@ -14,45 +14,45 @@ */ class PrintExtension { - onCreated(want) { - console.log('onCreated, want:' + want.abilityName); - } + onCreated(want) { + console.log('onCreated, want:' + want.abilityName); + } - onStartDiscoverPrinter() { - console.log('onStartDiscoverPrinter'); - } + onStartDiscoverPrinter() { + console.log('onStartDiscoverPrinter'); + } - onStopDiscoverPrinter() { - console.log('onStopDiscoverPrinter'); - } + onStopDiscoverPrinter() { + console.log('onStopDiscoverPrinter'); + } - onConnectPrinter(printerId) { - console.log('onConnectPrinter:' + printerId); - } + onConnectPrinter(printerId) { + console.log('onConnectPrinter:' + printerId); + } - onDisconnectPrinter(printerId) { - console.log('onDisconnectPrinter'); - } + onDisconnectPrinter(printerId) { + console.log('onDisconnectPrinter'); + } - onStartPrintJob(jobInfo) { - console.log('onStartPrintJob'); - } + onStartPrintJob(jobInfo) { + console.log('onStartPrintJob'); + } - onCancelPrintJob(jobInfo) { - console.log('onCancelPrintJob'); - } + onCancelPrintJob(jobInfo) { + console.log('onCancelPrintJob'); + } - onRequestPrinterCapability(printerId) { - console.log('onRequestPrinterCapability:' + printerId); - } + onRequestPrinterCapability(printerId) { + console.log('onRequestPrinterCapability:' + printerId); + } - onRequestPreview(jobInfo) { - console.log('onRequestPreview'); - } + onRequestPreview(jobInfo) { + console.log('onRequestPreview'); + } - onDestroy() { - console.log('onDestroy'); - } + onDestroy() { + console.log('onDestroy'); + } } -export default PrintExtension +export default PrintExtension; diff --git a/interfaces/kits/jsnapi/extensionctx/print_extension_context.js b/interfaces/kits/jsnapi/extensionctx/print_extension_context.js index cfa67e31..c1baf9f3 100644 --- a/interfaces/kits/jsnapi/extensionctx/print_extension_context.js +++ b/interfaces/kits/jsnapi/extensionctx/print_extension_context.js @@ -13,43 +13,43 @@ * limitations under the License. */ -var ExtensionContext = requireNapi("application.ExtensionContext") +let ExtensionContext = requireNapi('application.ExtensionContext'); class PrintExtensionContext extends ExtensionContext { - constructor(obj) { - super(obj); - this.extensionAbilityInfo = obj.extensionAbilityInfo - } - - startAbility(want, options, callback) { - console.log("startAbility"); - return this.__context_impl__.startAbility(want, options, callback); - } - - connectAbility(want, options) { - console.log("connectAbility"); - return this.__context_impl__.connectAbility(want, options); - } - - startAbilityWithAccount(want, accountId, options, callback) { - console.log("startAbilityWithAccount"); - return this.__context_impl__.startAbilityWithAccount(want, accountId, options, callback); - } - - connectAbilityWithAccount(want, accountId, options) { - console.log("connectAbilityWithAccount"); - return this.__context_impl__.connectAbilityWithAccount(want, accountId, options); - } - - disconnectAbility(connection, callback) { - console.log("disconnectAbility"); - return this.__context_impl__.disconnectAbility(connection, callback); - } - - terminateSelf(callback) { - console.log("terminateSelf"); - return this.__context_impl__.terminateSelf(callback); - } + constructor(obj) { + super(obj); + this.extensionAbilityInfo = obj.extensionAbilityInfo; + } + + startAbility(want, options, callback) { + console.log('startAbility'); + return this.__context_impl__.startAbility(want, options, callback); + } + + connectAbility(want, options) { + console.log('connectAbility'); + return this.__context_impl__.connectAbility(want, options); + } + + startAbilityWithAccount(want, accountId, options, callback) { + console.log('startAbilityWithAccount'); + return this.__context_impl__.startAbilityWithAccount(want, accountId, options, callback); + } + + connectAbilityWithAccount(want, accountId, options) { + console.log('connectAbilityWithAccount'); + return this.__context_impl__.connectAbilityWithAccount(want, accountId, options); + } + + disconnectAbility(connection, callback) { + console.log('disconnectAbility'); + return this.__context_impl__.disconnectAbility(connection, callback); + } + + terminateSelf(callback) { + console.log('terminateSelf'); + return this.__context_impl__.terminateSelf(callback); + } } -export default PrintExtensionContext \ No newline at end of file +export default PrintExtensionContext; \ No newline at end of file diff --git a/services/src/print_security_guard_manager.cpp b/services/src/print_security_guard_manager.cpp index e1d5dfa1..b82b12f5 100644 --- a/services/src/print_security_guard_manager.cpp +++ b/services/src/print_security_guard_manager.cpp @@ -53,7 +53,7 @@ void PrintSecurityGuardManager::ReportSecurityInfo(const int32_t eventId, const const std::string content) { #ifdef SECURITY_GUARDE_ENABLE - PRINT_HILOGI("start to push data to security_guard service, eventId:%{public}d, content:%{public}d", + PRINT_HILOGI("start to push data to security_guard service, eventId:%{public}d, content:%{public}s", eventId, content.c_str()); auto eventInfo = std::make_shared(eventId, version, content); int res = OHOS::Security::SecurityGuard::NativeDataCollectKit::ReportSecurityInfo(eventInfo); diff --git a/test/fuzztest/printservice_fuzzer/BUILD.gn b/test/fuzztest/printservice_fuzzer/BUILD.gn index 083adde9..473aea39 100644 --- a/test/fuzztest/printservice_fuzzer/BUILD.gn +++ b/test/fuzztest/printservice_fuzzer/BUILD.gn @@ -51,6 +51,9 @@ ohos_fuzztest("PrintServiceFuzzTest") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", + "core_service:tel_core_service_api", + "distributed_notification_service:ans_innerkits", "drivers_interface_ril:hril_innerkits", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", @@ -58,10 +61,20 @@ ohos_fuzztest("PrintServiceFuzzTest") { "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "ipc:ipc_core", + "netmanager_base:net_conn_manager_if", "os_account:os_account_innerkits", "relational_store:native_rdb", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] + if (security_guard_enabled) { + external_deps += [ + "security_guard:libsg_collect_sdk", + "time_service:time_client", + ] + } + sources = [ "printservice_fuzzer.cpp" ] } -- Gitee