openharmony/print_print_fwk
1
0
Fork 0
mirror of https://gitee.com/openharmony/print_print_fwk synced 2024-11-23 08:59:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改tmp目录权限|使能sane|修改使用扫描接口权限 Signed-off-by:liuhaosu@huawei.com

Browse Source 
Signed-off-by: 刘昊苏 <liuhaosu@huawei.com>
This commit is contained in:
刘昊苏 2024-10-09 16:13:34 +08:00 committed by 张凯
parent d32c6e4f6d
commit bf83c1d829
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/init/printservice.cfg
View File

@ -21,7 +21,7 @@
"mkdir /data/service/el1/public/print_service/sane/data 0755 print print",
"mkdir /data/service/el2/public/print_service 0775 print print",
"mkdir /data/service/el2/public/print_service/sane 0755 print print",
"mkdir /data/service/el2/public/print_service/sane/tmp 0700 root root"
"mkdir /data/service/el2/public/print_service/sane/tmp 0700 print print"
]
}
],

2
print.gni
View File

@ -33,7 +33,7 @@ if (!defined(global_parts_info) ||
cups_enable = true
debug_enable = false
ipp_over_usb_enable = false
sane_enable = false
sane_enable = true
declare_args() {
print_fwk_feature_bsuni_driver = false

51
services/scan_service/src/scan_service_ability.cpp
View File

@ -82,7 +82,6 @@ static bool g_isJpegWriteSuccess = false;
static const std::string PERMISSION_NAME_SCAN = "ohos.permission.SCAN";
static const std::string PERMISSION_NAME_SCAN_JOB = "ohos.permission.MANAGE_SCAN_JOB";
static const std::string PERMISSION_NAME_PRINT = "ohos.permission.PRINT";
static const std::string PERMISSION_NAME_PRINT_JOB = "ohos.permission.MANAGE_PRINT_JOB";
static const std::string SCAN_DEVICE_FOUND_TCP = "scanDeviceFoundTCP";
static const std::string SCAN_DEVICE_FOUND = "scanDeviceFound";
static const std::string SCAN_DEVICE_SYNC = "scanDeviceSync";
@ -279,7 +278,7 @@ SANE_Handle ScanServiceAbility::GetScanHandle(const std::string &scannerId)
int32_t ScanServiceAbility::InitScan(int32_t &scanVersion)
{
ManualStart();
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -301,7 +300,7 @@ int32_t ScanServiceAbility::InitScan(int32_t &scanVersion)
int32_t ScanServiceAbility::ExitScan()
{
ManualStart();
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -322,7 +321,7 @@ int32_t ScanServiceAbility::ExitScan()
int32_t ScanServiceAbility::ReInitScan(int32_t &scanVersion)
{
ManualStart();
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -558,7 +557,7 @@ void ScanServiceAbility::SaneGetScanner()
int32_t ScanServiceAbility::GetScannerList()
{
ManualStart();
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
return E_SCAN_NO_PERMISSION;
}
if (g_scannerState != SCANNER_READY) {
@ -592,7 +591,7 @@ int32_t ScanServiceAbility::GetScannerList()
int32_t ScanServiceAbility::StopDiscover()
{
ManualStart();
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -608,7 +607,7 @@ int32_t ScanServiceAbility::OpenScanner(const std::string scannerId)
{
ManualStart();
std::lock_guard<std::mutex> autoLock(lock_);
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -655,7 +654,7 @@ int32_t ScanServiceAbility::CloseScanner(const std::string scannerId)
{
ManualStart();
std::lock_guard<std::mutex> autoLock(lock_);
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -741,7 +740,7 @@ int32_t ScanServiceAbility::GetScanOptionDesc(
{
ManualStart();
std::lock_guard<std::mutex> autoLock(lock_);
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -914,7 +913,7 @@ int32_t ScanServiceAbility::OpScanOptionValue(const std::string scannerId, const
const ScanOptionOpType op, ScanOptionValue &value, int32_t &info)
{
SCAN_HILOGD("ScanServiceAbility OpScanOptionValue start");
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -971,7 +970,7 @@ int32_t ScanServiceAbility::GetScanParameters(const std::string scannerId, ScanP
{
ManualStart();
std::lock_guard<std::mutex> autoLock(lock_);
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -1005,7 +1004,7 @@ int32_t ScanServiceAbility::GetSingleFrameFD(const std::string scannerId, uint32
{
ManualStart();
std::lock_guard<std::mutex> autoLock(lock_);
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -1034,7 +1033,7 @@ int32_t ScanServiceAbility::CancelScan(const std::string scannerId)
{
ManualStart();
std::lock_guard<std::mutex> autoLock(lock_);
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -1060,7 +1059,7 @@ int32_t ScanServiceAbility::SetScanIOMode(const std::string scannerId, const boo
{
ManualStart();
std::lock_guard<std::mutex> autoLock(lock_);
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -1086,7 +1085,7 @@ int32_t ScanServiceAbility::GetScanSelectFd(const std::string scannerId, int32_t
{
ManualStart();
std::lock_guard<std::mutex> autoLock(lock_);
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -1243,7 +1242,7 @@ void ScanServiceAbility::SendDeviceInfoSync(const ScanDeviceInfoSync &info, std:
void ScanServiceAbility::DisConnectUsbScanner(std::string serialNumber, std::string deviceId)
{
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return;
}
@ -1263,7 +1262,7 @@ void ScanServiceAbility::DisConnectUsbScanner(std::string serialNumber, std::str
void ScanServiceAbility::UpdateUsbScannerId(std::string serialNumber, std::string newDeviceId)
{
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return;
}
@ -1337,7 +1336,7 @@ bool ScanServiceAbility::CheckPermission(const std::string &permissionName)
int result = AccessTokenKit::VerifyAccessToken(tokenId, permissionName);
if (result != PERMISSION_GRANTED) {
if (permissionName == PERMISSION_NAME_PRINT) {
result = AccessTokenKit::VerifyAccessToken(tokenId, PERMISSION_NAME_PRINT_JOB);
result = AccessTokenKit::VerifyAccessToken(tokenId, PERMISSION_NAME_PRINT);
}
SCAN_HILOGE("Current tokenId permission is %{public}d", result);
}
@ -1347,7 +1346,7 @@ bool ScanServiceAbility::CheckPermission(const std::string &permissionName)
int32_t ScanServiceAbility::GetScannerState(int32_t &scannerState)
{
ManualStart();
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -1361,7 +1360,7 @@ int32_t ScanServiceAbility::GetScanProgress(const std::string scannerId, ScanPro
{
ManualStart();
std::lock_guard<std::mutex> autoLock(lock_);
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -1413,7 +1412,7 @@ int32_t ScanServiceAbility::GetScanProgress(const std::string scannerId, ScanPro
int32_t ScanServiceAbility::AddScanner(const std::string& serialNumber, const std::string& discoverMode)
{
ManualStart();
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -1462,7 +1461,7 @@ int32_t ScanServiceAbility::AddScanner(const std::string& serialNumber, const st
int32_t ScanServiceAbility::DeleteScanner(const std::string& serialNumber, const std::string& discoverMode)
{
ManualStart();
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -1492,7 +1491,7 @@ int32_t ScanServiceAbility::DeleteScanner(const std::string& serialNumber, const
int32_t ScanServiceAbility::GetAddedScanner(std::vector<ScanDeviceInfo>& allAddedScanner)
{
ManualStart();
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -1508,7 +1507,7 @@ int32_t ScanServiceAbility::UpdateScannerName(const std::string& serialNumber,
const std::string& discoverMode, const std::string& deviceName)
{
ManualStart();
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -1531,7 +1530,7 @@ int32_t ScanServiceAbility::UpdateScannerName(const std::string& serialNumber,
int32_t ScanServiceAbility::OnStartScan(const std::string scannerId, const bool &batchMode)
{
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}
@ -1556,7 +1555,7 @@ int32_t ScanServiceAbility::StartScan(const std::string scannerId, const bool &b
{
ManualStart();
std::lock_guard<std::mutex> autoLock(lock_);
if (!CheckPermission(PERMISSION_NAME_PRINT_JOB)) {
if (!CheckPermission(PERMISSION_NAME_PRINT)) {
SCAN_HILOGE("no permission to access scan service");
return E_SCAN_NO_PERMISSION;
}